Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_XL_207/output/flash.dat (revision 5833) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_XL_207/output/flash.dat (working copy) @@ -698,8 +698,8 @@ 5b 58 00 -f6 -18 +e6 +78 20 20 2d @@ -4219,7 +4219,7 @@ 20 40 04 -95 +97 20 40 42 @@ -4669,6 +4669,14 @@ 33 6d 68 +00 +c7 +20 +c1 +00 +80 +00 +68 01 46 82 @@ -4708,14 +4716,6 @@ 20 84 a3 -68 -00 -c7 -20 -c1 -00 -80 -00 20 40 04 @@ -8184,8 +8184,8 @@ 20 07 f8 -c6 -ae +b6 +41 aa 55 08 @@ -8476,7 +8476,7 @@ 00 e3 41 -0c +0e 00 01 00 @@ -8627,9 +8627,9 @@ 00 96 44 -06 +07 00 -06 +07 00 20 00 @@ -9062,9 +9062,9 @@ 00 89 4c -0c -0c -10 +19 +19 +1c aa 55 10 @@ -9315,7 +9315,7 @@ aa aa 55 -3f +69 2c ff 20 @@ -12465,7 +12465,7 @@ 20 40 04 -95 +97 da 20 47 @@ -12650,5 +12650,5 @@ 55 00 00 -c7 -40 +aa +5a Index: output/program.lis =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_XL_207/output/program.lis (revision 5833) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_XL_207/output/program.lis (working copy) @@ -213,7 +213,7 @@ 00aa 2040025e call p_g24_lpm_wait 00ab 24740000 nrtn user 00ac 2040025b call p_clear_wake -00ad 5800f618 setarg 63000 +00ad 5800e678 setarg 59000 00ae 20202d8c branch g24_lpm_long_sleep_next p_g24_pair_dispatch: @@ -1429,7 +1429,7 @@ 041a 204004cb call p_mouse_adc_read 041b 204004ea call p_mouse_low_led_blink 041c 2040047e call p_mouse_wheel_trigger_timer -041d 20400495 call p_mouse_select_device_by_button +041d 20400497 call p_mouse_select_device_by_button 041e 20404234 call mouse_check_discovery_timeout_timer 041f 2040423a call mouse_check_no_data_timeout_timer 0420 20400483 call p_mouse_g24_stop_mode_timeout_timer @@ -1592,22 +1592,22 @@ 048d 2020336d branch timer_single_step p_mouse_long_button_bt_discovery: -048e 68014682 fetch 2 ,mem_ui_state_map -048f 2feffe0b isolate1 ui_state_ble_adv ,pdata -0490 2040c2d4 call mouse_stop_le_adv ,true -0491 68014682 fetch 2 ,mem_ui_state_map -0492 2feffe07 isolate1 ui_state_bt_reconnect ,pdata -0493 2040c392 call mouse_cancel_reconnect ,true -0494 202043b8 branch mouse_long_button_bt_discovry +048e 6800c720 fetch 1 ,mem_device_flag +048f c1008000 rtneq mode_g24_device +0490 68014682 fetch 2 ,mem_ui_state_map +0491 2feffe0b isolate1 ui_state_ble_adv ,pdata +0492 2040c2d4 call mouse_stop_le_adv ,true +0493 68014682 fetch 2 ,mem_ui_state_map +0494 2feffe07 isolate1 ui_state_bt_reconnect ,pdata +0495 2040c392 call mouse_cancel_reconnect ,true +0496 202043b8 branch mouse_long_button_bt_discovry p_mouse_select_device_by_button: -0495 6808c6ed fetcht 1 ,mem_config_select_device_button_gpio -0496 2040681d call gpio_get_bit -0497 242084a3 nbranch p_mouse_select_device_button_up ,true +0497 6808c6ed fetcht 1 ,mem_config_select_device_button_gpio +0498 2040681d call gpio_get_bit +0499 242084a3 nbranch p_mouse_select_device_button_up ,true p_mouse_select_device_button_down: -0498 6800c720 fetch 1 ,mem_device_flag -0499 c1008000 rtneq mode_g24_device 049a 2040048b call p_mouse_bt_discovery_timer 049b 6800c6d9 fetch 1 ,mem_select_device_button_statue 049c c1000000 rtneq pb_button_state_down @@ -35496,7 +35496,7 @@ z_mouse_check_reconn_target: 10011 20400295 call p_mouse_tx_power_init -10012 20400495 call p_mouse_select_device_by_button +10012 20400497 call p_mouse_select_device_by_button 10013 da204721 arg mem_device1_type ,rega 10014 6800c720 fetch 1 ,mem_device_flag 10015 6808c703 fetcht 1 ,mem_24g_device_number Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_XL_207/output/romcode.rom (revision 5833) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_XL_207/output/romcode.rom (working copy) @@ -24589,7 +24589,7 @@ 793f802c 2020215f 20400295 -20400495 +20400497 da204721 6800c720 6808c703 @@ -25200,4 +25200,4 @@ 20400035 6008cdb3 20600000 -0000815d +00008373 Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_XL_207/program/patch.prog (revision 5833) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_XL_207/program/patch.prog (working copy) @@ -277,7 +277,7 @@ ifdef HIGH_REPORT setarg G24_4MS_INTERVAL_PARAM else - setarg 63000 + setarg 59000 endif branch g24_lpm_long_sleep_next @@ -1287,11 +1287,13 @@ store 4,mem_mouse_24g_addr store 4,mem_24g_addr p_mouse_store_flash_device_info: +ifdef ADC_ENABLE call p_mouse_adc_read fetch 2,mem_mouse_vdd_now_vol branch p_mouse_store_flash_device_info,blank fetch 1,mem_adc_power_flag bbit1 1,p_mouse_power_down +endif call p_flash_release_deep_power_down call p_flash_erase_sector call p_flash_write_enable @@ -2081,6 +2083,8 @@ arg p_mouse_long_button_bt_discovery,regb branch timer_single_step p_mouse_long_button_bt_discovery: + fetch 1,mem_device_flag + rtneq MODE_G24_DEVICE fetch 2,mem_ui_state_map isolate1 UI_STATE_BLE_ADV,pdata call mouse_stop_le_adv,true //reconnect adv @@ -2094,8 +2098,6 @@ call gpio_get_bit nbranch p_mouse_select_device_button_up,true p_mouse_select_device_button_down: - fetch 1,mem_device_flag - rtneq MODE_G24_DEVICE call p_mouse_bt_discovery_timer fetch 1,mem_select_device_button_statue rtneq PB_BUTTON_STATE_DOWN Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_XL_207/sched/mouse.dat (revision 5833) +++ /branch/mouse_project/YJX_Project/YJX_1066/PBSwitch_3mode_3ch_New_24M_HIGH_REPORT_ADC_XL_207/sched/mouse.dat (working copy) @@ -64,7 +64,7 @@ mem_local_name_length: 'BT3.0 Mouse mem_sniff_param_interval: -0c 00 ##mem_sniff_param_interval:0e 00 report 115hz,0c 00 report 125hz +0e 00 ##mem_sniff_param_interval:0e 00 report 115hz,0c 00 report 125hz 01 00 ##mem_sniff_param_attempt:01 00 02##mem_sniff_param_timeout:00 00 @@ -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 @@ -283,9 +283,9 @@ mem_24g_max_retry:06#max tx retry mem_24g_no_ack:00#with ack mem_24g_rx_window:c0 12 #400us -mem_24g_interval:0c #0x19 24g report 125hz;0x0c,24g report 250hz -mem_24g_interval_min:0c #0x19 24g report 125hz;0x0c,24g report 250hz -mem_24g_interval_max:10 #0x1c 24g report 125hz;0x10,24g report 250hz +mem_24g_interval:19 #0x19 24g report 125hz;0x0c,24g report 250hz +mem_24g_interval_min:19 #0x19 24g report 125hz;0x0c,24g report 250hz +mem_24g_interval_max:1c #0x1c 24g report 125hz;0x10,24g report 250hz mem_24g_ch_map1:00 13 2c 42 mem_24g_ch_map2:06 15 36 48 mem_24g_ch_map3:0f 1a 3a 4c