Index: output/flash.dat =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/flash.dat (revision 5341) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/flash.dat (working copy) @@ -3723,7 +3723,7 @@ 70 41 72 -08 +00 70 4b 68 @@ -4817,9 +4817,9 @@ c1 72 20 -60 -00 -00 +20 +04 +c6 68 00 cb @@ -7980,8 +7980,8 @@ 20 00 01 -27 -2b +06 +6b aa 55 08 @@ -8405,9 +8405,9 @@ 00 96 44 -06 +07 00 -06 +07 00 20 00 @@ -8481,8 +8481,8 @@ 46 2c 01 -70 -17 +50 +46 aa 55 01 @@ -9066,7 +9066,7 @@ aa aa 55 -b6 +c7 1b ff 20 @@ -11384,11 +11384,11 @@ c0 20 80 -19 +1a c0 21 00 -26 +27 20 60 00 @@ -11449,6 +11449,10 @@ 00 c3 d8 +20 +3a +00 +07 68 08 c7 @@ -11484,7 +11488,7 @@ 20 40 00 -1e +1f 24 74 00 @@ -11625,10 +11629,6 @@ 00 00 00 -00 -00 -00 -00 20 20 00 @@ -12657,5 +12657,5 @@ 55 00 00 -fd -20 +44 +3f Index: output/program.lis =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/program.lis (revision 5341) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/program.lis (working copy) @@ -1239,7 +1239,7 @@ 03a0 20600000 rtn p_mouse_le_current_mult_update: -03a1 70417208 jam 8 ,mem_lpm_mult +03a1 70417200 jam 0 ,mem_lpm_mult 03a2 704b681e jam 30 ,mem_mouse_le_current_mult_timer 03a3 20600000 rtn @@ -1629,7 +1629,7 @@ p_mouse_le_current_mult_reinit: 04b1 6800c7c7 fetch 1 ,mem_lpm_mult_init 04b2 6000c172 store 1 ,mem_lpm_mult -04b3 20600000 rtn +04b3 202004c6 branch p_mouse_long_mult_flag_enable p_le_send_smp_security_request_timer: 04b4 6800cb6a fetch 1 ,mem_mouse_le_bb_connected_flag @@ -35582,8 +35582,8 @@ z_entrance4: 50001 c0200005 beq zcode_40 ,z_le_update_param -50002 c0208019 beq zcode_41 ,z_le_update_channel_map -50003 c0210026 beq zcode_42 ,z_le_mouse_bb_event_connect_complete +50002 c020801a beq zcode_41 ,z_le_update_channel_map +50003 c0210027 beq zcode_42 ,z_le_mouse_bb_event_connect_complete 50004 20600000 rtn z_le_update_param: @@ -35609,47 +35609,48 @@ 50010 60014496 store 2 ,mem_le_interval_min 50011 60014498 store 2 ,mem_le_interval_min + 2 50012 6800c3d8 fetch 1 ,mem_le_new_connslavelatency -50013 6808c7c7 fetcht 1 ,mem_lpm_mult_init -50014 98467c00 isub temp ,null -50015 20210007 branch z_mouse_le_lpm_mult_reinit ,positive -50016 6800c3d8 fetch 1 ,mem_le_new_connslavelatency -50017 6000c7c7 store 1 ,mem_lpm_mult_init -50018 20200009 branch z_mouse_le_conn_param_lpm_enable +50013 203a0007 branch z_mouse_le_lpm_mult_reinit ,blank +50014 6808c7c7 fetcht 1 ,mem_lpm_mult_init +50015 98467c00 isub temp ,null +50016 20210007 branch z_mouse_le_lpm_mult_reinit ,positive +50017 6800c3d8 fetch 1 ,mem_le_new_connslavelatency +50018 6000c7c7 store 1 ,mem_lpm_mult_init +50019 20200009 branch z_mouse_le_conn_param_lpm_enable z_le_update_channel_map: -50019 6800843f fetch 1 ,mem_le_state -5001a c4030000 rtnbit0 lestate_update_map -5001b 2040001e call z_le_channel_map_overflow_check -5001c 24740000 nrtn user -5001d 202055a0 branch le_update_channel_map + 3 +5001a 6800843f fetch 1 ,mem_le_state +5001b c4030000 rtnbit0 lestate_update_map +5001c 2040001f call z_le_channel_map_overflow_check +5001d 24740000 nrtn user +5001e 202055a0 branch le_update_channel_map + 3 z_le_channel_map_overflow_check: -5001e 78347c00 enable user -5001f 6800845a fetch 1 ,mem_le_event_count + 1 -50020 1ff1fe00 rshift4 pdata ,pdata -50021 c1878000 rtnne 0x0f -50022 68008460 fetch 1 ,mem_le_instant + 1 -50023 1ff1fe00 rshift4 pdata ,pdata -50024 c1800000 rtnne 0x00 -50025 20207fe9 branch disable_user +5001f 78347c00 enable user +50020 6800845a fetch 1 ,mem_le_event_count + 1 +50021 1ff1fe00 rshift4 pdata ,pdata +50022 c1878000 rtnne 0x0f +50023 68008460 fetch 1 ,mem_le_instant + 1 +50024 1ff1fe00 rshift4 pdata ,pdata +50025 c1800000 rtnne 0x00 +50026 20207fe9 branch disable_user z_le_mouse_bb_event_connect_complete: -50026 6800c7a1 fetch 1 ,mem_mouse_le_reconnect_flag -50027 247a0000 nrtn blank -50028 68008478 fetch 1 ,mem_le_att_handle -50029 1fe67e1a sub pdata ,26 ,pdata -5002a 24628000 nrtn zero -5002b 7046c600 jam 0 ,mem_le_start_encrypt_timer -5002c 20203d60 branch mouse_le_write_enable +50027 6800c7a1 fetch 1 ,mem_mouse_le_reconnect_flag +50028 247a0000 nrtn blank +50029 68008478 fetch 1 ,mem_le_att_handle +5002a 1fe67e1a sub pdata ,26 ,pdata +5002b 24628000 nrtn zero +5002c 7046c600 jam 0 ,mem_le_start_encrypt_timer +5002d 20203d60 branch mouse_le_write_enable z_quit_connection_cont: -5002d 204033af call app_disconn_reason_collect_bt -5002e 204026e9 call sniff_exit -5002f 700a9902 jam bt_evt_bb_disconnected ,mem_fifo_temp -50030 20407d86 call ui_ipc_send_event -50031 20405cf7 call init_lmp_work -50032 20404d6b call l2cap_init_work -50033 2020246e branch quit_connection_cont + 8 +5002e 204033af call app_disconn_reason_collect_bt +5002f 204026e9 call sniff_exit +50030 700a9902 jam bt_evt_bb_disconnected ,mem_fifo_temp +50031 20407d86 call ui_ipc_send_event +50032 20405cf7 call init_lmp_work +50033 20404d6b call l2cap_init_work +50034 2020246e branch quit_connection_cont + 8 org 0x60001 z_entrance5: Index: output/romcode.rom =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/romcode.rom (revision 5341) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/output/romcode.rom (working copy) @@ -24730,8 +24730,8 @@ 70480b14 2020636f c0200005 -c0208019 -c0210026 +c020801a +c0210027 20600000 2040000d 2020557d @@ -24747,6 +24747,7 @@ 60014496 60014498 6800c3d8 +203a0007 6808c7c7 98467c00 20210007 @@ -24755,7 +24756,7 @@ 20200009 6800843f c4030000 -2040001e +2040001f 24740000 202055a0 78347c00 @@ -25184,4 +25185,4 @@ 704b6b14 204003ac 202041c3 -00008fad +000006a6 Index: program/patch.prog =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/program/patch.prog (revision 5341) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/program/patch.prog (working copy) @@ -1486,7 +1486,7 @@ p_mouse_le_current_mult_update: // fetch 1,mem_config_function_enable // rtnbit1 ENABLE_SENSOR_MOTION_PIN - jam 8,mem_lpm_mult + jam 0,mem_lpm_mult jam 30,mem_mouse_le_current_mult_timer rtn @@ -1938,7 +1938,7 @@ p_mouse_le_current_mult_reinit: fetch 1,mem_lpm_mult_init store 1,mem_lpm_mult - rtn + branch p_mouse_long_mult_flag_enable p_le_send_smp_security_request_timer: fetch 1,mem_mouse_le_bb_connected_flag Index: program/z.prog =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/program/z.prog (revision 5341) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/program/z.prog (working copy) @@ -279,6 +279,7 @@ store 2,mem_le_interval_min store 2,mem_le_interval_min+2 fetch 1,mem_le_new_connslavelatency + branch z_mouse_le_lpm_mult_reinit,blank fetcht 1,mem_lpm_mult_init isub temp,null branch z_mouse_le_lpm_mult_reinit,positive Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/sched/mouse.dat (revision 5341) +++ /branch/mouse_project/LeXiang/1066_Project/PBSwitch_2.4G&BLE_3ch_G1050/sched/mouse.dat (working copy) @@ -113,8 +113,8 @@ mem_le_interval_min: -06 00 #min interval if need 125hz,set 0x0006;else 115hz set 0x0007 -06 00 #max interval if nedd 125hz,set 0x0006;else 115hz set 0x0007 +07 00 #min interval if need 125hz,set 0x0006;else 115hz set 0x0007 +07 00 #max interval if nedd 125hz,set 0x0006;else 115hz set 0x0007 20 00 #latency 2c 01 #timeout @@ -134,7 +134,7 @@ mem_discovery_timeout:58 02#1min mem_mouse_direct_timeout:2c 01#8s -mem_mouse_no_data_timeout:70 17 #10min +mem_mouse_no_data_timeout:50 46 #10min mem_flash_ncs_gpio:0a mem_spi_ncs_gpio:ff