Index: format/g24.format =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/format/g24.format (revision 3704) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/format/g24.format (working copy) @@ -475,6 +475,6 @@ ( 0x0708 G24_DISCONN_NODATA_TIMER -0x1e G24_RECONN_NODATA_TIMER +0x0064 G24_RECONN_NODATA_TIMER ) Index: output/flash.dat =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/flash.dat (revision 3704) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/flash.dat (working copy) @@ -8976,7 +8976,7 @@ 00 af 4b -01 +02 00 aa 55 @@ -9120,7 +9120,7 @@ aa aa 55 -9b +9c 22 ff 20 @@ -9829,6 +9829,10 @@ bd 20 40 +44 +82 +20 +40 03 14 20 @@ -9887,10 +9891,6 @@ 00 00 00 -00 -00 -00 -00 20 20 00 @@ -10670,11 +10670,11 @@ c0 30 80 -0e +0f c0 31 00 -15 +16 20 60 00 @@ -10711,10 +10711,14 @@ 40 01 1f +58 +00 +00 +64 20 20 00 -12 +14 79 20 00 @@ -10911,10 +10915,6 @@ 00 00 00 -00 -00 -00 -00 20 20 00 @@ -12455,5 +12455,5 @@ 55 00 00 -84 -4d +b8 +8e Index: output/program.lis =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/program.lis (revision 3704) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/program.lis (working copy) @@ -35709,8 +35709,8 @@ z_entrance6: 70001 c0300005 beq zcode_60 ,z_g24_start_24g_mode -70002 c030800e beq zcode_61 ,z_g24_auto_pair_start -70003 c0310015 beq zcode_62 ,z_mouse_24g_pairing_button +70002 c030800f beq zcode_61 ,z_g24_auto_pair_start +70003 c0310016 beq zcode_62 ,z_mouse_24g_pairing_button 70004 20600000 rtn z_g24_start_24g_mode: @@ -35722,33 +35722,34 @@ 7000a 6000cd89 store 1 ,mem_24g_conn_sm 7000b 204001aa call p_g24_syncword_crc8 7000c 2040011f call p_g24_ch -7000d 20200012 branch z_g24_auto_pair_timeout_init +7000d 58000064 setarg g24_reconn_nodata_timer +7000e 20200014 branch z_g24_auto_pair_timeout_init + 1 z_g24_auto_pair_start: -7000e 79200026 set1 mark_24g ,mark -7000f 6800cd89 fetch 1 ,mem_24g_conn_sm -70010 79207e01 set1 state_24g_pair ,pdata -70011 6000cd89 store 1 ,mem_24g_conn_sm +7000f 79200026 set1 mark_24g ,mark +70010 6800cd89 fetch 1 ,mem_24g_conn_sm +70011 79207e01 set1 state_24g_pair ,pdata +70012 6000cd89 store 1 ,mem_24g_conn_sm z_g24_auto_pair_timeout_init: -70012 58000708 setarg g24_disconn_nodata_timer -70013 60014d85 store 2 ,mem_24g_stop_g24_mode_timeout -70014 2020035d branch p_g24_stop_g24_mode_set +70013 58000708 setarg g24_disconn_nodata_timer +70014 60014d85 store 2 ,mem_24g_stop_g24_mode_timeout +70015 2020035d branch p_g24_stop_g24_mode_set z_mouse_24g_pairing_button: -70015 680246d3 fetch mouse_flag_len ,mem_mouse_flag -70016 c4088000 rtnbit0 mouse_enable_24g -70017 c3818000 rtnbit1 mosue_24g_pairing_flag -70018 c6130000 rtnmark1 mark_24g -70019 20404482 call mouse_devce_led_off -7001a d8e00003 arg mosue_24g_pairing_flag ,queue -7001b 204043ce call mouse_enable_function_flag -7001c 58000000 setarg 0 -7001d 600146ae store 2 ,mem_mouse_direct_timer -7001e 6000c6b4 store 1 ,mem_mouse_send_blank_timer -7001f 60014c66 store 2 ,mem_24g_check_dongle_times -70020 204042ca call mouse_stop_discovery -70021 202001c0 branch p_g24_auto_pair_start +70016 680246d3 fetch mouse_flag_len ,mem_mouse_flag +70017 c4088000 rtnbit0 mouse_enable_24g +70018 c3818000 rtnbit1 mosue_24g_pairing_flag +70019 c6130000 rtnmark1 mark_24g +7001a 20404482 call mouse_devce_led_off +7001b d8e00003 arg mosue_24g_pairing_flag ,queue +7001c 204043ce call mouse_enable_function_flag +7001d 58000000 setarg 0 +7001e 600146ae store 2 ,mem_mouse_direct_timer +7001f 6000c6b4 store 1 ,mem_mouse_send_blank_timer +70020 60014c66 store 2 ,mem_24g_check_dongle_times +70021 204042ca call mouse_stop_discovery +70022 202001c0 branch p_g24_auto_pair_start org 0x80001 z_entrance7: @@ -36011,18 +36012,19 @@ b002d 6012004c hstore 4 ,core_lpm_reg b002e 20402c21 call lpm_write_ctrl b002f 204074bd call disable_authrom -b0030 20400314 call p_mouse_store_flash_device_info -b0031 20403e9f call mouse_before_hibernate_wheel_gpio_set -b0032 2040027a call p_mouse_setgpio_hibernate -b0033 2040034a call p_flash_deep_power_down -b0034 68108081 hfetch 1 ,core_gpio_sel1 -b0035 1fe17ef7 and pdata ,0xf7 ,pdata -b0036 60108081 hstore 1 ,core_gpio_sel1 -b0037 6810807e hfetch 1 ,core_gpio_pd2 -b0038 79207e06 set1 6 ,pdata -b0039 6010807e hstore 1 ,core_gpio_pd2 -b003a 6808c6f3 fetcht 1 ,mem_sensor_data_gpio -b003b 202067ed branch gpio_clr_wake +b0030 20404482 call mouse_devce_led_off +b0031 20400314 call p_mouse_store_flash_device_info +b0032 20403e9f call mouse_before_hibernate_wheel_gpio_set +b0033 2040027a call p_mouse_setgpio_hibernate +b0034 2040034a call p_flash_deep_power_down +b0035 68108081 hfetch 1 ,core_gpio_sel1 +b0036 1fe17ef7 and pdata ,0xf7 ,pdata +b0037 60108081 hstore 1 ,core_gpio_sel1 +b0038 6810807e hfetch 1 ,core_gpio_pd2 +b0039 79207e06 set1 6 ,pdata +b003a 6010807e hstore 1 ,core_gpio_pd2 +b003b 6808c6f3 fetcht 1 ,mem_sensor_data_gpio +b003c 202067ed branch gpio_clr_wake org 0xc0001 z_entranceb: Index: output/romcode.rom =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/romcode.rom (revision 3704) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/output/romcode.rom (working copy) @@ -24808,8 +24808,8 @@ 20400513 20207df4 c0300005 -c030800e -c0310015 +c030800f +c0310016 20600000 2040035f 203401c0 @@ -24819,7 +24819,8 @@ 6000cd89 204001aa 2040011f -20200012 +58000064 +20200014 79200026 6800cd89 79207e01 @@ -25040,6 +25041,7 @@ 6012004c 20402c21 204074bd +20404482 20400314 20403e9f 2040027a @@ -25142,4 +25144,4 @@ 20400035 6008cd88 20600000 -00002dcd +0000f832 Index: /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/program/patch.prog (added) =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/program/patch.prog (revision 0) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/program/patch.prog (revision 0) Index: program/z.prog =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/program/z.prog (revision 3704) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/program/z.prog (working copy) @@ -140,7 +140,7 @@ z_send_lmp_detach: call send_lmp_detach - fetch 1,mem_mouse_bt_reconnect_flag + fetch 1,mem_mouse_bt_reconnect_flag rtn blank fetch 1,mem_op set0 op_disconn,pdata @@ -379,7 +379,8 @@ store 1,mem_24g_conn_sm call p_g24_syncword_crc8 call p_g24_ch - branch z_g24_auto_pair_timeout_init + setarg G24_RECONN_NODATA_TIMER + branch z_g24_auto_pair_timeout_init+1 z_g24_auto_pair_start: set1 mark_24g,mark @@ -714,7 +715,7 @@ hstore 4,core_lpm_reg call lpm_write_ctrl call disable_authrom -// call mouse_devce_led_off + call mouse_devce_led_off call p_mouse_store_flash_device_info call mouse_before_hibernate_wheel_gpio_set call p_mouse_setgpio_hibernate Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/sched/mouse.dat (revision 3704) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_MJ/sched/mouse.dat (working copy) @@ -296,7 +296,7 @@ mem_24g_allpowerful_addr:0f 0f 0f 0f 0f 0f mem_24g_common_temp:00 00 00 00 00 00 00 00 00 00 mem_24g_enter_hibernate:80 4f 12 # 240ms dpi B4 B5 check easy -mem_firmware_version:01 00 +mem_firmware_version:02 00 mem_device_flag:01 mem_device1_type:34