Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/eeprom.dat (revision 5366) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/eeprom.dat (working copy) @@ -934,8 +934,8 @@ 44 c0 4a -00 -ea +12 +44 20 20 12 @@ -3963,15 +3963,15 @@ c0 00 03 -e4 +e2 c0 00 83 -e6 +e4 c0 01 03 -e8 +e6 6f e0 cc @@ -6696,8 +6696,8 @@ 60 00 00 -1f -74 +89 +51 aa 55 40 @@ -6782,7 +6782,7 @@ 7a 41 88 -16 +14 ce aa 55 @@ -6838,20 +6838,20 @@ ab 4b 04 -09 +19 4a +10 00 -00 -00 -01 -1b +22 +82 +1f aa 55 01 00 40 4c -01 +23 aa 55 0c @@ -6901,9 +6901,9 @@ ff ff 0b -0c 0d -ff +0c +03 ff ff ff @@ -6925,7 +6925,7 @@ 00 24 49 -03 +00 00 00 aa @@ -7004,9 +7004,9 @@ 00 55 4c -ff -ff -ff +88 +8a +0a ff ff aa @@ -7054,7 +7054,7 @@ b3 4b 03 -01 +03 aa 55 08 @@ -7492,7 +7492,7 @@ 00 a6 4d -00 +01 aa 55 08 @@ -7501,7 +7501,7 @@ 43 06 00 -09 +07 00 20 00 @@ -8022,10 +8022,10 @@ aa aa 55 -4e -99 -a2 -4c +56 +97 +ee +12 ff ff ff Index: output/flash.dat =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/flash.dat (revision 5366) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/flash.dat (working copy) @@ -934,8 +934,8 @@ 44 c0 4a -00 -ea +12 +44 20 20 12 @@ -3963,15 +3963,15 @@ c0 00 03 -e4 +e2 c0 00 83 -e6 +e4 c0 01 03 -e8 +e6 6f e0 cc @@ -6696,8 +6696,8 @@ 60 00 00 -1f -74 +89 +51 aa 55 40 @@ -6782,7 +6782,7 @@ 7a 41 88 -16 +14 ce aa 55 @@ -6838,20 +6838,20 @@ ab 4b 04 -09 +19 4a +10 00 -00 -00 -01 -1b +22 +82 +1f aa 55 01 00 40 4c -01 +23 aa 55 0c @@ -6901,9 +6901,9 @@ ff ff 0b -0c 0d -ff +0c +03 ff ff ff @@ -6925,7 +6925,7 @@ 00 24 49 -03 +00 00 00 aa @@ -7004,9 +7004,9 @@ 00 55 4c -ff -ff -ff +88 +8a +0a ff ff aa @@ -7054,7 +7054,7 @@ b3 4b 03 -01 +03 aa 55 08 @@ -7492,7 +7492,7 @@ 00 a6 4d -00 +01 aa 55 08 @@ -7501,7 +7501,7 @@ 43 06 00 -09 +07 00 20 00 @@ -8022,10 +8022,10 @@ aa aa 55 -4e -99 -a2 -4c +56 +97 +ee +12 ff ff ff Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/program.lis (revision 5366) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/program.lis (working copy) @@ -310,7 +310,7 @@ p_txon_next: 00e6 6fe0c1e8 fetch 1 ,mem_tx_power 00e7 c0551244 beq tx_power_fast_conn ,set_tx_power_f20db -00e8 c04a00ea beq tx_power_f20db ,p_set_tx_power_pair +00e8 c04a1244 beq tx_power_f20db ,set_tx_power_f20db 00e9 2020121e branch txon_next + 1 p_set_tx_power_pair: @@ -1317,9 +1317,9 @@ p_mouse_seting_s201_dpi: 03dc 6fe0c992 fetch 1 ,mem_mouse_dpi -03dd c00003e4 beq mouse_dpi_level1 ,p_mouse_set_s201_dpi_1 -03de c00083e6 beq mouse_dpi_level2 ,p_mouse_set_s201_dpi_2 -03df c00103e8 beq mouse_dpi_level3 ,p_mouse_set_s201_dpi_3 +03dd c00003e2 beq mouse_dpi_level1 ,p_mouse_set_s201_dpi_0 +03de c00083e4 beq mouse_dpi_level2 ,p_mouse_set_s201_dpi_1 +03df c00103e6 beq mouse_dpi_level3 ,p_mouse_set_s201_dpi_2 p_mouse_set_s201_dpi_4: 03e0 6fe0cc95 fetch 1 ,mem_sensor_s201_dpi_4 Index: output/ramcode.rom =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/ramcode.rom (revision 5366) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/ramcode.rom (working copy) @@ -230,7 +230,7 @@ 202042d4 6fe0c1e8 c0551244 -c04a00ea +c04a1244 2020121e 708a3907 708a3a00 @@ -987,9 +987,9 @@ c00603dc 20204098 6fe0c992 -c00003e4 -c00083e6 -c00103e8 +c00003e2 +c00083e4 +c00103e6 6fe0cc95 202003e9 6fe0cc91 Index: output/sched.rom =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/output/sched.rom (revision 5366) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/output/sched.rom (working copy) @@ -67,7 +67,7 @@ mem_device_option:08 #08 mouse -mem_lpm_config:88 16 ce #4khz +mem_lpm_config:88 14 ce #4khz mem_fcomp_div:18 mem_rf_init_data:ff @@ -98,7 +98,7 @@ #bit3 MOUSE_ENABLE_WAKEUP_FROM_POWER #bit4 MOUSE_ENABLE_16M #bit5 MOUSE_ENABLE_USB -09 +19 #mouse flag byte3 #bit0 MOUSE_ENABLE_SPI2 @@ -119,7 +119,7 @@ #bit5 MOUSE_ENABLE_USB_250 #bit6 MOUSE_ENABLE_USB_500 #bit7 MOUSE_ENABLE_USB_1000 -00 +10 #mouse flag byte5 #bit0 MOUSE_ENABLE_POWER_ON_LED @@ -141,7 +141,7 @@ #bit5 MOUSE_ENABLE_PB_BUTTON_CONNECT_GND #bit6 MOUSE_ENABLE_DPI_KEY_CONNECT_ADC #bit7 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING -00 +22 #mouse flag byte7 #bit0 MOUSE_ENABLE_AUTO_24G_PARING @@ -152,7 +152,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 +82 #mouse flag byte8 #bit0 MOUSE_ENABLE_SMOOTHER @@ -161,7 +161,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_LED_NEW_INTERFACE @@ -170,7 +170,7 @@ #bit3 MOUSE_ENABLE_LOW_LED #bit4 MOUSE_ENABLE_LOW_LED_BLINK_LIMIT #bit5 MOUSE_ENABLE_1IO2LED -01 +23 mem_mouse_discovery_timeout:b0 04 #2min mem_mouse_24g_pair_timeout_init:58 02 #1min 24g reconn timer&pair timer @@ -198,9 +198,9 @@ mem_select_sensor_angle_gpio:ff mem_lbutton_gpio:0b -mem_rbutton_gpio:0c -mem_mbutton_gpio:0d -mem_config_select_device_button_gpio:ff +mem_rbutton_gpio:0d +mem_mbutton_gpio:0c +mem_config_select_device_button_gpio:03 mem_whee_ta_data_gpio:ff mem_whee_tb_data_gpio:ff mem_device_switch_gpio:ff @@ -211,7 +211,7 @@ mem_dpi_led_gpio:ff #03 mem_firebutton_gpio:ff -mem_sensor_angle_default:03 #00--6CLK 01--9CLK 02--12CLK 03--3CLK +mem_sensor_angle_default:00 #00--6CLK 01--9CLK 02--12CLK 03--3CLK mem_sensor_angle_switch:00 #00--6CLK 01--9CLK 02--12CLK 03--3CLK mem_config_sensor_dpi:00 #00--1200 01--1600 @@ -236,9 +236,9 @@ mem_mouse_multi_le_reconn_blink_count_init:05 #le reconn count mem_mouse_multi_lowled_blink_count_init:0a #low count=count #io config -mem_mouse_1io2led_multi_24gled:ff -mem_mouse_1io2led_multi_bt1led:ff -mem_mouse_1io2led_multi_bt2led:ff +mem_mouse_1io2led_multi_24gled:88 +mem_mouse_1io2led_multi_bt1led:8a +mem_mouse_1io2led_multi_bt2led:0a mem_mouse_low_gpio:ff mem_mouse_dpi_gpio:ff #1io2led multi end @@ -264,7 +264,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:03 #max device number value:01,02,03 mem_device_flag: 00 @@ -387,11 +387,11 @@ mem_bt_device2_name: 'BT3.0 Mouse -mem_mouse_le_name_modify_enable:00 #00 disable 01 enable +mem_mouse_le_name_modify_enable:01 #00 disable 01 enable mem_le_interval_min: 06 00 #min interval -09 00 #max interval +07 00 #max interval 20 00 #latency 2c 01 #timeout Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/program/patch.prog (revision 5366) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/program/patch.prog (working copy) @@ -328,7 +328,7 @@ p_txon_next: fetch 1,mem_tx_power beq TX_POWER_FAST_CONN,set_tx_power_f20db //fast conn - beq TX_POWER_F20DB,p_set_tx_power_pair + beq TX_POWER_F20DB,set_tx_power_f20db branch txon_next+1 p_set_tx_power_pair: @@ -1455,9 +1455,9 @@ ifdef S201X_SENSOR p_mouse_seting_S201_dpi: fetch 1,mem_mouse_dpi - beq MOUSE_DPI_LEVEL1,p_mouse_set_S201_dpi_1 //1600 - beq MOUSE_DPI_LEVEL2,p_mouse_set_S201_dpi_2 //2400 - beq MOUSE_DPI_LEVEL3,p_mouse_set_S201_dpi_3 //3200 + beq MOUSE_DPI_LEVEL1,p_mouse_set_S201_dpi_0 //1200 + beq MOUSE_DPI_LEVEL2,p_mouse_set_S201_dpi_1 //1600 + beq MOUSE_DPI_LEVEL3,p_mouse_set_S201_dpi_2 //2400 // beq MOUSE_DPI_LEVEL4,p_mouse_set_S201_dpi_4 //800 // rtn p_mouse_set_S201_dpi_4: //800 Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/mouse_public_sdk/sched/mouse.dat (revision 5366) +++ /YC1308AC/branch/mouse_project/mouse_public_sdk/sched/mouse.dat (working copy) @@ -1,6 +1,6 @@ mem_device_option:08 #08 mouse -mem_lpm_config:88 16 ce #4khz +mem_lpm_config:88 14 ce #4khz mem_fcomp_div:18 mem_rf_init_data:ff @@ -31,7 +31,7 @@ #bit3 MOUSE_ENABLE_WAKEUP_FROM_POWER #bit4 MOUSE_ENABLE_16M #bit5 MOUSE_ENABLE_USB -09 +19 #mouse flag byte3 #bit0 MOUSE_ENABLE_SPI2 @@ -52,7 +52,7 @@ #bit5 MOUSE_ENABLE_USB_250 #bit6 MOUSE_ENABLE_USB_500 #bit7 MOUSE_ENABLE_USB_1000 -00 +10 #mouse flag byte5 #bit0 MOUSE_ENABLE_POWER_ON_LED @@ -74,7 +74,7 @@ #bit5 MOUSE_ENABLE_PB_BUTTON_CONNECT_GND #bit6 MOUSE_ENABLE_DPI_KEY_CONNECT_ADC #bit7 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING -00 +22 #mouse flag byte7 #bit0 MOUSE_ENABLE_AUTO_24G_PARING @@ -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 -01 +82 #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_LED_NEW_INTERFACE @@ -103,7 +103,7 @@ #bit3 MOUSE_ENABLE_LOW_LED #bit4 MOUSE_ENABLE_LOW_LED_BLINK_LIMIT #bit5 MOUSE_ENABLE_1IO2LED -01 +23 mem_mouse_discovery_timeout:b0 04 #2min mem_mouse_24g_pair_timeout_init:58 02 #1min 24g reconn timer&pair timer @@ -131,9 +131,9 @@ mem_select_sensor_angle_gpio:ff mem_lbutton_gpio:0b -mem_rbutton_gpio:0c -mem_mbutton_gpio:0d -mem_config_select_device_button_gpio:ff +mem_rbutton_gpio:0d +mem_mbutton_gpio:0c +mem_config_select_device_button_gpio:03 mem_whee_ta_data_gpio:ff mem_whee_tb_data_gpio:ff mem_device_switch_gpio:ff @@ -144,7 +144,7 @@ mem_dpi_led_gpio:ff #03 mem_firebutton_gpio:ff -mem_sensor_angle_default:03 #00--6CLK 01--9CLK 02--12CLK 03--3CLK +mem_sensor_angle_default:00 #00--6CLK 01--9CLK 02--12CLK 03--3CLK mem_sensor_angle_switch:00 #00--6CLK 01--9CLK 02--12CLK 03--3CLK mem_config_sensor_dpi:00 #00--1200 01--1600 @@ -169,9 +169,9 @@ mem_mouse_multi_le_reconn_blink_count_init:05 #le reconn count mem_mouse_multi_lowled_blink_count_init:0a #low count=count #io config -mem_mouse_1io2led_multi_24gled:ff -mem_mouse_1io2led_multi_bt1led:ff -mem_mouse_1io2led_multi_bt2led:ff +mem_mouse_1io2led_multi_24gled:88 +mem_mouse_1io2led_multi_bt1led:8a +mem_mouse_1io2led_multi_bt2led:0a mem_mouse_low_gpio:ff mem_mouse_dpi_gpio:ff #1io2led multi end @@ -197,7 +197,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:03 #max device number value:01,02,03 mem_device_flag: 00 @@ -320,11 +320,11 @@ mem_bt_device2_name: 'BT3.0 Mouse -mem_mouse_le_name_modify_enable:00 #00 disable 01 enable +mem_mouse_le_name_modify_enable:01 #00 disable 01 enable mem_le_interval_min: 06 00 #min interval -09 00 #max interval +07 00 #max interval 20 00 #latency 2c 01 #timeout