Index: output/eeprom.dat
===================================================================
--- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_XZR17125/output/eeprom.dat	(revision 1466)
+++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_XZR17125/output/eeprom.dat	(working copy)
@@ -4492,14 +4492,14 @@
 40
 60
 59
-24
+20
 20
 c6
-ad
+a9
 20
 20
 46
-a9
+ad
 6f
 e4
 4b
@@ -5308,8 +5308,8 @@
 60
 00
 00
-f3
-ba
+d8
+84
 aa
 55
 40
@@ -5454,11 +5454,11 @@
 4b
 04
 19
-0a
+1a
 00
 01
 04
-6b
+69
 3b
 aa
 55
@@ -5470,7 +5470,7 @@
 04
 58
 02
-64
+96
 64
 94
 85
@@ -5542,7 +5542,7 @@
 00
 ed
 4b
-03
+ff
 58
 02
 aa
@@ -5597,7 +5597,7 @@
 b3
 4b
 03
-01
+02
 aa
 55
 08
@@ -5722,7 +5722,7 @@
 00
 fd
 48
-02
+00
 aa
 55
 01
@@ -5736,12 +5736,12 @@
 00
 e3
 48
-05
+72
+01
+18
+01
+40
 01
-9f
-00
-b1
-00
 aa
 55
 0a
@@ -6625,16 +6625,16 @@
 02
 40
 00
-e8
+ee
 19
-37
-f6
-ff
-ff
-ff
-ff
-ff
-ff
+55
+aa
+aa
+55
+93
+8a
+4a
+c9
 ff
 ff
 ff
@@ -8188,5 +8188,5 @@
 ff
 ff
 ff
-57
-3b
+23
+e0
Index: output/program.lis
===================================================================
--- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_XZR17125/output/program.lis	(revision 1466)
+++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_XZR17125/output/program.lis	(working copy)
@@ -1478,8 +1478,8 @@
 p_mouse_check_select_device_by_switch_gpio:
 0460 6848c91e fetcht 1 ,mem_device_switch_gpio 
 0461 20406059 call gpio_get_bit 
-0462 2420c6ad nbranch mouse_check_select_24gdevice ,true 
-0463 202046a9 branch mouse_select_btdevice 
+0462 2020c6a9 branch mouse_select_btdevice ,true 
+0463 202046ad branch mouse_check_select_24gdevice 
 
 p_mouse_dpi_check:
 0464 6fe44bab fetch mouse_flag_len ,mem_mouse_flag 
Index: program/patch.prog
===================================================================
--- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_XZR17125/program/patch.prog	(revision 1466)
+++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_XZR17125/program/patch.prog	(working copy)
@@ -1550,8 +1550,9 @@
 p_mouse_check_select_device_by_switch_gpio:	
 	fetcht 1,mem_device_switch_gpio
 	call gpio_get_bit
-	nbranch mouse_check_select_24gdevice,true
-	branch mouse_select_btdevice
+	branch mouse_select_btdevice,true
+	branch mouse_check_select_24gdevice
+	
 	
 p_mouse_dpi_check:
 	fetch MOUSE_FLAG_LEN,mem_mouse_flag
Index: sched/mouse.dat
===================================================================
--- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_XZR17125/sched/mouse.dat	(revision 1466)
+++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/SlideSwitch_XZR17125/sched/mouse.dat	(working copy)
@@ -41,7 +41,7 @@
 #bit4 MOUSE_ENABLE_ADC
 #bit5 MOUSE_ENABLE_KEYBOARD
 #bit6 MOUSE_ENABLE_24G_SEARCH_DONGLE
-0a
+1a
 
 #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
-6b
+69
 
 #mouse flag byte8
 #bit0 MOUSE_ENABLE_SMOOTHER
@@ -99,7 +99,7 @@
 
 mem_mouse_discovery_timeout:b0 04	#2min
 mem_mouse_24g_pair_timeout_init:58 02  #1min	    24g reconn timer&pair timer
-mem_mouse_direct_timeout:64  #05s
+mem_mouse_direct_timeout:96  #15s
 mem_mouse_24g_reconn_timeout_init:64 #10s
 
 mem_mouse_24g_pair_tx_power:94 #-20dBm
@@ -140,7 +140,7 @@
 mem_sensor_angle_switch:00	#00--6CLK   01--9CLK   02--12CLK   03--3CLK
 mem_config_sensor_dpi:00		#00--1200   01--1600
 
-mem_mouse_logo_led_gpio:03
+mem_mouse_logo_led_gpio:ff
 mem_mouse_logo_led_on_time_init:58 02	#1min
 mem_mouse_logo_led_state_load_delay_timer_init:02
 
@@ -162,7 +162,7 @@
 
 
 mem_mouse_bluetooth_type:03	#03 bt3.0+ble   #02 ble   #01 bt3.0
-mem_device_number:01  #max device number   value:01,02,03
+mem_device_number:02  #max device number   value:01,02,03
 
 mem_device_flag:
 00
@@ -201,14 +201,14 @@
 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:00 		#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:05 01		#1.5V
-9f 00#mem_mouse_vdd_empty_vol  :0.9V
-b1 00#mem_mouse_vdd_low_vol   :1.0V
-#mem_mouse_vdd_full_vol:3c 01		#3.3V
-#1e 01#mem_mouse_vdd_empty_vol  :3.0V
-#30 01#mem_mouse_vdd_low_vol   :3.2V
+#mem_mouse_vdd_full_vol:05 01		#1.5V
+#9f 00#mem_mouse_vdd_empty_vol  :0.9V
+#b1 00#mem_mouse_vdd_low_vol   :1.0V
+mem_mouse_vdd_full_vol:72 01		#3.7V
+18 01#mem_mouse_vdd_empty_vol  :2.8V
+40 01#mem_mouse_vdd_low_vol   :3.2V
 mem_mouse_vdd_button_press_vol:10 00
 mem_mouse_vdd_switch_gnd_24g_vol:52 00
 mem_mouse_vdd_switch_gnd_full_vol:35 00