Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_M7/output/flash.dat (revision 4142) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_M7/output/flash.dat (working copy) @@ -8721,7 +8721,7 @@ 18 ff b0 -02 +01 ff ff aa @@ -9224,9 +9224,15 @@ 00 57 4b -13 +19 31 00 +55 +aa +aa +55 +33 +2d ff 20 20 @@ -10775,11 +10781,11 @@ c0 30 80 -17 +18 c0 31 00 -1e +1f 20 60 00 @@ -10787,7 +10793,7 @@ 20 40 00 -0e +0f 20 34 01 @@ -10816,10 +10822,14 @@ 40 01 0b +58 +00 +00 +64 20 20 00 -1b +1d df 20 00 @@ -10851,7 +10861,7 @@ c2 00 00 -12 +13 20 60 00 @@ -11016,10 +11026,6 @@ 00 00 00 -00 -00 -00 -00 20 20 00 @@ -12560,5 +12566,5 @@ 55 00 00 -37 -c8 +ff +d9 Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_M7/output/program.lis (revision 4142) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_M7/output/program.lis (working copy) @@ -35795,12 +35795,12 @@ z_entrance6: 70001 c0300005 beq zcode_60 ,z_g24_start_24g_mode -70002 c0308017 beq zcode_61 ,z_g24_auto_pair_start -70003 c031001e beq zcode_62 ,z_mouse_24g_pairing_button +70002 c0308018 beq zcode_61 ,z_g24_auto_pair_start +70003 c031001f beq zcode_62 ,z_mouse_24g_pairing_button 70004 20600000 rtn z_g24_start_24g_mode: -70005 2040000e call z_g24_factory_check +70005 2040000f call z_g24_factory_check 70006 203401b2 branch p_g24_auto_pair_start ,user 70007 79200026 set1 mark_24g ,mark 70008 6800cdb2 fetch 1 ,mem_24g_conn_sm @@ -35808,45 +35808,46 @@ 7000a 6000cdb2 store 1 ,mem_24g_conn_sm 7000b 2040019c call p_g24_syncword_crc8 7000c 2040010b call p_g24_ch -7000d 2020001b branch z_g24_auto_pair_timeout_init +7000d 58000064 setarg 100 +7000e 2020001d branch z_g24_auto_pair_timeout_init + 1 z_g24_factory_check: -7000e df200002 arg 2 ,loopcnt -7000f d8c04c8a arg mem_24g_addr ,contr -70010 20407fe7 call enable_user -70011 5800ffff setarg 0xffff +7000f df200002 arg 2 ,loopcnt +70010 d8c04c8a arg mem_24g_addr ,contr +70011 20407fe7 call enable_user +70012 5800ffff setarg 0xffff z4_pdata_0xff_check_loop: -70012 e8c90000 ifetcht 2 ,contr -70013 98467c00 isub temp ,null -70014 2442ffe9 ncall disable_user ,zero -70015 c2000012 loop z4_pdata_0xff_check_loop -70016 20600000 rtn +70013 e8c90000 ifetcht 2 ,contr +70014 98467c00 isub temp ,null +70015 2442ffe9 ncall disable_user ,zero +70016 c2000013 loop z4_pdata_0xff_check_loop +70017 20600000 rtn z_g24_auto_pair_start: -70017 79200026 set1 mark_24g ,mark -70018 6800cdb2 fetch 1 ,mem_24g_conn_sm -70019 79207e01 set1 state_24g_pair ,pdata -7001a 6000cdb2 store 1 ,mem_24g_conn_sm +70018 79200026 set1 mark_24g ,mark +70019 6800cdb2 fetch 1 ,mem_24g_conn_sm +7001a 79207e01 set1 state_24g_pair ,pdata +7001b 6000cdb2 store 1 ,mem_24g_conn_sm z_g24_auto_pair_timeout_init: -7001b 58000708 setarg g24_disconn_nodata_timer -7001c 60014dae store 2 ,mem_24g_stop_g24_mode_timeout -7001d 20200323 branch p_g24_stop_g24_mode_set +7001c 58000708 setarg g24_disconn_nodata_timer +7001d 60014dae store 2 ,mem_24g_stop_g24_mode_timeout +7001e 20200323 branch p_g24_stop_g24_mode_set z_mouse_24g_pairing_button: -7001e 680246d3 fetch mouse_flag_len ,mem_mouse_flag -7001f c4088000 rtnbit0 mouse_enable_24g -70020 c3818000 rtnbit1 mosue_24g_pairing_flag -70021 c6130000 rtnmark1 mark_24g -70022 d8e00003 arg mosue_24g_pairing_flag ,queue -70023 204043ce call mouse_enable_function_flag -70024 58000000 setarg 0 -70025 600146ae store 2 ,mem_mouse_direct_timer -70026 6000c6b4 store 1 ,mem_mouse_send_blank_timer -70027 60014c8f store 2 ,mem_24g_check_dongle_times -70028 204042ca call mouse_stop_discovery -70029 202001b2 branch p_g24_auto_pair_start +7001f 680246d3 fetch mouse_flag_len ,mem_mouse_flag +70020 c4088000 rtnbit0 mouse_enable_24g +70021 c3818000 rtnbit1 mosue_24g_pairing_flag +70022 c6130000 rtnmark1 mark_24g +70023 d8e00003 arg mosue_24g_pairing_flag ,queue +70024 204043ce call mouse_enable_function_flag +70025 58000000 setarg 0 +70026 600146ae store 2 ,mem_mouse_direct_timer +70027 6000c6b4 store 1 ,mem_mouse_send_blank_timer +70028 60014c8f store 2 ,mem_24g_check_dongle_times +70029 204042ca call mouse_stop_discovery +7002a 202001b2 branch p_g24_auto_pair_start org 0x80001 z_entrance7: Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_M7/output/romcode.rom (revision 4142) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_M7/output/romcode.rom (working copy) @@ -24833,10 +24833,10 @@ 2040053d 20207df4 c0300005 -c0308017 -c031001e +c0308018 +c031001f 20600000 -2040000e +2040000f 203401b2 79200026 6800cdb2 @@ -24844,7 +24844,8 @@ 6000cdb2 2040019c 2040010b -2020001b +58000064 +2020001d df200002 d8c04c8a 20407fe7 @@ -24852,7 +24853,7 @@ e8c90000 98467c00 2442ffe9 -c2000012 +c2000013 20600000 79200026 6800cdb2 @@ -25196,4 +25197,4 @@ 20400035 6008cdb1 20600000 -0000b870 +000088d8 Index: program/z.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_M7/program/z.prog (revision 4142) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_M7/program/z.prog (working copy) @@ -414,7 +414,8 @@ store 1,mem_24g_conn_sm call p_g24_syncword_crc8 call p_g24_ch - branch z_g24_auto_pair_timeout_init + setarg 100 + branch z_g24_auto_pair_timeout_init+1 z_g24_factory_check: arg 2,loopcnt Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_M7/sched/mouse.dat (revision 4142) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_M7/sched/mouse.dat (working copy) @@ -179,7 +179,7 @@ 18 #mem_sensor_data_gpio:0c ff #mem_dpi_led_gpio:01 b0 #mem_config_function_enable -02 #mem_config_sensor_angle +01 #mem_config_sensor_angle ff #mem_select_sensor_angle_gpio ff #mem_select_adc_gpio