Index: output/bt_program23.icode =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/bt_program23.icode (revision 6229) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/bt_program23.icode (working copy) @@ -1054,7 +1054,7 @@ 00001053 0x000006ab call 0x00004234 00001054 0x000006ac call 0x0000043e 00001055 0x000006ae call 0x00000464 - 00001056 0x000006af call 0x00000471 + 00001056 0x000006af call 0x00004237 00001057 0x000006b0 call 0x00000477 00001058 0x000006b1 call 0x0000047a 00001059 0x000006b3 call 0x00000469 @@ -26648,8 +26648,8 @@ 00065593 0x000091c6 copy 0x00000002 , 0x0000003f 00065594 0x000091c7 beq 0x00000005 , 0x000003fd 00065595 0x000091c8 branch 0x00004d41 - 00131073 0x000091cd beq 0x00000010 , 0x0002001a - 00131074 0x000091ce beq 0x00000011 , 0x00020027 + 00131073 0x000091cd beq 0x00000010 , 0x00020017 + 00131074 0x000091ce beq 0x00000011 , 0x00020024 00131075 0x000091cf beq 0x00000012 , 0x00020005 00131076 0x000091d0 rtn 00131077 0x000091d3 call 0x000004b4 @@ -26658,52 +26658,49 @@ 00131080 0x000091d6 beq 0x00000002 , 0x0000031f 00131081 0x000091d8 fetch 0x00000001 , 0x00004210 00131082 0x000091d9 beq 0x00000033 , 0x0000028f - 00131083 0x000091da beq 0x00000034 , 0x00020010 - 00131084 0x000091db call 0x000004a3 - 00131085 0x000091dc jam 0x00000006 , 0x0000016d - 00131086 0x000091dd call 0x0000045f - 00131087 0x000091de branch 0x00007ddd - 00131088 0x000091e1 call 0x000004bb - 00131089 0x000091e2 jam 0x00000001 , 0x00004b6f - 00131090 0x000091e3 jam 0x00000001 , 0x0000479f - 00131091 0x000091e4 fetch 0x00000002 , 0x000046a8 - 00131092 0x000091e5 store 0x00000002 , 0x000046ae - 00131093 0x000091e6 call 0x0000045d - 00131094 0x000091e7 call 0x00003418 - 00131095 0x000091e8 arg 0x00004390 , 0x00000006 - 00131096 0x000091e9 call 0x00000459 - 00131097 0x000091ea branch 0x00007df4 - 00131098 0x000091ed fetch 0x00000001 , 0x00000048 - 00131099 0x000091ee beq 0x00000084 , 0x0002001e - 00131100 0x000091ef beq 0x00000083 , 0x00020021 - 00131101 0x000091f0 branch 0x0000603f - 00131102 0x000091f2 call 0x00020024 - 00131103 0x000091f3 fetch 0x00000001 , 0x00000048 - 00131104 0x000091f4 branch 0x00006099 - 00131105 0x000091f6 call 0x00020024 - 00131106 0x000091f7 fetch 0x00000001 , 0x00000048 - 00131107 0x000091f8 branch 0x0000610d - 00131108 0x000091fa fetch 0x00000001 , 0x0000465a - 00131109 0x000091fb branch 0x0000612b , 0x00000034 - 00131110 0x000091fc branch 0x00006124 - 00131111 0x000091ff force 0x00000002 , 0x0000003f - 00131112 0x00009200 call 0x00006298 - 00131113 0x00009201 fetch 0x00000001 , 0x00000049 - 00131114 0x00009202 istore 0x00000001 , 0x00000005 - 00131115 0x00009203 store 0x00000001 , 0x00004afa - 00131116 0x00009204 call 0x000062a7 - 00131117 0x00009205 fetch 0x00000001 , 0x00004afa - 00131118 0x00009206 beq 0x0000002e , 0x00020030 - 00131119 0x00009207 branch 0x00006051 - 00131120 0x0000920a fetch 0x00000001 , 0x00004afd - 00131121 0x0000920b rtn 0x00000034 - 00131122 0x0000920c jam 0x00000000 , 0x00004afd - 00131123 0x0000920d fetch 0x00000001 , 0x00004aff - 00131124 0x0000920e rtnne 0x00000002 - 00131125 0x0000920f jam 0x00000001 , 0x00004afe - 00131126 0x00009210 copy 0x00000022 , 0x0000003f - 00131127 0x00009211 store 0x00000004 , 0x000004e9 - 00131128 0x00009212 rtn + 00131083 0x000091da beq 0x00000034 , 0x0002000d + 00131084 0x000091df rtn + 00131085 0x000091e1 call 0x000004bb + 00131086 0x000091e2 jam 0x00000001 , 0x00004b6f + 00131087 0x000091e3 jam 0x00000001 , 0x0000479f + 00131088 0x000091e4 fetch 0x00000002 , 0x000046a8 + 00131089 0x000091e5 store 0x00000002 , 0x000046ae + 00131090 0x000091e6 call 0x0000045d + 00131091 0x000091e7 call 0x00003418 + 00131092 0x000091e8 arg 0x00004390 , 0x00000006 + 00131093 0x000091e9 call 0x00000459 + 00131094 0x000091ea branch 0x00007df4 + 00131095 0x000091ed fetch 0x00000001 , 0x00000048 + 00131096 0x000091ee beq 0x00000084 , 0x0002001b + 00131097 0x000091ef beq 0x00000083 , 0x0002001e + 00131098 0x000091f0 branch 0x0000603f + 00131099 0x000091f2 call 0x00020021 + 00131100 0x000091f3 fetch 0x00000001 , 0x00000048 + 00131101 0x000091f4 branch 0x00006099 + 00131102 0x000091f6 call 0x00020021 + 00131103 0x000091f7 fetch 0x00000001 , 0x00000048 + 00131104 0x000091f8 branch 0x0000610d + 00131105 0x000091fa fetch 0x00000001 , 0x0000465a + 00131106 0x000091fb branch 0x0000612b , 0x00000034 + 00131107 0x000091fc branch 0x00006124 + 00131108 0x000091ff force 0x00000002 , 0x0000003f + 00131109 0x00009200 call 0x00006298 + 00131110 0x00009201 fetch 0x00000001 , 0x00000049 + 00131111 0x00009202 istore 0x00000001 , 0x00000005 + 00131112 0x00009203 store 0x00000001 , 0x00004afa + 00131113 0x00009204 call 0x000062a7 + 00131114 0x00009205 fetch 0x00000001 , 0x00004afa + 00131115 0x00009206 beq 0x0000002e , 0x0002002d + 00131116 0x00009207 branch 0x00006051 + 00131117 0x0000920a fetch 0x00000001 , 0x00004afd + 00131118 0x0000920b rtn 0x00000034 + 00131119 0x0000920c jam 0x00000000 , 0x00004afd + 00131120 0x0000920d fetch 0x00000001 , 0x00004aff + 00131121 0x0000920e rtnne 0x00000002 + 00131122 0x0000920f jam 0x00000001 , 0x00004afe + 00131123 0x00009210 copy 0x00000022 , 0x0000003f + 00131124 0x00009211 store 0x00000004 , 0x000004e9 + 00131125 0x00009212 rtn 00196609 0x00009217 beq 0x00000020 , 0x00030006 00196610 0x00009218 beq 0x00000021 , 0x00030018 00196611 0x00009219 beq 0x00000022 , 0x00030025 Index: output/bt_program23.list =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/bt_program23.list (revision 6229) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/bt_program23.list (working copy) @@ -1240,7 +1240,7 @@ 0x41d 001707 call mouse_check_discovery_timeout_timer 0x41e 001708 call p_mouse_check_select_device_by_switch_timer 0x41f 001710 call p_mouse_g24_stop_mode_timeout_timer -0x420 001711 call p_mouse_check_direct_timeout_timer +0x420 001711 call mouse_check_direct_timeout_timer 0x421 001712 call p_mouse_le_enable_att_list_timer 0x422 001713 call p_le_send_smp_security_request_timer 0x423 001715 call p_mouse_send_switch_req_timer @@ -31103,58 +31103,55 @@ 0x20009 037336 fetch 1 ,mem_xrecord_mode 0x2000a 037337 beq rec_3_mode ,p_mouse3_0_check_reconn_target 0x2000b 037338 beq rec_4_mode ,z_mouse4_0_check_reconn_target -0x2000c 037339 call p_mouse_fast_conn_adv_switch_timer_reinit -0x2000d 037340 jam 6 ,mem_connection_options -0x2000e 037341 call p_mouse_check_fast_conn_adv_start -0x2000f 037342 branch check_51cmd_start_discovery +0x2000c 037343 rtn : 037344 z_mouse4_0_check_reconn_target: -0x20010 037345 call p_mouse_bt_reconn_multi_led_blink -0x20011 037346 jam 1 ,mem_le_send_security_request_flag -0x20012 037347 jam 1 ,mem_mouse_le_reconnect_flag -0x20013 037348 fetch 2 ,mem_mouse_direct_timeout -0x20014 037349 store 2 ,mem_mouse_direct_timer -0x20015 037350 call p_mouse_store_eeprom_enable -0x20016 037351 call app_lpm_mult_disable -0x20017 037352 arg mem_le_scan_data ,contr -0x20018 037353 call p_le_adv_data_update -0x20019 037354 branch check_51cmd_adv +0x2000d 037345 call p_mouse_bt_reconn_multi_led_blink +0x2000e 037346 jam 1 ,mem_le_send_security_request_flag +0x2000f 037347 jam 1 ,mem_mouse_le_reconnect_flag +0x20010 037348 fetch 2 ,mem_mouse_direct_timeout +0x20011 037349 store 2 ,mem_mouse_direct_timer +0x20012 037350 call p_mouse_store_eeprom_enable +0x20013 037351 call app_lpm_mult_disable +0x20014 037352 arg mem_le_scan_data ,contr +0x20015 037353 call p_le_adv_data_update +0x20016 037354 branch check_51cmd_adv : 037356 z_send_lmp_escape: -0x2001a 037357 fetch 1 ,mem_lmp_to_send -0x2001b 037358 beq lmp_ext_features_res ,z_send_lmpext_features_res -0x2001c 037359 beq lmp_ext_features_req ,z_send_lmpext_features_req -0x2001d 037360 branch send_lmp_escape +0x20017 037357 fetch 1 ,mem_lmp_to_send +0x20018 037358 beq lmp_ext_features_res ,z_send_lmpext_features_res +0x20019 037359 beq lmp_ext_features_req ,z_send_lmpext_features_req +0x2001a 037360 branch send_lmp_escape : 037361 z_send_lmpext_features_res: -0x2001e 037362 call z_check_ssp_enable -0x2001f 037363 fetch 1 ,mem_lmp_to_send -0x20020 037364 branch send_lmpext_features_res +0x2001b 037362 call z_check_ssp_enable +0x2001c 037363 fetch 1 ,mem_lmp_to_send +0x2001d 037364 branch send_lmpext_features_res : 037365 z_send_lmpext_features_req: -0x20021 037366 call z_check_ssp_enable -0x20022 037367 fetch 1 ,mem_lmp_to_send -0x20023 037368 branch send_lmpext_features_req +0x2001e 037366 call z_check_ssp_enable +0x2001f 037367 fetch 1 ,mem_lmp_to_send +0x20020 037368 branch send_lmpext_features_req : 037369 z_check_ssp_enable: -0x20024 037370 fetch 1 ,mem_ssp_enable -0x20025 037371 branch ssp_disable ,blank -0x20026 037372 branch ssp_enable +0x20021 037370 fetch 1 ,mem_ssp_enable +0x20022 037371 branch ssp_disable ,blank +0x20023 037372 branch ssp_enable : 037374 z_send_lmp_accepted: -0x20027 037375 force 2 ,pdata -0x20028 037376 call msg_send_lmp -0x20029 037377 fetch 1 ,mem_lmi_opcode -0x2002a 037378 istore 1 ,contw -0x2002b 037379 store 1 ,mem_lmi_opcode_temp -0x2002c 037380 call send_lmp_follow -0x2002d 037381 fetch 1 ,mem_lmi_opcode_temp -0x2002e 037382 beq lmp_max_slot_req ,z_send_lmp_accepted_max_slot_req -0x2002f 037383 branch send_lmp_accepted + 7 +0x20024 037375 force 2 ,pdata +0x20025 037376 call msg_send_lmp +0x20026 037377 fetch 1 ,mem_lmi_opcode +0x20027 037378 istore 1 ,contw +0x20028 037379 store 1 ,mem_lmi_opcode_temp +0x20029 037380 call send_lmp_follow +0x2002a 037381 fetch 1 ,mem_lmi_opcode_temp +0x2002b 037382 beq lmp_max_slot_req ,z_send_lmp_accepted_max_slot_req +0x2002c 037383 branch send_lmp_accepted + 7 : 037385 z_send_lmp_accepted_max_slot_req: -0x20030 037386 fetch 1 ,mem_bt_rcvd_switch_req_accept -0x20031 037387 rtn blank -0x20032 037388 jam 0 ,mem_bt_rcvd_switch_req_accept -0x20033 037389 fetch 1 ,mem_bt_send_lmp_setup_complete -0x20034 037390 rtnne 2 -0x20035 037391 jam 1 ,mem_bt_send_max_slot_req_accept_after_switch -0x20036 037392 copy clkn_bt ,pdata -0x20037 037393 store 4 ,mem_aurand_send_delay_time -0x20038 037394 rtn +0x2002d 037386 fetch 1 ,mem_bt_rcvd_switch_req_accept +0x2002e 037387 rtn blank +0x2002f 037388 jam 0 ,mem_bt_rcvd_switch_req_accept +0x20030 037389 fetch 1 ,mem_bt_send_lmp_setup_complete +0x20031 037390 rtnne 2 +0x20032 037391 jam 1 ,mem_bt_send_max_slot_req_accept_after_switch +0x20033 037392 copy clkn_bt ,pdata +0x20034 037393 store 4 ,mem_aurand_send_delay_time +0x20035 037394 rtn org 0x30001 : 037398 z_entrance2: 0x30001 037399 beq zcode_20 ,z_le_update_param Index: output/bt_program23.meta =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/bt_program23.meta (revision 6229) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/bt_program23.meta (working copy) @@ -1708,7 +1708,7 @@ call p_mouse_check_select_device_by_switch_timer //call p_mouse_g24_long_sleep_param_update_timer call p_mouse_g24_stop_mode_timeout_timer - call p_mouse_check_direct_timeout_timer + call mouse_check_direct_timeout_timer call p_mouse_le_enable_att_list_timer call p_le_send_smp_security_request_timer //call p_mouse_le_current_mult_update_timer @@ -37336,11 +37336,11 @@ fetch 1,mem_xrecord_mode beq REC_3_MODE,p_mouse3_0_check_reconn_target beq REC_4_MODE,z_mouse4_0_check_reconn_target - call p_mouse_fast_conn_adv_switch_timer_reinit - jam 6,mem_connection_options - call p_mouse_check_fast_conn_adv_start - branch check_51cmd_start_discovery - +// call p_mouse_fast_conn_adv_switch_timer_reinit +// jam 6,mem_connection_options +// call p_mouse_check_fast_conn_adv_start +// branch check_51cmd_start_discovery + rtn z_mouse4_0_check_reconn_target: call p_mouse_bt_reconn_multi_led_blink jam 1,mem_le_send_security_request_flag Index: output/bt_program23.rom =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/bt_program23.rom (revision 6229) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/bt_program23.rom (working copy) @@ -1054,7 +1054,7 @@ 00100000010000000100001000110100 00100000010000000000010000111110 00100000010000000000010001100100 -00100000010000000000010001110001 +00100000010000000100001000110111 00100000010000000000010001110111 00100000010000000000010001111010 00100000010000000000010001101001 @@ -131071,8 +131071,8 @@ -11000000000010000000000000011010 -11000000000010001000000000100111 +11000000000010000000000000010111 +11000000000010001000000000100100 11000000000010010000000000000101 00100000011000000000000000000000 00100000010000000000010010110100 @@ -131081,11 +131081,8 @@ 11000000000000010000001100011111 01101000000000001100001000010000 11000000000110011000001010001111 -11000000000110100000000000010000 -00100000010000000000010010100011 -01110000000000010110110100000110 -00100000010000000000010001011111 -00100000001000000111110111011101 +11000000000110100000000000001101 +00100000011000000000000000000000 00100000010000000000010010111011 01110000010010110110111100000001 01110000010001111001111100000001 @@ -131097,13 +131094,13 @@ 00100000010000000000010001011001 00100000001000000111110111110100 01101000000000001000000001001000 -11000000010000100000000000011110 -11000000010000011000000000100001 +11000000010000100000000000011011 +11000000010000011000000000011110 00100000001000000110000000111111 -00100000010000000000000000100100 +00100000010000000000000000100001 01101000000000001000000001001000 00100000001000000110000010011001 -00100000010000000000000000100100 +00100000010000000000000000100001 01101000000000001000000001001000 00100000001000000110000100001101 01101000000000001100011001011010 @@ -131116,7 +131113,7 @@ 01100000000000001100101011111010 00100000010000000110001010100111 01101000000000001100101011111010 -11000000000101110000000000110000 +11000000000101110000000000101101 00100000001000000110000001010001 01101000000000001100101011111101 00100000011110100000000000000000 @@ -196607,6 +196604,9 @@ + + + 11000000000100000000000000000110 11000000000100001000000000011000 11000000000100010000000000100101 Index: output/flash.dat =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/flash.dat (revision 6229) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/flash.dat (working copy) @@ -4230,8 +4230,8 @@ 64 20 40 -04 -71 +42 +37 20 40 04 @@ -8072,8 +8072,8 @@ 20 07 dc -76 -52 +4c +8a aa 55 08 @@ -8081,7 +8081,7 @@ 75 41 8f -1f +10 ce 00 0a @@ -8589,7 +8589,7 @@ 00 a8 46 -50 +32 00 70 17 @@ -9139,7 +9139,7 @@ aa aa 55 -72 +45 12 ff 20 @@ -11709,11 +11709,11 @@ c0 08 00 -1a +17 c0 08 80 -27 +24 c0 09 00 @@ -11749,23 +11749,11 @@ c0 1a 00 -10 -20 -40 -04 -a3 -70 -01 -6d -06 -20 -40 -04 -5f -20 +0d 20 -7d -dd +60 +00 +00 20 40 04 @@ -11813,11 +11801,11 @@ c0 42 00 -1e +1b c0 41 80 -21 +1e 20 20 60 @@ -11825,7 +11813,7 @@ 20 40 00 -24 +21 68 00 80 @@ -11837,7 +11825,7 @@ 20 40 00 -24 +21 68 00 80 @@ -11889,7 +11877,7 @@ c0 17 00 -30 +2d 20 20 60 @@ -11958,6 +11946,18 @@ 00 00 00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 +00 20 20 00 @@ -12218,5 +12218,5 @@ 55 00 00 -14 -92 +11 +4e Index: output/program.lis =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/program.lis (revision 6229) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/program.lis (working copy) @@ -1424,7 +1424,7 @@ 041d 20404234 call mouse_check_discovery_timeout_timer 041e 2040043e call p_mouse_check_select_device_by_switch_timer 041f 20400464 call p_mouse_g24_stop_mode_timeout_timer -0420 20400471 call p_mouse_check_direct_timeout_timer +0420 20404237 call mouse_check_direct_timeout_timer 0421 20400477 call p_mouse_le_enable_att_list_timer 0422 2040047a call p_le_send_smp_security_request_timer 0423 20400469 call p_mouse_send_switch_req_timer @@ -35529,8 +35529,8 @@ org 0x20001 z_entrance1: -20001 c008001a beq zcode_10 ,z_send_lmp_escape -20002 c0088027 beq zcode_11 ,z_send_lmp_accepted +20001 c0080017 beq zcode_10 ,z_send_lmp_escape +20002 c0088024 beq zcode_11 ,z_send_lmp_accepted 20003 c0090005 beq zcode_12 ,z_mouse_check_reconn_target 20004 20600000 rtn @@ -35541,66 +35541,63 @@ 20008 c001031f beq mode_24g_device ,p_mouse_connect_24g_mode 20009 6800c210 fetch 1 ,mem_xrecord_mode 2000a c019828f beq rec_3_mode ,p_mouse3_0_check_reconn_target -2000b c01a0010 beq rec_4_mode ,z_mouse4_0_check_reconn_target -2000c 204004a3 call p_mouse_fast_conn_adv_switch_timer_reinit -2000d 70016d06 jam 6 ,mem_connection_options -2000e 2040045f call p_mouse_check_fast_conn_adv_start -2000f 20207ddd branch check_51cmd_start_discovery +2000b c01a000d beq rec_4_mode ,z_mouse4_0_check_reconn_target +2000c 20600000 rtn z_mouse4_0_check_reconn_target: -20010 204004bb call p_mouse_bt_reconn_multi_led_blink -20011 704b6f01 jam 1 ,mem_le_send_security_request_flag -20012 70479f01 jam 1 ,mem_mouse_le_reconnect_flag -20013 680146a8 fetch 2 ,mem_mouse_direct_timeout -20014 600146ae store 2 ,mem_mouse_direct_timer -20015 2040045d call p_mouse_store_eeprom_enable -20016 20403418 call app_lpm_mult_disable -20017 d8c04390 arg mem_le_scan_data ,contr -20018 20400459 call p_le_adv_data_update -20019 20207df4 branch check_51cmd_adv +2000d 204004bb call p_mouse_bt_reconn_multi_led_blink +2000e 704b6f01 jam 1 ,mem_le_send_security_request_flag +2000f 70479f01 jam 1 ,mem_mouse_le_reconnect_flag +20010 680146a8 fetch 2 ,mem_mouse_direct_timeout +20011 600146ae store 2 ,mem_mouse_direct_timer +20012 2040045d call p_mouse_store_eeprom_enable +20013 20403418 call app_lpm_mult_disable +20014 d8c04390 arg mem_le_scan_data ,contr +20015 20400459 call p_le_adv_data_update +20016 20207df4 branch check_51cmd_adv z_send_lmp_escape: -2001a 68008048 fetch 1 ,mem_lmp_to_send -2001b c042001e beq lmp_ext_features_res ,z_send_lmpext_features_res -2001c c0418021 beq lmp_ext_features_req ,z_send_lmpext_features_req -2001d 2020603f branch send_lmp_escape +20017 68008048 fetch 1 ,mem_lmp_to_send +20018 c042001b beq lmp_ext_features_res ,z_send_lmpext_features_res +20019 c041801e beq lmp_ext_features_req ,z_send_lmpext_features_req +2001a 2020603f branch send_lmp_escape z_send_lmpext_features_res: -2001e 20400024 call z_check_ssp_enable -2001f 68008048 fetch 1 ,mem_lmp_to_send -20020 20206099 branch send_lmpext_features_res +2001b 20400021 call z_check_ssp_enable +2001c 68008048 fetch 1 ,mem_lmp_to_send +2001d 20206099 branch send_lmpext_features_res z_send_lmpext_features_req: -20021 20400024 call z_check_ssp_enable -20022 68008048 fetch 1 ,mem_lmp_to_send -20023 2020610d branch send_lmpext_features_req +2001e 20400021 call z_check_ssp_enable +2001f 68008048 fetch 1 ,mem_lmp_to_send +20020 2020610d branch send_lmpext_features_req z_check_ssp_enable: -20024 6800c65a fetch 1 ,mem_ssp_enable -20025 203a612b branch ssp_disable ,blank -20026 20206124 branch ssp_enable +20021 6800c65a fetch 1 ,mem_ssp_enable +20022 203a612b branch ssp_disable ,blank +20023 20206124 branch ssp_enable z_send_lmp_accepted: -20027 18007e02 force 2 ,pdata -20028 20406298 call msg_send_lmp -20029 68008049 fetch 1 ,mem_lmi_opcode -2002a e0a08000 istore 1 ,contw -2002b 6000cafa store 1 ,mem_lmi_opcode_temp -2002c 204062a7 call send_lmp_follow -2002d 6800cafa fetch 1 ,mem_lmi_opcode_temp -2002e c0170030 beq lmp_max_slot_req ,z_send_lmp_accepted_max_slot_req -2002f 20206051 branch send_lmp_accepted + 7 +20024 18007e02 force 2 ,pdata +20025 20406298 call msg_send_lmp +20026 68008049 fetch 1 ,mem_lmi_opcode +20027 e0a08000 istore 1 ,contw +20028 6000cafa store 1 ,mem_lmi_opcode_temp +20029 204062a7 call send_lmp_follow +2002a 6800cafa fetch 1 ,mem_lmi_opcode_temp +2002b c017002d beq lmp_max_slot_req ,z_send_lmp_accepted_max_slot_req +2002c 20206051 branch send_lmp_accepted + 7 z_send_lmp_accepted_max_slot_req: -20030 6800cafd fetch 1 ,mem_bt_rcvd_switch_req_accept -20031 207a0000 rtn blank -20032 704afd00 jam 0 ,mem_bt_rcvd_switch_req_accept -20033 6800caff fetch 1 ,mem_bt_send_lmp_setup_complete -20034 c1810000 rtnne 2 -20035 704afe01 jam 1 ,mem_bt_send_max_slot_req_accept_after_switch -20036 1c427e00 copy clkn_bt ,pdata -20037 600204e9 store 4 ,mem_aurand_send_delay_time -20038 20600000 rtn +2002d 6800cafd fetch 1 ,mem_bt_rcvd_switch_req_accept +2002e 207a0000 rtn blank +2002f 704afd00 jam 0 ,mem_bt_rcvd_switch_req_accept +20030 6800caff fetch 1 ,mem_bt_send_lmp_setup_complete +20031 c1810000 rtnne 2 +20032 704afe01 jam 1 ,mem_bt_send_max_slot_req_accept_after_switch +20033 1c427e00 copy clkn_bt ,pdata +20034 600204e9 store 4 ,mem_aurand_send_delay_time +20035 20600000 rtn org 0x30001 z_entrance2: Index: output/ramcode.rom =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/ramcode.rom (revision 6229) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/ramcode.rom (working copy) @@ -1054,7 +1054,7 @@ 20404234 2040043e 20400464 -20400471 +20404237 20400477 2040047a 20400469 Index: output/romcode.rom =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/romcode.rom (revision 6229) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/romcode.rom (working copy) @@ -24631,8 +24631,8 @@ 18427e00 c00283fd 20204d41 -c008001a -c0088027 +c0080017 +c0088024 c0090005 20600000 204004b4 @@ -24641,11 +24641,8 @@ c001031f 6800c210 c019828f -c01a0010 -204004a3 -70016d06 -2040045f -20207ddd +c01a000d +20600000 204004bb 704b6f01 70479f01 @@ -24657,13 +24654,13 @@ 20400459 20207df4 68008048 -c042001e -c0418021 +c042001b +c041801e 2020603f -20400024 +20400021 68008048 20206099 -20400024 +20400021 68008048 2020610d 6800c65a @@ -24676,7 +24673,7 @@ 6000cafa 204062a7 6800cafa -c0170030 +c017002d 20206051 6800cafd 207a0000 @@ -25132,4 +25129,4 @@ 58000000 600146b0 2020426f -0000a060 +00002060 Index: output/sched.rom =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/sched.rom (revision 6185) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/output/sched.rom (working copy) @@ -1,5 +1,5 @@ -mem_lpm_config:8f 1f ce #4khz +mem_lpm_config:8f 10 ce #4khz mem_lpm_xtalcnt:00 0a 0b ef 07 mem_lpm_hibernate_switch:00 mem_gpio_wakeup_low:00 00 00 00 00 00 00 00 @@ -170,7 +170,7 @@ mem_discovery_timeout:08 07#3min -mem_mouse_direct_timeout:50 00#8s +mem_mouse_direct_timeout:32 00#5s mem_mouse_no_data_timeout:70 17#30min mem_flash_ncs_gpio:0a Index: program/patch.prog =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/program/patch.prog (revision 6229) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/program/patch.prog (working copy) @@ -1910,7 +1910,7 @@ call p_mouse_g24_stop_mode_timeout_timer endif ifdef BLE - call p_mouse_check_direct_timeout_timer + call mouse_check_direct_timeout_timer call p_mouse_le_enable_att_list_timer call p_le_send_smp_security_request_timer //call p_mouse_le_current_mult_update_timer Index: program/z.prog =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/program/z.prog (revision 6185) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/program/z.prog (working copy) @@ -103,11 +103,11 @@ ifdef BLE beq REC_4_MODE,z_mouse4_0_check_reconn_target endif - call p_mouse_fast_conn_adv_switch_timer_reinit - jam 6,mem_connection_options - call p_mouse_check_fast_conn_adv_start - branch check_51cmd_start_discovery - +// call p_mouse_fast_conn_adv_switch_timer_reinit +// jam 6,mem_connection_options +// call p_mouse_check_fast_conn_adv_start +// branch check_51cmd_start_discovery + rtn z_mouse4_0_check_reconn_target: call p_mouse_bt_reconn_multi_led_blink jam 1,mem_le_send_security_request_flag Index: sched/109x.dat =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/sched/109x.dat (revision 6185) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/sched/109x.dat (working copy) @@ -1,5 +1,5 @@ -mem_lpm_config:8f 1f ce #4khz +mem_lpm_config:8f 10 ce #4khz mem_lpm_xtalcnt:00 0a 0b ef 07 mem_lpm_hibernate_switch:00 mem_gpio_wakeup_low:00 00 00 00 00 00 00 00 Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/sched/mouse.dat (revision 6185) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/SlideSwitch_BNH-106_PBdiscover/sched/mouse.dat (working copy) @@ -133,7 +133,7 @@ mem_discovery_timeout:08 07#3min -mem_mouse_direct_timeout:50 00#8s +mem_mouse_direct_timeout:32 00#5s mem_mouse_no_data_timeout:70 17#30min mem_flash_ncs_gpio:0a