增加唤醒不动作只显示功能

.gitattributes

@@ -0,0 +1 @@
+*.bat text eol=crlf

apps/kaotings/kt.c

@@ -1,5 +1,6 @@
 #include "kt.h"
 #include "key_event_deal.h"
+#include "kt_led7.h"
 #include "asm/mcpwm.h"
 #include "system/timer.h"
 #include "kt_fan_ac.h"
@@ -138,6 +139,18 @@ void kt_init(void)
     printf("kt_init: debug uart re-init done\n");
 }
 
+u8 kt_key_wake_only_if_display_off(int key_event)
+{
+    if (key_event == KEY_NULL) {
+        return 0;
+    }
+    if (!kt_led7_is_off()) {
+        return 0;
+    }
+    kt_led7_battery_show_restart();
+    return 1;
+}
+
 u8 kt_key_event_filter_after(int key_event, int key_value)
 {
     u8 ret = true;

apps/kaotings/kt.h

@@ -53,6 +53,9 @@ void kt_boot_init(void);
 void kt_init(void);
 u8 kt_key_event_filter_after(int key_event,int key_value);
 
+/** 数码管熄灭时：唤醒并显示电量，返回 1 表示已消费按键；亮屏时返回 0 */
+u8 kt_key_wake_only_if_display_off(int key_event);
+
 /** VBUS 200ms 轮询（需在 kt_init 之后调用一次） */
 void start_chk_det_start(void);
 

apps/kaotings/kt_led7.c

@@ -414,6 +414,11 @@ static void kt_led7_ui_1s_tick(void *priv)
     }
 }
 
