Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PBSwicth_3mode_3ch_ZG-135/output/eeprom.dat (revision 4171) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PBSwicth_3mode_3ch_ZG-135/output/eeprom.dat (working copy) @@ -1107,7 +1107,7 @@ 20 20 04 -22 +15 6f e0 cc @@ -6032,8 +6032,8 @@ 60 00 00 -4b -dc +be +41 aa 55 40 @@ -6175,19 +6175,19 @@ 4b 04 19 -4a +5a 00 00 22 -89 -1b +8a +1f aa 55 01 00 40 4c -03 +0b aa 55 0c @@ -6212,8 +6212,8 @@ 00 0d 49 -0c 0b +0c 0d aa 55 @@ -6286,7 +6286,7 @@ 00 45 4c -00 +02 14 aa 55 @@ -6333,9 +6333,9 @@ 55 4c 8a -88 0a -ff +88 +8a ff aa 55 @@ -6471,7 +6471,7 @@ ca 4b 07 -03 +05 aa 55 01 @@ -6492,7 +6492,7 @@ 00 fd 48 -02 +01 aa 55 01 @@ -6508,10 +6508,10 @@ 48 0f 01 -a2 -00 -b4 -00 +22 +01 +36 +01 aa 55 0a @@ -6601,20 +6601,22 @@ 51 aa 55 -0a +0c 00 fc 45 -09 -53 -53 -20 +0b 42 54 -20 33 2e 30 +20 +4d +6f +75 +73 +65 aa 55 05 @@ -6714,7 +6716,7 @@ 54 35 2e -32 +30 20 4d 6f @@ -6734,7 +6736,7 @@ 54 35 2e -32 +30 20 4d 6f @@ -6752,7 +6754,7 @@ 54 35 2e -32 +30 20 4d 6f @@ -6761,20 +6763,22 @@ 65 aa 55 -0a +0c 00 1e 4c -09 -53 -53 -20 +0b 42 54 -20 35 2e -32 +30 +20 +4d +6f +75 +73 +65 aa 55 08 @@ -7399,14 +7403,10 @@ aa aa 55 -a7 -99 -fb -28 -ff -ff -ff -ff +dc +9a +85 +f5 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -7c -cb +16 +6d Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PBSwicth_3mode_3ch_ZG-135/output/program.lis (revision 4171) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PBSwicth_3mode_3ch_ZG-135/output/program.lis (working copy) @@ -357,7 +357,7 @@ p_mouse_low_voltage_led_off: 0112 6848cc58 fetcht 1 ,mem_mouse_low_gpio -0113 20200422 branch p_mouse_multi_led_off +0113 20200415 branch p_gpio_set_high_impedance p_mouse_low_led_blink_decrease: 0114 6fe0cc54 fetch 1 ,mem_mouse_multi_low_led_blink_count Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PBSwicth_3mode_3ch_ZG-135/program/patch.prog (revision 4171) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PBSwicth_3mode_3ch_ZG-135/program/patch.prog (working copy) @@ -422,7 +422,8 @@ beq MOUSE_ENABLE_DPI_LOW_FOR_LED,p_mouse_device_multi_led_off+1 p_mouse_low_voltage_led_off: fetcht 1,mem_mouse_low_gpio - branch p_mouse_multi_led_off + branch p_gpio_set_high_impedance + //branch p_mouse_multi_led_off p_mouse_low_led_blink_decrease: fetch 1,mem_mouse_multi_low_led_blink_count Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PBSwicth_3mode_3ch_ZG-135/sched/mouse.dat (revision 4171) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/PBSwicth_3mode_3ch_ZG-135/sched/mouse.dat (working copy) @@ -41,7 +41,7 @@ #bit4 MOUSE_ENABLE_ADC #bit5 MOUSE_ENABLE_KEYBOARD #bit6 MOUSE_ENABLE_24G_SEARCH_DONGLE -4a +5a #mouse flag byte4 #bit0 MOUSE_ENABLE_24G_250Hz @@ -85,7 +85,7 @@ #bit5 MOUSE_ENABLE_COMMBINATION_KEY_BY_BT_DISCOVERY #bit6 MOUSE_ENABLE_DPI_KEY_LONG_PRESS_DISCONVERY #bit7 MOUSE_ENABLE_PB_BUTTON_LONG_PRESS_DISCONVERY -89 +8a #mouse flag byte8 #bit0 MOUSE_ENABLE_SMOOTHER @@ -94,7 +94,7 @@ #bit3 MOUSE_ENABLE_LE_BATTERY_SERVICE_CANCEL #bit4 MOUSE_ENABLE_WHEEL_WAKE_UP_CANCEL #bit5 MOUSE_ENABLE_DOUBLE_DPI_KEY -1b +1f mem_mouse_led_new_interface_config: #bit0 MOUSE_ENABLE_1IO2LED @@ -102,7 +102,7 @@ #bit2 MOUSE_ENABLE_LED_BLINK_LIMIT #bit3 MOUSE_ENABLE_LOW_LED #bit4 MOUSE_ENABLE_LOW_LED_BLINK_LIMIT -03 +0b mem_mouse_discovery_timeout:08 07 #3min mem_mouse_24g_pair_timeout_init:58 02 #1min 24g reconn timer&pair timer @@ -116,8 +116,8 @@ mem_rssi_dis_min_ble_init:75 mem_rssi_dis_max_ble_init:80 -mem_bk_button_gpio:0c -mem_fw_button_gpio:0b +mem_bk_button_gpio:0b +mem_fw_button_gpio:0c mem_dpi_button_gpio:0d mem_dpi_another_button_gpio:ff mem_matrix_public_gpio:ff @@ -154,7 +154,7 @@ #1io2led multi start #time parm -mem_mouse_led_multi_type:00 #00:no multi 01:low+led 02:dpi+led 03:low+dpi_led +mem_mouse_led_multi_type:02 #00:no multi 01:low+led 02:dpi+led 03:low+dpi_led mem_mouse_multi_led_powon_timer_init:14 #2s mem_mouse_multi_24gled_blink_timer_init:05 #24gled blink time 500ms on,500ms off mem_mouse_multi_le_discovery_blink_timer_init:02 #le discovery blink time 500ms on,500ms off @@ -167,9 +167,9 @@ mem_mouse_multi_lowled_blink_count_init:0a #low count=count #io config mem_mouse_1io2led_multi_24gled:8a -mem_mouse_1io2led_multi_bt1led:88 -mem_mouse_1io2led_multi_bt2led:0a -mem_mouse_low_gpio:ff +mem_mouse_1io2led_multi_bt1led:0a +mem_mouse_1io2led_multi_bt2led:88 +mem_mouse_low_gpio:8a mem_mouse_dpi_gpio:ff #1io2led multi end @@ -223,17 +223,17 @@ #bit0:mouse_key_l bit1:mouse_key_r bit2:mouse_key_m mem_mouse_commbination_key_bt:07 -mem_mouse_commbination_key_24g:03 +mem_mouse_commbination_key_24g:05 mem_mouse_commbination_key_dpi:ff mem_store_information_delay_timer_init:02 #adc start -mem_adc_config_flag_init:02 #00-vinlpm 01-hvin 02-gpio +mem_adc_config_flag_init:01 #00-vinlpm 01-hvin 02-gpio mem_adc_channel:05 #00-gpio4 01-gpio5 02-gpio6 03-gpio7 04-gpio9 05-gpio10 06-gpio11 07-gpio12 mem_mouse_vdd_full_vol:0f 01 #1.5V -a2 00#mem_mouse_vdd_empty_vol :0.9V -b4 00#mem_mouse_vdd_low_vol :1.0V +22 01#mem_mouse_vdd_empty_vol :2.9V +36 01#mem_mouse_vdd_low_vol :3.1V #mem_mouse_vdd_full_vol:4a 01 #3.3V #2c 01#mem_mouse_vdd_empty_vol :3.0V #40 01#mem_mouse_vdd_low_vol :3.2V @@ -257,7 +257,7 @@ mem_app_connection_options:06 mem_lap:25 13 c8 12 23 51 mem_local_name_length: -'SS BT 3.0 +'BT3.0 Mouse mem_sniff_param_interval: 0e 00 01 00 ##mem_sniff_param_attempt:01 00 @@ -293,19 +293,19 @@ #microsoft swift pair 06 ff 06 00 03 00 80 #name -'\09BT5.2 Mouse +'\09BT5.0 Mouse mem_le_scan_data_len:1f mem_le_scan_data: #name -'\09BT5.2 Mouse +'\09BT5.0 Mouse mem_le_name_len: -'BT5.2 Mouse +'BT5.0 Mouse mem_le_name_patch_len: #max 18bytes -'SS BT 5.2 +'BT5.0 Mouse mem_le_interval_min: 06 00 #min interval