Index: output/eeprom.dat
===================================================================
--- /1121s/branch/mouse/mouse_public_1M/output/eeprom.dat	(revision 3188)
+++ /1121s/branch/mouse/mouse_public_1M/output/eeprom.dat	(working copy)
@@ -5572,9 +5572,9 @@
 c9
 12
 00
-00
-00
+02
 01
+49
 1b
 aa
 55
@@ -5583,8 +5583,8 @@
 44
 46
 06
-08
 07
+08
 06
 07
 08
@@ -5608,7 +5608,7 @@
 05
 ff
 ff
-ff
+15
 ff
 ff
 ff
@@ -5709,7 +5709,7 @@
 00
 3c
 46
-64
+3c
 aa
 55
 02
@@ -5746,7 +5746,7 @@
 00
 1b
 47
-03
+02
 aa
 55
 01
@@ -6087,7 +6087,7 @@
 03
 aa
 55
-14
+11
 00
 a0
 47
@@ -6098,75 +6098,63 @@
 03
 00
 80
-0c
 09
-42
-54
-35
-2e
-32
-20
+09
+50
+43
+57
 4d
-6f
-75
-73
-65
+2d
+30
+30
+31
 aa
 55
-0e
+0b
 00
 68
 43
 1f
-0c
 09
-42
-54
-35
-2e
-32
-20
+09
+50
+43
+57
 4d
-6f
-75
-73
-65
+2d
+30
+30
+31
 aa
 55
-0c
+09
 00
 6b
 42
-0b
-42
-54
-35
-2e
-32
-20
+08
+50
+43
+57
 4d
-6f
-75
-73
-65
+2d
+30
+30
+31
 aa
 55
-0c
+09
 00
 8c
 49
-0b
-42
-54
-35
-2e
-32
-20
+08
+50
+43
+57
 4d
-6f
-75
-73
-65
+2d
+30
+30
+31
 aa
 55
 08
@@ -6745,10 +6733,10 @@
 aa
 aa
 55
-49
-54
-11
-9b
+ed
+4d
+9a
+21
 ff
 ff
 ff
@@ -8188,5 +8176,17 @@
 ff
 ff
 ff
-94
-a2
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+ff
+d0
+67
Index: output/otp.dat
===================================================================
--- /1121s/branch/mouse/mouse_public_1M/output/otp.dat	(revision 3188)
+++ /1121s/branch/mouse/mouse_public_1M/output/otp.dat	(working copy)
@@ -5581,9 +5581,9 @@
 c9
 12
 00
-00
-00
+02
 01
+49
 1b
 aa
 55
@@ -5592,8 +5592,8 @@
 44
 46
 06
-08
 07
+08
 06
 07
 08
@@ -5617,7 +5617,7 @@
 05
 ff
 ff
-ff
+15
 ff
 ff
 ff
@@ -5718,7 +5718,7 @@
 00
 3c
 46
-64
+3c
 aa
 55
 02
@@ -5755,7 +5755,7 @@
 00
 1b
 47
-03
+02
 aa
 55
 01
@@ -6096,7 +6096,7 @@
 03
 aa
 55
-14
+11
 00
 a0
 47
@@ -6107,75 +6107,63 @@
 03
 00
 80
-0c
 09
-42
-54
-35
-2e
-32
-20
+09
+50
+43
+57
 4d
-6f
-75
-73
-65
+2d
+30
+30
+31
 aa
 55
-0e
+0b
 00
 68
 43
 1f
-0c
 09
-42
-54
-35
-2e
-32
-20
+09
+50
+43
+57
 4d
-6f
-75
-73
-65
+2d
+30
+30
+31
 aa
 55
-0c
+09
 00
 6b
 42
-0b
-42
-54
-35
-2e
-32
-20
+08
+50
+43
+57
 4d
-6f
-75
-73
-65
+2d
+30
+30
+31
 aa
 55
-0c
+09
 00
 8c
 49
-0b
-42
-54
-35
-2e
-32
-20
+08
+50
+43
+57
 4d
-6f
-75
-73
-65
+2d
+30
+30
+31
 aa
 55
 08
@@ -6754,8 +6742,8 @@
 aa
 aa
 55
-49
-54
-11
-9b
+ed
+4d
+9a
+21
 20
