有冲突

miaoshu
2025-06-16 16:04:16 +08:00 · 2025-06-16 16:03:06 +08:00
1 changed files with 4 additions and 0 deletions
--- a/bk_aidk/projects/beken_wss_paopao/main/app_main.c
+++ b/bk_aidk/projects/beken_wss_paopao/main/app_main.c
@ -362,7 +362,11 @@ static void handle_system_event(key_event_t event)
            poweroff_voice();
            ws2812_led_clear_all();
            ispoweron = 0;
+<<<<<<< HEAD
+            rtos_delay_milliseconds(400);
+=======
            rtos_delay_milliseconds(1000);
+>>>>>>> 055e7e84bd6a0e47612d1047b42c9c6184b187e9
            bk_gpio_enable_output(51);
            bk_gpio_set_output_low(51);
Author	SHA1	Message	Date
dianke3yu	35de03a186	有冲突	2025-06-16 16:04:16 +08:00
dianke3yu	29c0a7bcfb	miaoshu	2025-06-16 16:03:06 +08:00