增加3击按键进OTA的功能

This commit is contained in:
2026-07-31 19:29:09 +08:00
parent b5d590c6f1
commit 8b39f9c48d
29 changed files with 1548 additions and 1545 deletions
+11 -11
View File
@@ -131611,7 +131611,7 @@
"app_config.h" "app_config.h"
"uartPcmSender.h" "uartPcmSender.h"
1784799361 d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\include\app_config.h 1785496829 d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\include\app_config.h
"board_config.h" "board_config.h"
"usb_std_class_def.h" "usb_std_class_def.h"
"usb_common_def.h" "usb_common_def.h"
@@ -131622,7 +131622,7 @@
1756104107 d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\board\br28\board_config.h 1756104107 d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\board\br28\board_config.h
"board_jl701n_demo_cfg.h" "board_jl701n_demo_cfg.h"
1785398767 d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\board\br28\board_jl701n_demo_cfg.h 1785496826 d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\board\br28\board_jl701n_demo_cfg.h
"board_jl701n_demo_global_build_cfg.h" "board_jl701n_demo_global_build_cfg.h"
"usb_std_class_def.h" "usb_std_class_def.h"
"usb_std_class_def.h" "usb_std_class_def.h"
@@ -134230,7 +134230,7 @@
"rcsp_adv_bluetooth.h" "rcsp_adv_bluetooth.h"
"bt_tws.h" "bt_tws.h"
1785399324 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\common\third_party_profile\jieli\jl_rcsp\bt_trans_data\le_rcsp_adv_module.c 1785403234 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\common\third_party_profile\jieli\jl_rcsp\bt_trans_data\le_rcsp_adv_module.c
"system/app_core.h" "system/app_core.h"
"system/includes.h" "system/includes.h"
"app_config.h" "app_config.h"
@@ -135038,7 +135038,7 @@
"bt_tws.h" "bt_tws.h"
"debug.h" "debug.h"
1784866379 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\board\br28\board_jl701n_demo.c 1785495907 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\board\br28\board_jl701n_demo.c
"app_config.h" "app_config.h"
"app_main.h" "app_main.h"
"system/includes.h" "system/includes.h"
@@ -135398,7 +135398,7 @@
"key_event_deal.h" "key_event_deal.h"
"btstack/btstack_typedef.h" "btstack/btstack_typedef.h"
1784865741 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\key_event_deal.c 1785496153 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\key_event_deal.c
"key_event_deal.h" "key_event_deal.h"
"btstack/avctp_user.h" "btstack/avctp_user.h"
"event.h" "event.h"
@@ -135561,7 +135561,7 @@
"aec_user.h" "aec_user.h"
"tone_player.h" "tone_player.h"
1706666716 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\pc\pc.c 1785496667 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\earphone\pc\pc.c
"system/includes.h" "system/includes.h"
"music/music_player.h" "music/music_player.h"
"music/breakpoint.h" "music/breakpoint.h"
@@ -136062,7 +136062,7 @@
<math.h> <math.h>
"mjson.h" "mjson.h"
1785135433 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\usr_le_code\usr_le_adv.c 1785495779 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\usr_le_code\usr_le_adv.c
"system/includes.h" "system/includes.h"
"app_config.h" "app_config.h"
"app_main.h" "app_main.h"
@@ -136074,7 +136074,7 @@
"usr_usb_jb.h" "usr_usb_jb.h"
"debug.h" "debug.h"
1785398395 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\usr_le_code\usr_le_recieve.c 1785495900 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\usr_le_code\usr_le_recieve.c
"app_config.h" "app_config.h"
"asm/pwm_led.h" "asm/pwm_led.h"
"tone_player.h" "tone_player.h"
@@ -137191,10 +137191,10 @@
"app_config.h" "app_config.h"
"timer.h" "timer.h"
1785470014 d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\usr_le_code\usr_usb_jb.h 1785483833 d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\usr_le_code\usr_usb_jb.h
<stdint.h> <stdint.h>
1785397251 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\usr_le_code\usr_usb_jb.c 1785483775 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\usr_le_code\usr_usb_jb.c
"system/includes.h" "system/includes.h"
"app_config.h" "app_config.h"
"vm.h" "vm.h"
@@ -137204,7 +137204,7 @@
"debug.h" "debug.h"
"usb/device/cdc.h" "usb/device/cdc.h"
1785402463 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\usr_le_code\usr_dengle_sched.c 1785484197 source:d:\jianbao\project\À¶ÑÀת½Ó°å-¶ºÃ¨°ô\sdk\apps\usr_le_code\usr_dengle_sched.c
"system/includes.h" "system/includes.h"
"app_config.h" "app_config.h"
"usr_dengle_sched.h" "usr_dengle_sched.h"
+1043 -1043
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -99,7 +99,7 @@ STATUS_CONFIG status_config = {
#if (TCFG_APP_AUX_EN || TCFG_APP_MUSIC_EN || TCFG_APP_PC_EN) #if (TCFG_APP_AUX_EN || TCFG_APP_MUSIC_EN || TCFG_APP_PC_EN)
u8 key_table[KEY_NUM_MAX][KEY_EVENT_MAX] = { u8 key_table[KEY_NUM_MAX][KEY_EVENT_MAX] = {
// SHORT LONG HOLD UP DOUBLE TRIPLE // SHORT LONG HOLD UP DOUBLE TRIPLE
{KEY_MUSIC_PP, KEY_POWEROFF, KEY_POWEROFF_HOLD, KEY_NULL, KEY_CALL_LAST_NO, KEY_MODE_SWITCH}, //KEY_0 {KEY_MUSIC_PP, KEY_POWEROFF, KEY_POWEROFF_HOLD, KEY_NULL, KEY_CALL_LAST_NO, KEY_IR_NUM_2}, //KEY_0
{KEY_MUSIC_NEXT, KEY_VOL_UP, KEY_VOL_UP, KEY_NULL, KEY_OPEN_SIRI, KEY_NULL}, //KEY_1 {KEY_MUSIC_NEXT, KEY_VOL_UP, KEY_VOL_UP, KEY_NULL, KEY_OPEN_SIRI, KEY_NULL}, //KEY_1
{KEY_MUSIC_PREV, KEY_VOL_DOWN, KEY_VOL_DOWN, KEY_NULL, KEY_HID_CONTROL, KEY_NULL}, //KEY_2 {KEY_MUSIC_PREV, KEY_VOL_DOWN, KEY_VOL_DOWN, KEY_NULL, KEY_HID_CONTROL, KEY_NULL}, //KEY_2
}; };
+2 -1
View File
@@ -111,7 +111,8 @@
/////要确保 上面 undef 后在include usb /////要确保 上面 undef 后在include usb
#include "usb_common_def.h" #include "usb_common_def.h"
#define USB_PC_NO_APP_MODE 0 /* 蓝牙转接板:USB 直接 usb_start(),不进入 APP_PC_TASK(勿与 TCFG_USB_CDC_BACKGROUND_RUN 混用) */
#define USB_PC_NO_APP_MODE 1
#if ((TCFG_CHARGESTORE_ENABLE || TCFG_TEST_BOX_ENABLE || TCFG_ANC_BOX_ENABLE) \ #if ((TCFG_CHARGESTORE_ENABLE || TCFG_TEST_BOX_ENABLE || TCFG_ANC_BOX_ENABLE) \
&& TCFG_CHARGESTORE_PORT == IO_PORT_DP) && TCFG_CHARGESTORE_PORT == IO_PORT_DP)
-3
View File
@@ -379,9 +379,6 @@ int app_earphone_key_event_handler(struct sys_event *event)
case KEY_IR_NUM_1: case KEY_IR_NUM_1:
break; break;
case KEY_IR_NUM_2: case KEY_IR_NUM_2:
if (usr_var.usr_goto_pair) {
break;
}
usr_app_ota_init(); usr_app_ota_init();
break; break;
case KEY_POWEROFF: case KEY_POWEROFF:
+1 -1
View File
@@ -64,7 +64,7 @@ static u8 pc_key_table[][KEY_EVENT_MAX] = {
// UP DOUBLE TRIPLE // UP DOUBLE TRIPLE
{ {
KEY_MUSIC_PP, KEY_POWEROFF, KEY_POWEROFF_HOLD, KEY_MUSIC_PP, KEY_POWEROFF, KEY_POWEROFF_HOLD,
KEY_NULL, KEY_MODE_SWITCH, KEY_NULL KEY_NULL, KEY_NULL, KEY_NULL /* 桥接板:双击不再切模式 */
}, },
{ {
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+9 -4
View File
@@ -658,7 +658,10 @@ obj/Release/apps/common/device/usb/device/task_pc.o
-r=obj/Release/apps/common/device/usb/device/task_pc.o,usb_stop,pl -r=obj/Release/apps/common/device/usb/device/task_pc.o,usb_stop,pl
-r=obj/Release/apps/common/device/usb/device/task_pc.o,usb_sie_close,l -r=obj/Release/apps/common/device/usb/device/task_pc.o,usb_sie_close,l
-r=obj/Release/apps/common/device/usb/device/task_pc.o,pc_device_event_handler,pl -r=obj/Release/apps/common/device/usb/device/task_pc.o,pc_device_event_handler,pl
-r=obj/Release/apps/common/device/usb/device/task_pc.o,app_get_curr_task,l -r=obj/Release/apps/common/device/usb/device/task_pc.o,usbstack_init,pl
-r=obj/Release/apps/common/device/usb/device/task_pc.o,register_sys_event_handler,l
-r=obj/Release/apps/common/device/usb/device/task_pc.o,usbstack_exit,pl
-r=obj/Release/apps/common/device/usb/device/task_pc.o,unregister_sys_event_handler,l
-r=obj/Release/apps/common/device/usb/device/task_pc.o,usb_device2id,l -r=obj/Release/apps/common/device/usb/device/task_pc.o,usb_device2id,l
-r=obj/Release/apps/common/device/usb/device/task_pc.o,cdc_read_data,l -r=obj/Release/apps/common/device/usb/device/task_pc.o,cdc_read_data,l
-r=obj/Release/apps/common/device/usb/device/task_pc.o,printf,l -r=obj/Release/apps/common/device/usb/device/task_pc.o,printf,l
@@ -2075,8 +2078,8 @@ obj/Release/apps/earphone/key_event_deal.o
-r=obj/Release/apps/earphone/key_event_deal.o,bt_user_priv_var,l -r=obj/Release/apps/earphone/key_event_deal.o,bt_user_priv_var,l
-r=obj/Release/apps/earphone/key_event_deal.o,log_tag_const_i_KEY_EVENT_DEAL,l -r=obj/Release/apps/earphone/key_event_deal.o,log_tag_const_i_KEY_EVENT_DEAL,l
-r=obj/Release/apps/earphone/key_event_deal.o,key_table,l -r=obj/Release/apps/earphone/key_event_deal.o,key_table,l
-r=obj/Release/apps/earphone/key_event_deal.o,usr_var,l
-r=obj/Release/apps/earphone/key_event_deal.o,_usr_module_cfg,l -r=obj/Release/apps/earphone/key_event_deal.o,_usr_module_cfg,l
-r=obj/Release/apps/earphone/key_event_deal.o,usr_var,l
obj/Release/apps/earphone/kws_voice_event_deal.o obj/Release/apps/earphone/kws_voice_event_deal.o
-r=obj/Release/apps/earphone/kws_voice_event_deal.o,jl_kws_voice_event_handle,pl -r=obj/Release/apps/earphone/kws_voice_event_deal.o,jl_kws_voice_event_handle,pl
obj/Release/apps/earphone/linein/linein.o obj/Release/apps/earphone/linein/linein.o
@@ -3368,7 +3371,7 @@ obj/Release/apps/usr_le_code/usr_le_recieve.o
-r=obj/Release/apps/usr_le_code/usr_le_recieve.o,dual_ota_app_data_deal,l -r=obj/Release/apps/usr_le_code/usr_le_recieve.o,dual_ota_app_data_deal,l
-r=obj/Release/apps/usr_le_code/usr_le_recieve.o,clk_set,l -r=obj/Release/apps/usr_le_code/usr_le_recieve.o,clk_set,l
-r=obj/Release/apps/usr_le_code/usr_le_recieve.o,os_task_create,l -r=obj/Release/apps/usr_le_code/usr_le_recieve.o,os_task_create,l
-r=obj/Release/apps/usr_le_code/usr_le_recieve.o,cdc_write_data,l -r=obj/Release/apps/usr_le_code/usr_le_recieve.o,usr_jb_on_runcmd_bytes,l
-r=obj/Release/apps/usr_le_code/usr_le_recieve.o,uart_tr_send_data,l -r=obj/Release/apps/usr_le_code/usr_le_recieve.o,uart_tr_send_data,l
-r=obj/Release/apps/usr_le_code/usr_le_recieve.o,usr_update_init,pl -r=obj/Release/apps/usr_le_code/usr_le_recieve.o,usr_update_init,pl
-r=obj/Release/apps/usr_le_code/usr_le_recieve.o,ram_protect_close,l -r=obj/Release/apps/usr_le_code/usr_le_recieve.o,ram_protect_close,l
@@ -3398,12 +3401,14 @@ obj/Release/apps/usr_le_code/usr_usb_jb.o
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,usr_prodcode_get,pl -r=obj/Release/apps/usr_le_code/usr_usb_jb.o,usr_prodcode_get,pl
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,usr_usb_jb_feed,pl -r=obj/Release/apps/usr_le_code/usr_usb_jb.o,usr_usb_jb_feed,pl
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,sys_timeout_add,l -r=obj/Release/apps/usr_le_code/usr_usb_jb.o,sys_timeout_add,l
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,usr_jb_on_runcmd_bytes,pl
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,cdc_is_com_open,l
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,cdc_write_data,l
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,printf_buf,l -r=obj/Release/apps/usr_le_code/usr_usb_jb.o,printf_buf,l
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,dengle_sched_usb_set,l -r=obj/Release/apps/usr_le_code/usr_usb_jb.o,dengle_sched_usb_set,l
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,dengle_sched_clear_all,l -r=obj/Release/apps/usr_le_code/usr_usb_jb.o,dengle_sched_clear_all,l
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,memcmp,l -r=obj/Release/apps/usr_le_code/usr_usb_jb.o,memcmp,l
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,usr_goto_pair_mode,l -r=obj/Release/apps/usr_le_code/usr_usb_jb.o,usr_goto_pair_mode,l
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,cdc_write_data,l
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,dengle_sched_pack_slot,l -r=obj/Release/apps/usr_le_code/usr_usb_jb.o,dengle_sched_pack_slot,l
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,dengle_sched_pack_all,l -r=obj/Release/apps/usr_le_code/usr_usb_jb.o,dengle_sched_pack_all,l
-r=obj/Release/apps/usr_le_code/usr_usb_jb.o,usr_get_conn_service,l -r=obj/Release/apps/usr_le_code/usr_usb_jb.o,usr_get_conn_service,l
+481 -481
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.