Index: output/bt_program23.icode =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/bt_program23.icode (revision 7025) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/bt_program23.icode (working copy) @@ -26584,48 +26584,40 @@ 00065552 0x000091b8 branch 0x0000215f 00065553 0x000091bb call 0x00000284 00065554 0x000091bc call 0x0000044a - 00065555 0x000091bd call 0x00010021 - 00065556 0x000091be arg 0x00004721 , 0x00000011 - 00065557 0x000091bf fetch 0x00000001 , 0x00004720 - 00065558 0x000091c0 fetcht 0x00000001 , 0x00004703 - 00065559 0x000091c1 isub 0x00000002 , 0x0000003e - 00065560 0x000091c2 branch 0x00000321 , 0x00000005 - 00065561 0x000091c3 increase 0xffffffff , 0x0000003f - 00065562 0x000091c4 mul32 0x0000003f , 0x0000001d , 0x0000003f - 00065563 0x000091c5 iadd 0x00000011 , 0x00000011 - 00065564 0x000091c6 ifetch 0x00000001 , 0x00000011 - 00065565 0x000091c7 store 0x00000001 , 0x00004210 - 00065566 0x000091c8 beq 0x00000033 , 0x00010028 - 00065567 0x000091c9 beq 0x00000034 , 0x0001002d - 00065568 0x000091cb rtn - 00065569 0x000091cf fetch 0x00000001 , 0x00004720 - 00065570 0x000091d0 rtneq 0x00000002 - 00065571 0x000091d1 jam 0x00000032 , 0x00004520 - 00065572 0x000091d2 jam 0x00000032 , 0x000043ba - 00065573 0x000091d3 jam 0x00000032 , 0x0000439c - 00065574 0x000091d4 jam 0x00000032 , 0x00004b1e - 00065575 0x000091d5 rtn - 00065576 0x000091d8 call 0x000006d9 - 00065577 0x000091d9 jam 0x00000001 , 0x00004b51 - 00065578 0x000091da fetch 0x00000006 , 0x000041d0 - 00065579 0x000091db branch 0x000033eb , 0x00000034 - 00065580 0x000091dc branch 0x00004274 - 00065581 0x000091df jam 0x00000001 , 0x00004b6c - 00065582 0x000091e0 call 0x000006d9 - 00065583 0x000091e1 jam 0x00000001 , 0x000047a1 - 00065584 0x000091e2 fetch 0x00000002 , 0x000046a8 - 00065585 0x000091e3 fetcht 0x00000001 , 0x00004bb1 - 00065586 0x000091e4 sub 0x00000002 , 0x000000ff , 0x0000003e - 00065587 0x000091e5 nbranch 0x00010035 , 0x00000005 - 00065588 0x000091e6 setarg 0x00000258 - 00065589 0x000091e8 store 0x00000002 , 0x000046ae - 00065590 0x000091e9 call 0x00003418 - 00065591 0x000091ea call 0x00000287 - 00065592 0x000091eb setarg 0x00000004 - 00065593 0x000091ec istore 0x00000001 , 0x00000006 - 00065594 0x000091ed arg 0x00004390 , 0x00000006 - 00065595 0x000091ee call 0x0000051f - 00065596 0x000091ef branch 0x00007df4 + 00065555 0x000091be arg 0x00004721 , 0x00000011 + 00065556 0x000091bf fetch 0x00000001 , 0x00004720 + 00065557 0x000091c0 fetcht 0x00000001 , 0x00004703 + 00065558 0x000091c1 isub 0x00000002 , 0x0000003e + 00065559 0x000091c2 branch 0x00000321 , 0x00000005 + 00065560 0x000091c3 increase 0xffffffff , 0x0000003f + 00065561 0x000091c4 mul32 0x0000003f , 0x0000001d , 0x0000003f + 00065562 0x000091c5 iadd 0x00000011 , 0x00000011 + 00065563 0x000091c6 ifetch 0x00000001 , 0x00000011 + 00065564 0x000091c7 store 0x00000001 , 0x00004210 + 00065565 0x000091c8 beq 0x00000033 , 0x00010020 + 00065566 0x000091c9 beq 0x00000034 , 0x00010025 + 00065567 0x000091cb rtn + 00065568 0x000091d8 call 0x000006d9 + 00065569 0x000091d9 jam 0x00000001 , 0x00004b51 + 00065570 0x000091da fetch 0x00000006 , 0x000041d0 + 00065571 0x000091db branch 0x000033eb , 0x00000034 + 00065572 0x000091dc branch 0x00004274 + 00065573 0x000091df jam 0x00000001 , 0x00004b6c + 00065574 0x000091e0 call 0x000006d9 + 00065575 0x000091e1 jam 0x00000001 , 0x000047a1 + 00065576 0x000091e2 fetch 0x00000002 , 0x000046a8 + 00065577 0x000091e3 fetcht 0x00000001 , 0x00004bb1 + 00065578 0x000091e4 sub 0x00000002 , 0x000000ff , 0x0000003e + 00065579 0x000091e5 nbranch 0x0001002d , 0x00000005 + 00065580 0x000091e6 setarg 0x00000258 + 00065581 0x000091e8 store 0x00000002 , 0x000046ae + 00065582 0x000091e9 call 0x00003418 + 00065583 0x000091ea call 0x00000287 + 00065584 0x000091eb setarg 0x00000004 + 00065585 0x000091ec istore 0x00000001 , 0x00000006 + 00065586 0x000091ed arg 0x00004390 , 0x00000006 + 00065587 0x000091ee call 0x0000051f + 00065588 0x000091ef branch 0x00007df4 00131073 0x000091f5 beq 0x00000010 , 0x00020004 00131074 0x000091f6 beq 0x00000011 , 0x0002001b 00131075 0x000091f7 rtn Index: output/bt_program23.list =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/bt_program23.list (revision 7025) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/bt_program23.list (working copy) @@ -31001,52 +31001,43 @@ : 037306 z_mouse_check_reconn_target: 0x10011 037307 call p_mouse_tx_power_init 0x10012 037308 call p_mouse_select_device_by_button -0x10013 037309 call z_mouse_bluetooth_name_choose -0x10014 037310 arg mem_device1_type ,rega -0x10015 037311 fetch 1 ,mem_device_flag -0x10016 037312 fetcht 1 ,mem_24g_device_number -0x10017 037313 isub temp ,null -0x10018 037314 branch p_mouse_start_24g_mode ,zero -0x10019 037315 increase -1 ,pdata -0x1001a 037316 mul32 pdata ,29 ,pdata -0x1001b 037317 iadd rega ,rega -0x1001c 037318 ifetch 1 ,rega -0x1001d 037319 store 1 ,mem_xrecord_mode -0x1001e 037320 beq rec_3_mode ,z_mouse3_0_check_reconn_target -0x1001f 037321 beq rec_4_mode ,z_mouse4_0_check_reconn_target -0x10020 037323 rtn -: 037326 z_mouse_bluetooth_name_choose: -0x10021 037327 fetch 1 ,mem_device_flag -0x10022 037328 rtneq mode_bt_device2 -0x10023 037329 jam 0x32 ,mem_local_name_length + 11 -0x10024 037330 jam 0x32 ,mem_le_name_len + 11 -0x10025 037331 jam 0x32 ,mem_le_scan_data + 12 -0x10026 037332 jam 0x32 ,mem_le_adv_swift_pair + 12 -0x10027 037333 rtn +0x10013 037310 arg mem_device1_type ,rega +0x10014 037311 fetch 1 ,mem_device_flag +0x10015 037312 fetcht 1 ,mem_24g_device_number +0x10016 037313 isub temp ,null +0x10017 037314 branch p_mouse_start_24g_mode ,zero +0x10018 037315 increase -1 ,pdata +0x10019 037316 mul32 pdata ,29 ,pdata +0x1001a 037317 iadd rega ,rega +0x1001b 037318 ifetch 1 ,rega +0x1001c 037319 store 1 ,mem_xrecord_mode +0x1001d 037320 beq rec_3_mode ,z_mouse3_0_check_reconn_target +0x1001e 037321 beq rec_4_mode ,z_mouse4_0_check_reconn_target +0x1001f 037323 rtn : 037335 z_mouse3_0_check_reconn_target: -0x10028 037336 call p_mouse_mode_bt_device_multi_led_on -0x10029 037337 jam 1 ,mem_mouse_bt_reconnect_flag -0x1002a 037338 fetch 6 ,mem_hci_plap -0x1002b 037339 branch app_bt_start_discovery_short ,blank -0x1002c 037340 branch mouse3_0_check_reconn_target + 3 +0x10020 037336 call p_mouse_mode_bt_device_multi_led_on +0x10021 037337 jam 1 ,mem_mouse_bt_reconnect_flag +0x10022 037338 fetch 6 ,mem_hci_plap +0x10023 037339 branch app_bt_start_discovery_short ,blank +0x10024 037340 branch mouse3_0_check_reconn_target + 3 : 037342 z_mouse4_0_check_reconn_target: -0x1002d 037343 jam 1 ,mem_le_send_security_request_flag -0x1002e 037344 call p_mouse_mode_bt_device_multi_led_on -0x1002f 037345 jam 1 ,mem_mouse_le_reconnect_flag -0x10030 037346 fetch 2 ,mem_mouse_direct_timeout -0x10031 037347 fetcht 1 ,mem_mouse_fast_conn_flag -0x10032 037348 sub temp ,0xff ,null -0x10033 037349 nbranch z_mouse4_0_check_reconn_target_next ,zero -0x10034 037350 setarg 0x0258 +0x10025 037343 jam 1 ,mem_le_send_security_request_flag +0x10026 037344 call p_mouse_mode_bt_device_multi_led_on +0x10027 037345 jam 1 ,mem_mouse_le_reconnect_flag +0x10028 037346 fetch 2 ,mem_mouse_direct_timeout +0x10029 037347 fetcht 1 ,mem_mouse_fast_conn_flag +0x1002a 037348 sub temp ,0xff ,null +0x1002b 037349 nbranch z_mouse4_0_check_reconn_target_next ,zero +0x1002c 037350 setarg 0x0258 : 037351 z_mouse4_0_check_reconn_target_next: -0x10035 037352 store 2 ,mem_mouse_direct_timer -0x10036 037353 call app_lpm_mult_disable -0x10037 037354 call p_le_check_adv_flag -0x10038 037355 setarg adv_flag_bredr_not_supported -0x10039 037356 istore 1 ,contr -0x1003a 037357 arg mem_le_scan_data ,contr -0x1003b 037358 call p_le_adv_data_update -0x1003c 037359 branch check_51cmd_adv +0x1002d 037352 store 2 ,mem_mouse_direct_timer +0x1002e 037353 call app_lpm_mult_disable +0x1002f 037354 call p_le_check_adv_flag +0x10030 037355 setarg adv_flag_bredr_not_supported +0x10031 037356 istore 1 ,contr +0x10032 037357 arg mem_le_scan_data ,contr +0x10033 037358 call p_le_adv_data_update +0x10034 037359 branch check_51cmd_adv org 0x20001 : 037364 z_entrance1: 0x20001 037365 beq zcode_10 ,z_mouse_bb_disconnected Index: output/bt_program23.meta =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/bt_program23.meta (revision 7025) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/bt_program23.meta (working copy) @@ -37306,7 +37306,7 @@ z_mouse_check_reconn_target: call p_mouse_tx_power_init call p_mouse_select_device_by_button // for fast check button down - call z_mouse_bluetooth_name_choose + //call z_mouse_bluetooth_name_choose arg mem_device1_type,rega fetch 1,mem_device_flag fetcht 1,mem_24g_device_number @@ -37323,14 +37323,14 @@ rtn //将蓝牙通道1的蓝牙名后面的1转换成2即可，使用ASCALL码表,'32'='2' -z_mouse_bluetooth_name_choose: - fetch 1,mem_device_flag - rtneq MODE_BT_DEVICE2 - jam 0x32,mem_local_name_length+11 - jam 0x32,mem_le_name_len+11 - jam 0x32,mem_le_scan_data+12 - jam 0x32,mem_le_adv_swift_pair+12 - rtn +// z_mouse_bluetooth_name_choose: +// fetch 1,mem_device_flag +// rtneq MODE_BT_DEVICE2 +// jam 0x32,mem_local_name_length+11 +// jam 0x32,mem_le_name_len+11 +// jam 0x32,mem_le_scan_data+12 +// jam 0x32,mem_le_adv_swift_pair+12 +// rtn z_mouse3_0_check_reconn_target: call p_mouse_mode_bt_device_multi_led_on Index: output/bt_program23.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/bt_program23.rom (revision 7025) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/bt_program23.rom (working copy) @@ -65553,7 +65553,6 @@ 00100000001000000010000101011111 00100000010000000000001010000100 00100000010000000000010001001010 -00100000010000000000000000100001 11011010001000000100011100100001 01101000000000001100011100100000 01101000000010001100011100000011 @@ -65564,15 +65563,8 @@ 10011010001000001010001000000000 11101010001000001000000000000000 01100000000000001100001000010000 -11000000000110011000000000101000 -11000000000110100000000000101101 -00100000011000000000000000000000 -01101000000000001100011100100000 -11000001000000010000000000000000 -01110000010001010010000000110010 -01110000010000111011101000110010 -01110000010000111001110000110010 -01110000010010110001111000110010 +11000000000110011000000000100000 +11000000000110100000000000100101 00100000011000000000000000000000 00100000010000000000011011011001 01110000010010110101000100000001 @@ -65585,7 +65577,7 @@ 01101000000000010100011010101000 01101000000010001100101110110001 00011000010001100111110011111111 -00100100001000101000000000110101 +00100100001000101000000000101101 01011000000000000000001001011000 01100000000000010100011010101110 00100000010000000011010000011000 @@ -131071,6 +131063,14 @@ + + + + + + + + 11000000000010000000000000000100 11000000000010001000000000011011 00100000011000000000000000000000 Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/flash.dat (revision 7025) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/flash.dat (working copy) @@ -8255,17 +8255,17 @@ 15 45 0b -43 -72 -6f -6d -61 -20 -47 -4d 42 54 -31 +33 +2e +30 +20 +4d +6f +75 +73 +65 aa 55 05 @@ -8361,17 +8361,17 @@ 4b 0c 09 -43 -72 -6f -6d -61 -20 -47 -4d 42 54 -31 +35 +2e +32 +20 +4d +6f +75 +73 +65 aa 55 0e @@ -8381,17 +8381,17 @@ 1f 0c 09 -43 -72 -6f -6d -61 -20 -47 -4d 42 54 -31 +35 +2e +32 +20 +4d +6f +75 +73 +65 aa 55 0c @@ -8399,17 +8399,17 @@ af 43 0b -43 -72 -6f -6d -61 -20 -47 -4d 42 54 -31 +35 +2e +32 +20 +4d +6f +75 +73 +65 aa 55 08 @@ -9101,8 +9101,8 @@ aa aa 55 -2f -2e +c7 +2d ff 20 20 @@ -12252,10 +12252,6 @@ 40 04 4a -20 -40 -00 -21 da 20 47 @@ -12299,39 +12295,11 @@ c0 19 80 -28 +20 c0 1a 00 -2d -20 -60 -00 -00 -68 -00 -c7 -20 -c1 -01 -00 -00 -70 -45 -20 -32 -70 -43 -ba -32 -70 -43 -9c -32 -70 -4b -1e -32 +25 20 60 00 @@ -12383,7 +12351,7 @@ 24 22 80 -35 +2d 58 00 02 @@ -12432,9 +12400,41 @@ 00 00 00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 aa 55 00 00 -f4 -22 +e5 +53 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/program.lis (revision 7025) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/program.lis (working copy) @@ -35414,56 +35414,46 @@ z_mouse_check_reconn_target: 10011 20400284 call p_mouse_tx_power_init 10012 2040044a call p_mouse_select_device_by_button -10013 20400021 call z_mouse_bluetooth_name_choose -10014 da204721 arg mem_device1_type ,rega -10015 6800c720 fetch 1 ,mem_device_flag -10016 6808c703 fetcht 1 ,mem_24g_device_number -10017 98467c00 isub temp ,null -10018 20228321 branch p_mouse_start_24g_mode ,zero -10019 1fe0ffff increase -1 ,pdata -1001a 1feffe1d mul32 pdata ,29 ,pdata -1001b 9a20a200 iadd rega ,rega -1001c ea208000 ifetch 1 ,rega -1001d 6000c210 store 1 ,mem_xrecord_mode -1001e c0198028 beq rec_3_mode ,z_mouse3_0_check_reconn_target -1001f c01a002d beq rec_4_mode ,z_mouse4_0_check_reconn_target -10020 20600000 rtn - -z_mouse_bluetooth_name_choose: -10021 6800c720 fetch 1 ,mem_device_flag -10022 c1010000 rtneq mode_bt_device2 -10023 70452032 jam 0x32 ,mem_local_name_length + 11 -10024 7043ba32 jam 0x32 ,mem_le_name_len + 11 -10025 70439c32 jam 0x32 ,mem_le_scan_data + 12 -10026 704b1e32 jam 0x32 ,mem_le_adv_swift_pair + 12 -10027 20600000 rtn +10013 da204721 arg mem_device1_type ,rega +10014 6800c720 fetch 1 ,mem_device_flag +10015 6808c703 fetcht 1 ,mem_24g_device_number +10016 98467c00 isub temp ,null +10017 20228321 branch p_mouse_start_24g_mode ,zero +10018 1fe0ffff increase -1 ,pdata +10019 1feffe1d mul32 pdata ,29 ,pdata +1001a 9a20a200 iadd rega ,rega +1001b ea208000 ifetch 1 ,rega +1001c 6000c210 store 1 ,mem_xrecord_mode +1001d c0198020 beq rec_3_mode ,z_mouse3_0_check_reconn_target +1001e c01a0025 beq rec_4_mode ,z_mouse4_0_check_reconn_target +1001f 20600000 rtn z_mouse3_0_check_reconn_target: -10028 204006d9 call p_mouse_mode_bt_device_multi_led_on -10029 704b5101 jam 1 ,mem_mouse_bt_reconnect_flag -1002a 680341d0 fetch 6 ,mem_hci_plap -1002b 203a33eb branch app_bt_start_discovery_short ,blank -1002c 20204274 branch mouse3_0_check_reconn_target + 3 +10020 204006d9 call p_mouse_mode_bt_device_multi_led_on +10021 704b5101 jam 1 ,mem_mouse_bt_reconnect_flag +10022 680341d0 fetch 6 ,mem_hci_plap +10023 203a33eb branch app_bt_start_discovery_short ,blank +10024 20204274 branch mouse3_0_check_reconn_target + 3 z_mouse4_0_check_reconn_target: -1002d 704b6c01 jam 1 ,mem_le_send_security_request_flag -1002e 204006d9 call p_mouse_mode_bt_device_multi_led_on -1002f 7047a101 jam 1 ,mem_mouse_le_reconnect_flag -10030 680146a8 fetch 2 ,mem_mouse_direct_timeout -10031 6808cbb1 fetcht 1 ,mem_mouse_fast_conn_flag -10032 18467cff sub temp ,0xff ,null -10033 24228035 nbranch z_mouse4_0_check_reconn_target_next ,zero -10034 58000258 setarg 0x0258 +10025 704b6c01 jam 1 ,mem_le_send_security_request_flag +10026 204006d9 call p_mouse_mode_bt_device_multi_led_on +10027 7047a101 jam 1 ,mem_mouse_le_reconnect_flag +10028 680146a8 fetch 2 ,mem_mouse_direct_timeout +10029 6808cbb1 fetcht 1 ,mem_mouse_fast_conn_flag +1002a 18467cff sub temp ,0xff ,null +1002b 2422802d nbranch z_mouse4_0_check_reconn_target_next ,zero +1002c 58000258 setarg 0x0258 z_mouse4_0_check_reconn_target_next: -10035 600146ae store 2 ,mem_mouse_direct_timer -10036 20403418 call app_lpm_mult_disable -10037 20400287 call p_le_check_adv_flag -10038 58000004 setarg adv_flag_bredr_not_supported -10039 e0c08000 istore 1 ,contr -1003a d8c04390 arg mem_le_scan_data ,contr -1003b 2040051f call p_le_adv_data_update -1003c 20207df4 branch check_51cmd_adv +1002d 600146ae store 2 ,mem_mouse_direct_timer +1002e 20403418 call app_lpm_mult_disable +1002f 20400287 call p_le_check_adv_flag +10030 58000004 setarg adv_flag_bredr_not_supported +10031 e0c08000 istore 1 ,contr +10032 d8c04390 arg mem_le_scan_data ,contr +10033 2040051f call p_le_adv_data_update +10034 20207df4 branch check_51cmd_adv org 0x20001 z_entrance1: Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/romcode.rom (revision 7025) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/romcode.rom (working copy) @@ -24590,7 +24590,6 @@ 2020215f 20400284 2040044a -20400021 da204721 6800c720 6808c703 @@ -24601,15 +24600,8 @@ 9a20a200 ea208000 6000c210 -c0198028 -c01a002d -20600000 -6800c720 -c1010000 -70452032 -7043ba32 -70439c32 -704b1e32 +c0198020 +c01a0025 20600000 204006d9 704b5101 @@ -24622,7 +24614,7 @@ 680146a8 6808cbb1 18467cff -24228035 +2422802d 58000258 600146ae 20403418 @@ -25204,4 +25196,4 @@ 20400035 6008cdf8 20600000 -0000d1f0 +00007dd0 Index: output/sched.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/sched.rom (revision 7025) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/sched.rom (working copy) @@ -99,7 +99,7 @@ mem_app_connection_options:06 mem_lap:26 10 19 20 18 10 mem_local_name_length: -'Croma GMBT1 +'BT3.0 Mouse mem_sniff_param_interval: 0c 00 ##mem_sniff_param_interval:0e 00 report 115hz,0c 00 report 125hz 01 00 ##mem_sniff_param_attempt:01 00 @@ -136,17 +136,17 @@ #microsoft swift pair #06 ff 06 00 03 00 80 #name -'\09Croma GMBT1 +'\09BT5.2 Mouse mem_le_scan_data_len:1f mem_le_scan_data: #name -'\09Croma GMBT1 +'\09BT5.2 Mouse #max 20bytes, att list data rom limits mem_le_name_len: -'Croma GMBT1 +'BT5.2 Mouse mem_le_interval_min: Index: output/zcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/zcode.rom (revision 7025) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/output/zcode.rom (working copy) @@ -785,7 +785,6 @@ 2020215f 20400284 2040044a -20400021 da204721 6800c720 6808c703 @@ -796,15 +795,8 @@ 9a20a200 ea208000 6000c210 -c0198028 -c01a002d -20600000 -6800c720 -c1010000 -70452032 -7043ba32 -70439c32 -704b1e32 +c0198020 +c01a0025 20600000 204006d9 704b5101 @@ -817,7 +809,7 @@ 680146a8 6808cbb1 18467cff -24228035 +2422802d 58000258 600146ae 20403418 @@ -830,3 +822,11 @@ 00000000 00000000 00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 +00000000 Index: program/z.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/program/z.prog (revision 7025) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/program/z.prog (working copy) @@ -25,7 +25,7 @@ z_mouse_check_reconn_target: call p_mouse_tx_power_init call p_mouse_select_device_by_button // for fast check button down - call z_mouse_bluetooth_name_choose + //call z_mouse_bluetooth_name_choose arg mem_device1_type,rega fetch 1,mem_device_flag fetcht 1,mem_24g_device_number @@ -46,14 +46,14 @@ rtn //将蓝牙通道1的蓝牙名后面的1转换成2即可，使用ASCALL码表,'32'='2' -z_mouse_bluetooth_name_choose: - fetch 1,mem_device_flag - rtneq MODE_BT_DEVICE2 - jam 0x32,mem_local_name_length+11 - jam 0x32,mem_le_name_len+11 - jam 0x32,mem_le_scan_data+12 - jam 0x32,mem_le_adv_swift_pair+12 - rtn +// z_mouse_bluetooth_name_choose: +// fetch 1,mem_device_flag +// rtneq MODE_BT_DEVICE2 +// jam 0x32,mem_local_name_length+11 +// jam 0x32,mem_le_name_len+11 +// jam 0x32,mem_le_scan_data+12 +// jam 0x32,mem_le_adv_swift_pair+12 +// rtn ifdef CLASSIC_BT z_mouse3_0_check_reconn_target: Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/sched/mouse.dat (revision 7025) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_P111_new/sched/mouse.dat (working copy) @@ -62,7 +62,7 @@ mem_app_connection_options:06 mem_lap:26 10 19 20 18 10 mem_local_name_length: -'Croma GMBT1 +'BT3.0 Mouse mem_sniff_param_interval: 0c 00 ##mem_sniff_param_interval:0e 00 report 115hz,0c 00 report 125hz 01 00 ##mem_sniff_param_attempt:01 00 @@ -99,17 +99,17 @@ #microsoft swift pair #06 ff 06 00 03 00 80 #name -'\09Croma GMBT1 +'\09BT5.2 Mouse mem_le_scan_data_len:1f mem_le_scan_data: #name -'\09Croma GMBT1 +'\09BT5.2 Mouse #max 20bytes, att list data rom limits mem_le_name_len: -'Croma GMBT1 +'BT5.2 Mouse mem_le_interval_min: