Index: output/bt_program23.icode =================================================================== --- /branch/mouse_project/YFK/1059_3mode/PM8/output/bt_program23.icode (revision 2603) +++ /branch/mouse_project/YFK/1059_3mode/PM8/output/bt_program23.icode (working copy) @@ -1484,7 +1484,7 @@ 00001483 0x000008ea fetch 0x00000001 , 0x000046c5 00001484 0x000008eb and 0x0000003f , 0x00000003 , 0x0000003f 00001485 0x000008ec rtneq 0x00000003 - 00001486 0x000008ed jam 0x00000001 , 0x000046c6 + 00001486 0x000008ed jam 0x0000000f , 0x000046c6 00001487 0x000008ee rtn 00001488 0x000008f1 rtnmark1 0x0000000f 00001489 0x000008f2 call 0x00005890 @@ -27162,7 +27162,7 @@ 00786434 0x0000940b beq 0x000000b1 , 0x000c000a 00786435 0x0000940c beq 0x000000b2 , 0x000c0010 00786436 0x0000940d beq 0x000000b3 , 0x000c0015 - 00786437 0x0000940e beq 0x000000b4 , 0x000c001c + 00786437 0x0000940e beq 0x000000b4 , 0x000c001d 00786438 0x0000940f rtn 00786439 0x00009412 call 0x000002c4 00786440 0x00009413 call 0x000003cb @@ -27178,15 +27178,16 @@ 00786450 0x00009421 jam 0x00000000 , 0x0000480a 00786451 0x00009422 jam 0x0000000e , 0x000041e3 00786452 0x00009423 branch 0x0000340e - 00786453 0x00009426 fetch 0x00000001 , 0x000047a1 - 00786454 0x00009427 beq 0x00000001 , 0x000c0018 - 00786455 0x00009428 branch 0x000c001a - 00786456 0x0000942a call 0x00000439 - 00786457 0x0000942b jam 0x00000005 , 0x000046c6 - 00786458 0x0000942d arg 0x00000001 , 0x00000007 - 00786459 0x0000942e branch 0x000041b9 - 00786460 0x00009431 call 0x00000452 - 00786461 0x00009432 jam 0x00000000 , 0x00004b01 - 00786462 0x00009433 jam 0x00000000 , 0x00004b03 - 00786463 0x00009434 jam 0x00000000 , 0x00004b0c - 00786464 0x00009435 branch 0x000041d9 + 00786453 0x00009426 jam 0x0000000f , 0x000046c6 + 00786454 0x00009427 fetch 0x00000001 , 0x000047a1 + 00786455 0x00009428 beq 0x00000001 , 0x000c0019 + 00786456 0x00009429 branch 0x000c001b + 00786457 0x0000942b call 0x00000439 + 00786458 0x0000942c jam 0x0000000f , 0x000046c6 + 00786459 0x0000942e arg 0x00000001 , 0x00000007 + 00786460 0x0000942f branch 0x000041b9 + 00786461 0x00009432 call 0x00000452 + 00786462 0x00009433 jam 0x00000000 , 0x00004b01 + 00786463 0x00009434 jam 0x00000000 , 0x00004b03 + 00786464 0x00009435 jam 0x00000000 , 0x00004b0c + 00786465 0x00009436 branch 0x000041d9 Index: output/bt_program23.list =================================================================== --- /branch/mouse_project/YFK/1059_3mode/PM8/output/bt_program23.list (revision 2603) +++ /branch/mouse_project/YFK/1059_3mode/PM8/output/bt_program23.list (working copy) @@ -1753,7 +1753,7 @@ 0x05cb 002282 fetch 1 ,mem_le_connect_status_flag 0x05cc 002283 and pdata ,0x03 ,pdata 0x05cd 002284 rtneq 0x03 -0x05ce 002285 jam 1 ,mem_le_start_encrypt_timer +0x05ce 002285 jam 15 ,mem_le_start_encrypt_timer 0x05cf 002286 rtn : 002288 p_le_parse: 0x05d0 002289 rtnmark1 mark_old_packet @@ -31674,18 +31674,19 @@ 0xc0013 037922 jam 0x0e ,mem_sniff_param_interval 0xc0014 037923 branch app_bt_enter_sniff : 037925 z_mouse_le_ll_start_encryt: -0xc0015 037926 fetch 1 ,mem_mouse_le_reconnect_flag -0xc0016 037927 beq 1 ,z_mouse_le_ll_reconn_start_encryt -0xc0017 037928 branch z_mouse_le_ll_enable_start_enc_flag -: 037929 z_mouse_le_ll_reconn_start_encryt: -0xc0018 037930 call p_app_updata_le_param -0xc0019 037931 jam 5 ,mem_le_start_encrypt_timer -: 037932 z_mouse_le_ll_enable_start_enc_flag: -0xc001a 037933 arg ll_start_enc_flag ,queue -0xc001b 037934 branch mouse_le_enable_connect_flag -: 037936 z_mouse_bb_event_disconnected: -0xc001c 037937 call p_mouse_sensor_powerdown_check -0xc001d 037938 jam 0 ,mem_bt_rcvd_switch_req_accept -0xc001e 037939 jam 0 ,mem_bt_send_lmp_setup_complete -0xc001f 037940 jam 0 ,mem_mouse_bt_send_first_package_flag -0xc0020 037941 branch mouse_bb_disconnected +0xc0015 037926 jam 15 ,mem_le_start_encrypt_timer +0xc0016 037927 fetch 1 ,mem_mouse_le_reconnect_flag +0xc0017 037928 beq 1 ,z_mouse_le_ll_reconn_start_encryt +0xc0018 037929 branch z_mouse_le_ll_enable_start_enc_flag +: 037930 z_mouse_le_ll_reconn_start_encryt: +0xc0019 037931 call p_app_updata_le_param +0xc001a 037932 jam 15 ,mem_le_start_encrypt_timer +: 037933 z_mouse_le_ll_enable_start_enc_flag: +0xc001b 037934 arg ll_start_enc_flag ,queue +0xc001c 037935 branch mouse_le_enable_connect_flag +: 037937 z_mouse_bb_event_disconnected: +0xc001d 037938 call p_mouse_sensor_powerdown_check +0xc001e 037939 jam 0 ,mem_bt_rcvd_switch_req_accept +0xc001f 037940 jam 0 ,mem_bt_send_lmp_setup_complete +0xc0020 037941 jam 0 ,mem_mouse_bt_send_first_package_flag +0xc0021 037942 branch mouse_bb_disconnected Index: output/bt_program23.meta =================================================================== --- /branch/mouse_project/YFK/1059_3mode/PM8/output/bt_program23.meta (revision 2603) +++ /branch/mouse_project/YFK/1059_3mode/PM8/output/bt_program23.meta (working copy) @@ -2282,7 +2282,7 @@ fetch 1,mem_le_connect_status_flag and pdata,0x03,pdata rtneq 0x03 - jam 1,mem_le_start_encrypt_timer + jam 15,mem_le_start_encrypt_timer rtn p_le_parse: @@ -37923,12 +37923,13 @@ branch app_bt_enter_sniff z_mouse_le_ll_start_encryt: + jam 15,mem_le_start_encrypt_timer fetch 1,mem_mouse_le_reconnect_flag beq 1,z_mouse_le_ll_reconn_start_encryt branch z_mouse_le_ll_enable_start_enc_flag z_mouse_le_ll_reconn_start_encryt: call p_app_updata_le_param - jam 5,mem_le_start_encrypt_timer + jam 15,mem_le_start_encrypt_timer z_mouse_le_ll_enable_start_enc_flag: arg LL_START_ENC_FLAG,queue branch mouse_le_enable_connect_flag Index: output/bt_program23.rom =================================================================== --- /branch/mouse_project/YFK/1059_3mode/PM8/output/bt_program23.rom (revision 2603) +++ /branch/mouse_project/YFK/1059_3mode/PM8/output/bt_program23.rom (working copy) @@ -1484,7 +1484,7 @@ 01101000000000001100011011000101 00011111111000010111111000000011 11000001000000011000000000000000 -01110000010001101100011000000001 +01110000010001101100011000001111 00100000011000000000000000000000 11000110000001111000000000000000 00100000010000000101100010010000 @@ -786435,7 +786435,7 @@ 11000000010110001000000000001010 11000000010110010000000000010000 11000000010110011000000000010101 -11000000010110100000000000011100 +11000000010110100000000000011101 00100000011000000000000000000000 00100000010000000000001011000100 00100000010000000000001111001011 @@ -786451,11 +786451,12 @@ 01110000010010000000101000000000 01110000010000011110001100001110 00100000001000000011010000001110 +01110000010001101100011000001111 01101000000000001100011110100001 -11000000000000001000000000011000 -00100000001000000000000000011010 +11000000000000001000000000011001 +00100000001000000000000000011011 00100000010000000000010000111001 -01110000010001101100011000000101 +01110000010001101100011000001111 11011000111000000000000000000001 00100000001000000100000110111001 00100000010000000000010001010010 Index: output/flash.dat =================================================================== --- /branch/mouse_project/YFK/1059_3mode/PM8/output/flash.dat (revision 2603) +++ /branch/mouse_project/YFK/1059_3mode/PM8/output/flash.dat (working copy) @@ -5951,7 +5951,7 @@ 70 46 c6 -01 +0f 20 60 00 @@ -8060,8 +8060,8 @@ 20 07 d9 -72 -26 +a1 +d6 aa 55 08 @@ -9211,7 +9211,7 @@ c0 5a 00 -1c +1d 20 60 00 @@ -9272,6 +9272,10 @@ 20 34 0e +70 +46 +c6 +0f 68 00 c7 @@ -9279,11 +9283,11 @@ c0 00 80 -18 +19 20 20 00 -1a +1b 20 40 04 @@ -9291,7 +9295,7 @@ 70 46 c6 -05 +0f d8 e0 00 @@ -9440,10 +9444,6 @@ 00 00 00 -00 -00 -00 -00 20 20 00 @@ -12264,5 +12264,5 @@ 55 00 00 -9e -21 +72 +35 Index: output/program.lis =================================================================== --- /branch/mouse_project/YFK/1059_3mode/PM8/output/program.lis (revision 2603) +++ /branch/mouse_project/YFK/1059_3mode/PM8/output/program.lis (working copy) @@ -2020,7 +2020,7 @@ 05cb 6800c6c5 fetch 1 ,mem_le_connect_status_flag 05cc 1fe17e03 and pdata ,0x03 ,pdata 05cd c1018000 rtneq 0x03 -05ce 7046c601 jam 1 ,mem_le_start_encrypt_timer +05ce 7046c60f jam 15 ,mem_le_start_encrypt_timer 05cf 20600000 rtn p_le_parse: @@ -36132,7 +36132,7 @@ c0002 c058800a beq zcode_b1 ,z_mouse_sniff_not_accept c0003 c0590010 beq zcode_b2 ,z_mouse_enter_sniff_check c0004 c0598015 beq zcode_b3 ,z_mouse_le_ll_start_encryt -c0005 c05a001c beq zcode_b4 ,z_mouse_bb_event_disconnected +c0005 c05a001d beq zcode_b4 ,z_mouse_bb_event_disconnected c0006 20600000 rtn z_mouse_le_bb_event_connected: @@ -36156,22 +36156,23 @@ c0014 2020340e branch app_bt_enter_sniff z_mouse_le_ll_start_encryt: -c0015 6800c7a1 fetch 1 ,mem_mouse_le_reconnect_flag -c0016 c0008018 beq 1 ,z_mouse_le_ll_reconn_start_encryt -c0017 2020001a branch z_mouse_le_ll_enable_start_enc_flag +c0015 7046c60f jam 15 ,mem_le_start_encrypt_timer +c0016 6800c7a1 fetch 1 ,mem_mouse_le_reconnect_flag +c0017 c0008019 beq 1 ,z_mouse_le_ll_reconn_start_encryt +c0018 2020001b branch z_mouse_le_ll_enable_start_enc_flag z_mouse_le_ll_reconn_start_encryt: -c0018 20400439 call p_app_updata_le_param -c0019 7046c605 jam 5 ,mem_le_start_encrypt_timer +c0019 20400439 call p_app_updata_le_param +c001a 7046c60f jam 15 ,mem_le_start_encrypt_timer z_mouse_le_ll_enable_start_enc_flag: -c001a d8e00001 arg ll_start_enc_flag ,queue -c001b 202041b9 branch mouse_le_enable_connect_flag +c001b d8e00001 arg ll_start_enc_flag ,queue +c001c 202041b9 branch mouse_le_enable_connect_flag z_mouse_bb_event_disconnected: -c001c 20400452 call p_mouse_sensor_powerdown_check -c001d 704b0100 jam 0 ,mem_bt_rcvd_switch_req_accept -c001e 704b0300 jam 0 ,mem_bt_send_lmp_setup_complete -c001f 704b0c00 jam 0 ,mem_mouse_bt_send_first_package_flag -c0020 202041d9 branch mouse_bb_disconnected +c001d 20400452 call p_mouse_sensor_powerdown_check +c001e 704b0100 jam 0 ,mem_bt_rcvd_switch_req_accept +c001f 704b0300 jam 0 ,mem_bt_send_lmp_setup_complete +c0020 704b0c00 jam 0 ,mem_mouse_bt_send_first_package_flag +c0021 202041d9 branch mouse_bb_disconnected branch mouse_bb_disconnected Index: output/ramcode.rom =================================================================== --- /branch/mouse_project/YFK/1059_3mode/PM8/output/ramcode.rom (revision 2603) +++ /branch/mouse_project/YFK/1059_3mode/PM8/output/ramcode.rom (working copy) @@ -1484,7 +1484,7 @@ 6800c6c5 1fe17e03 c1018000 -7046c601 +7046c60f 20600000 c6078000 20405890 Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YFK/1059_3mode/PM8/output/romcode.rom (revision 2603) +++ /branch/mouse_project/YFK/1059_3mode/PM8/output/romcode.rom (working copy) @@ -25148,7 +25148,7 @@ c058800a c0590010 c0598015 -c05a001c +c05a001d 20600000 204002c4 204003cb @@ -25164,11 +25164,12 @@ 70480a00 7041e30e 2020340e +7046c60f 6800c7a1 -c0008018 -2020001a +c0008019 +2020001b 20400439 -7046c605 +7046c60f d8e00001 202041b9 20400452 @@ -25176,4 +25177,4 @@ 704b0300 704b0c00 202041d9 -0000f0ec +000068a8 Index: program/patch.prog =================================================================== --- /branch/mouse_project/YFK/1059_3mode/PM8/program/patch.prog (revision 2603) +++ /branch/mouse_project/YFK/1059_3mode/PM8/program/patch.prog (working copy) @@ -2489,7 +2489,7 @@ fetch 1,mem_le_connect_status_flag and pdata,0x03,pdata rtneq 0x03 - jam 1,mem_le_start_encrypt_timer + jam 15,mem_le_start_encrypt_timer rtn p_le_parse: Index: program/z.prog =================================================================== --- /branch/mouse_project/YFK/1059_3mode/PM8/program/z.prog (revision 2603) +++ /branch/mouse_project/YFK/1059_3mode/PM8/program/z.prog (working copy) @@ -930,12 +930,13 @@ branch app_bt_enter_sniff z_mouse_le_ll_start_encryt: + jam 15,mem_le_start_encrypt_timer fetch 1,mem_mouse_le_reconnect_flag beq 1,z_mouse_le_ll_reconn_start_encryt branch z_mouse_le_ll_enable_start_enc_flag z_mouse_le_ll_reconn_start_encryt: call p_app_updata_le_param - jam 5,mem_le_start_encrypt_timer + jam 15,mem_le_start_encrypt_timer z_mouse_le_ll_enable_start_enc_flag: arg LL_START_ENC_FLAG,queue branch mouse_le_enable_connect_flag