Compare commits
No commits in common. "35de03a18614be8aa9b40b7adcfa81edfefc7c87" and "055e7e84bd6a0e47612d1047b42c9c6184b187e9" have entirely different histories.
35de03a186
...
055e7e84bd
@ -362,11 +362,7 @@ static void handle_system_event(key_event_t event)
|
|||||||
poweroff_voice();
|
poweroff_voice();
|
||||||
ws2812_led_clear_all();
|
ws2812_led_clear_all();
|
||||||
ispoweron = 0;
|
ispoweron = 0;
|
||||||
<<<<<<< HEAD
|
|
||||||
rtos_delay_milliseconds(400);
|
|
||||||
=======
|
|
||||||
rtos_delay_milliseconds(1000);
|
rtos_delay_milliseconds(1000);
|
||||||
>>>>>>> 055e7e84bd6a0e47612d1047b42c9c6184b187e9
|
|
||||||
bk_gpio_enable_output(51);
|
bk_gpio_enable_output(51);
|
||||||
bk_gpio_set_output_low(51);
|
bk_gpio_set_output_low(51);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user