+u8 kt_led7_is_off(void)
+{
+    return led7_ui_mode == KT_LED7_MODE_OFF;
+}
+
 void kt_led7_battery_show_restart(void)
 {
     led7_ui_mode = KT_LED7_MODE_BATTERY;

apps/kaotings/kt_led7.h

@@ -81,6 +81,9 @@ struct led7_pin6 {
 
 void kt_led7_init(void);
 
+/** 数码管是否已延时熄灭（KT_LED7_MODE_OFF） */
+u8 kt_led7_is_off(void);
+
 /** 正常电量显示：从当前时刻起再显示 60s（与临时显示结束后的行为一致） */
 void kt_led7_battery_show_restart(void);
 

apps/soundbox/task_manager/bt/bt.c

@@ -909,6 +909,10 @@ int bt_key_event_handler(struct sys_event *event)
 
     log_debug("bt key_event:%d %d %d %d\n", key_event, key->value, key->event, key->init);
 
+    if (kt_key_wake_only_if_display_off(key_event)) {
+        return true;
+    }
+
     if (bt_key_event_filter_after(key_event) == true) {
         return true;
     }

cpu/br23/sdk_used_list.used

@@ -1,8 +1,5 @@
 
 
-
-
-
 fat_vfs_ops
 
 

cpu/br23/tools/download.bat

@@ -1,9 +1,6 @@
 
 
 
-
-
-
 rem @echo off
 
 @echo *****************************************************************

cpu/br23/tools/download/standard/download.bat

@@ -18,29 +18,23 @@ copy ..\..\ota_nor.bin .
 :: -format all
 ::-reboot 2500
 
-  
+@rem delete temp files
-
-@rem ɾ<><C9BE><EFBFBD><EFBFBD>ʱ<EFBFBD>ļ<EFBFBD>-format all
 if exist *.mp3 del *.mp3
 if exist *.PIX del *.PIX
 if exist *.TAB del *.TAB
 if exist *.res del *.res
 if exist *.sty del *.sty
 
-
+@rem build firmware package files
-
-@rem <20><><EFBFBD>ɹ̼<C9B9><CCBC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
 copy ota_all.bin ota.bin
 ..\..\fw_add.exe -noenc -fw jl_isd.fw -add ota.bin -type 100 -out jl_isd_all.fw
 copy ota_nor.bin ota.bin
 ..\..\fw_add.exe -noenc -fw jl_isd.fw -add ota.bin -type 100 -out jl_isd_nor.fw
 
-@rem <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ýű<EFBFBD><EFBFBD>İ汾<EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD> FW <20>ļ<EFBFBD><C4BC><EFBFBD>
+@rem add script version info to FW files
 ..\..\fw_add.exe -noenc -fw jl_isd_all.fw -add script.ver -out jl_isd_all.fw
 ..\..\fw_add.exe -noenc -fw jl_isd_nor.fw -add script.ver -out jl_isd_nor.fw
 
-
-
 ..\..\ufw_maker.exe -fw_to_ufw jl_isd_all.fw
 ..\..\ufw_maker.exe -fw_to_ufw jl_isd_nor.fw
 copy jl_isd_all.ufw update.ufw
@@ -48,18 +42,15 @@ copy jl_isd_nor.ufw nor_update.ufw
 copy jl_isd_all.fw jl_isd.fw
 del jl_isd_all.ufw jl_isd_nor.ufw jl_isd_all.fw jl_isd_nor.fw
 
-
+@REM config package file
-@REM <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>
 ::ufw_maker.exe -chip AC800X %ADD_KEY% -output config.ufw -res bt_cfg.cfg
 
 ::IF EXIST jl_696x.bin del jl_696x.bin
 
-
+@rem format options:
-@rem <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˵<EFBFBD><CBB5>
+@rem -format vm
-@rem -format vm        //<2F><><EFBFBD><EFBFBD>VM <20><><EFBFBD><EFBFBD>
+@rem -format cfg
-@rem -format cfg       //<2F><><EFBFBD><EFBFBD>BT CFG <20><><EFBFBD><EFBFBD>
+@rem -format 0x3f0-2
-@rem -format 0x3f0-2   //<2F><>ʾ<EFBFBD>ӵ<EFBFBD> 0x3f0 <20><> sector <20><>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 <20><> sector(<28><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ16<31><36><EFBFBD>ƻ<EFBFBD>10<31><30><EFBFBD>ƶ<EFBFBD><C6B6>ɣ<EFBFBD><C9A3>ڶ<EFBFBD><DAB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>10<31><30><EFBFBD><EFBFBD>)
 
 ping /n 2 127.1>null
 IF EXIST null del null
-

cpu/br23/tools/sdk.elf.resolution.txt

@@ -1695,6 +1695,9 @@ objs/apps/kaotings/kt.c.o
 -r=objs/apps/kaotings/kt.c.o,kt_led7_init,l
 -r=objs/apps/kaotings/kt.c.o,kt_battery_init,l
 -r=objs/apps/kaotings/kt.c.o,debug_uart_init,l
+-r=objs/apps/kaotings/kt.c.o,kt_key_wake_only_if_display_off,pl
+-r=objs/apps/kaotings/kt.c.o,kt_led7_is_off,l
+-r=objs/apps/kaotings/kt.c.o,kt_led7_battery_show_restart,l
 -r=objs/apps/kaotings/kt.c.o,kt_key_event_filter_after,pl
 -r=objs/apps/kaotings/kt.c.o,kt_fan_level_change,l
 -r=objs/apps/kaotings/kt.c.o,kt_light_led_level_change,l
@@ -1703,6 +1706,7 @@ objs/apps/kaotings/kt_led7.c.o
 -r=objs/apps/kaotings/kt_led7.c.o,hw_init,pl
 -r=objs/apps/kaotings/kt_led7.c.o,kt_led7_scan,pl
 -r=objs/apps/kaotings/kt_led7.c.o,gpio_direction_output,l
+-r=objs/apps/kaotings/kt_led7.c.o,kt_led7_is_off,pl
 -r=objs/apps/kaotings/kt_led7.c.o,kt_led7_battery_show_restart,pl
 -r=objs/apps/kaotings/kt_led7.c.o,kt_led7_temp_show_number,pl
 -r=objs/apps/kaotings/kt_led7.c.o,kt_led7_temp_show_string,pl
@@ -3059,6 +3063,7 @@ objs/apps/soundbox/task_manager/bt/bt.c.o
 -r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_key_event_handler,pl
 -r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_key_event_filter_before,l
 -r=objs/apps/soundbox/task_manager/bt/bt.c.o,log_print,l
+-r=objs/apps/soundbox/task_manager/bt/bt.c.o,kt_key_wake_only_if_display_off,l
 -r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_key_event_filter_after,l
 -r=objs/apps/soundbox/task_manager/bt/bt.c.o,kt_key_event_filter_after,l
 -r=objs/apps/soundbox/task_manager/bt/bt.c.o,bt_key_music_pp,l