Index: program/ble_protocol_stack/le.prog
===================================================================
--- /1121s/branch/mouse/mouse_public_1M/program/ble_protocol_stack/le.prog	(revision 3188)
+++ /1121s/branch/mouse/mouse_public_1M/program/ble_protocol_stack/le.prog	(working copy)
@@ -896,7 +896,7 @@
 	fetch 1,mem_system_clk	
 	fetcht 1,mem_le_tx2m_delay
 	iadd temp,pdata
-	call sleep				//2M 前端发送比1M快
+	call sleep				//2M 脟掳露脣路垄脣脥卤脠1M驴矛
 	rshift16 access,pdata
 	rshift8 pdata,pdata
 	rshift4 pdata,temp
Index: sched/mouse.dat
===================================================================
--- /1121s/branch/mouse/mouse_public_1M/sched/mouse.dat	(revision 3188)
+++ /1121s/branch/mouse/mouse_public_1M/sched/mouse.dat	(working copy)
@@ -50,7 +50,7 @@
 #bit4 MOUSE_ENABLE_LOW_FOR_LED
 #bit5 MOUSE_ENABLE_DPI_FOR_LED
 #bit6 MOUSE_ENABLE_DPI_LOW_FOR_LED
-00
+02
 
 #mouse flag byte6 
 #bit0 MOUSE_ENABLE_SELECT_DEVICE_BY_DPI_BUTTON
@@ -61,7 +61,7 @@
 #bit5 MOUSE_ENABLE_PB_BUTTON_CONNECT_GND
 #bit6 MOUSE_ENABLE_FIRE_KEY_CONNECT_GND
 #bit7 MOUSE_ENABLE_CUSTOMER_KEY_CONNECT_VIN_OR_MATRIX
-00
+01
 
 #mouse flag byte7
 #bit0 MOUSE_ENABLE_AUTO_24G_PARING
@@ -72,7 +72,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
-01
+49
 
 #mouse flag byte8
 #bit0 MOUSE_ENABLE_SMOOTHER
@@ -87,8 +87,8 @@
 
 mem_mouse_param_config:
 06 #mem_lbutton_gpio
-08 #mem_mbutton_gpio
-07 #mem_rbutton_gpio
+07 #mem_mbutton_gpio
+08 #mem_rbutton_gpio
 06 #mem_bk_button_gpio
 07 #mem_fw_button_gpio
 08 #mem_dpi_button_gpio
@@ -112,7 +112,7 @@
 05 #mem_mouse_reuse_2ice_gpio
 ff #mem_mouse_logo_led_gpio
 ff #mem_mouse_1io2led_multi_24gled
-ff #mem_mouse_1io2led_multi_bt1led
+15 #mem_mouse_1io2led_multi_bt1led
 ff #mem_mouse_1io2led_multi_bt2led
 ff #mem_mouse_low_voltage_alarm_gpio
 ff #mem_mouse_dpi_gpio
@@ -146,14 +146,14 @@
 mem_mouse_24g_pair_timeout_init:58 02  #1min	    24g reconn timer&pair timer
 mem_mouse_24g_reconn_timeout_init:64 #10s
 mem_mouse_24g_power_on_fast_conn_timer:05 00	#500ms
-mem_mouse_direct_timeout:64  #10s
+mem_mouse_direct_timeout:3c  #10s
 mem_mouse_discovery_timeout:b0 04	#2min
 mem_mouse_fast_direct_timeout:0a #1s
 mem_mouse_no_data_timeout:70 17   #10mins
 
 #device parm
 mem_device_option:08
-mem_device_number:03   #01--only 2.4g   02--2.4g+ble
+mem_device_number:02   #01--only 2.4g   02--2.4g+ble
 
 mem_lpm_mode:01
 mem_lpm_mult:20
@@ -232,19 +232,19 @@
 #microsoft swift pair
 06 ff 06 00 03 00 80	
 #name
-'\09BT5.2 Mouse
+'\09PCWM-001
 
 mem_le_scan_data_len:1f
 mem_le_scan_data:
 #name
-'\09BT5.2 Mouse
+'\09PCWM-001
 
 
 mem_le_name_len:
-'BT5.2 Mouse
+'PCWM-001
 
 mem_le_name_patch_len:	#max 18bytes
-'BT5.2 Mouse
+'PCWM-001
 
 mem_le_interval_min:
 06 00 #min interval
