Index: output/bt_program23.icode =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/bt_program23.icode (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/bt_program23.icode (working copy) @@ -595,14 +595,14 @@ 00000594 0x0000031d call 0x00000352 00000595 0x0000031e branch 0x0000482e 00000596 0x00000321 fetch 0x00000008 , 0x00004bab - 00000597 0x00000322 bbit0 0x0000002f , 0x0000025e + 00000597 0x00000322 bbit0 0x0000002f , 0x00004839 00000598 0x00000323 fetch 0x00000001 , 0x00004bb4 00000599 0x00000324 beq 0x00000001 , 0x0000025e 00000600 0x00000325 branch 0x0000481a 00000601 0x00000328 fetch 0x00000008 , 0x00004bab - 00000602 0x00000329 bbit0 0x0000002f , 0x0000025e - 00000603 0x0000032a bbit1 0x00000013 , 0x0000025e - 00000604 0x0000032b bbit1 0x00000012 , 0x0000025e + 00000602 0x00000329 bbit0 0x0000002f , 0x00004839 + 00000603 0x0000032a bbit1 0x00000013 , 0x00004839 + 00000604 0x0000032b bbit1 0x00000012 , 0x00004839 00000605 0x0000032c branch 0x00004812 00000606 0x0000032f fetch 0x00000008 , 0x00004bab 00000607 0x00000330 bbit0 0x0000003c , 0x00004839 @@ -861,7 +861,7 @@ 00000860 0x00000486 jam 0x00000001 , 0x00004c41 00000861 0x00000487 jam 0x00000000 , 0x00004c4c 00000862 0x00000488 jam 0x00000000 , 0x00004c43 - 00000863 0x00000489 rtn + 00000863 0x00000489 branch 0x0000034d 00000864 0x0000048c fetch 0x00000001 , 0x00004c41 00000865 0x0000048d rtn 0x00000034 00000866 0x0000048e fetch 0x00000001 , 0x00004c43 Index: output/bt_program23.list =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/bt_program23.list (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/bt_program23.list (working copy) @@ -678,15 +678,15 @@ 0x253 000798 branch mouse_24g_start_pair_mode_skip_blink_timer : 000800 p_mouse_24g_auto_pair_attempt_fail: 0x254 000801 fetch mouse_flag_len ,mem_mouse_flag -0x255 000802 bbit0 mouse_enable_24g_first_auto_pairing ,p_mouse_24g_attempt_fail_enter_hibernate +0x255 000802 bbit0 mouse_enable_24g_first_auto_pairing ,mouse_24g_attempt_fail_enter_hibernate 0x256 000803 fetch 1 ,mem_device_number 0x257 000804 beq 1 ,p_mouse_24g_attempt_fail_enter_hibernate 0x258 000805 branch mouse_24g_first_bluetooth_reconnect : 000807 p_mouse_reconn_dongle_attempt_fail: 0x259 000808 fetch mouse_flag_len ,mem_mouse_flag -0x25a 000809 bbit0 mouse_enable_24g_first_auto_pairing ,p_mouse_24g_attempt_fail_enter_hibernate -0x25b 000810 bbit1 mouse_enable_eeprom ,p_mouse_24g_attempt_fail_enter_hibernate -0x25c 000811 bbit1 mouse_enable_flash ,p_mouse_24g_attempt_fail_enter_hibernate +0x25a 000809 bbit0 mouse_enable_24g_first_auto_pairing ,mouse_24g_attempt_fail_enter_hibernate +0x25b 000810 bbit1 mouse_enable_eeprom ,mouse_24g_attempt_fail_enter_hibernate +0x25c 000811 bbit1 mouse_enable_flash ,mouse_24g_attempt_fail_enter_hibernate 0x25d 000812 branch mouse_24g_start_auto_pair + 1 : 000814 p_mouse_24g_attempt_fail_enter_hibernate: 0x25e 000815 fetch mouse_flag_len ,mem_mouse_flag @@ -991,7 +991,7 @@ 0x35c 001158 jam 1 ,mem_mouse_multi_led_blink_enable 0x35d 001159 jam 0 ,mem_mouse_multi_led_blink_timer 0x35e 001160 jam multi_led_on ,mem_mouse_multi_led_type -0x35f 001161 rtn +0x35f 001161 branch p_mouse_device_multi_led_poweron2s_init : 001163 p_mouse_led_multi_timer: 0x360 001164 fetch 1 ,mem_mouse_multi_led_blink_enable 0x361 001165 rtn blank Index: output/bt_program23.meta =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/bt_program23.meta (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/bt_program23.meta (working copy) @@ -799,16 +799,16 @@ p_mouse_24g_auto_pair_attempt_fail: fetch MOUSE_FLAG_LEN,mem_mouse_flag - bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,p_mouse_24g_attempt_fail_enter_hibernate + bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,mouse_24g_attempt_fail_enter_hibernate fetch 1,mem_device_number beq 1,p_mouse_24g_attempt_fail_enter_hibernate //24g first mode and only 2.4g device branch mouse_24g_first_bluetooth_reconnect p_mouse_reconn_dongle_attempt_fail: fetch MOUSE_FLAG_LEN,mem_mouse_flag - bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,p_mouse_24g_attempt_fail_enter_hibernate - bbit1 MOUSE_ENABLE_EEPROM,p_mouse_24g_attempt_fail_enter_hibernate - bbit1 MOUSE_ENABLE_FLASH,p_mouse_24g_attempt_fail_enter_hibernate + bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,mouse_24g_attempt_fail_enter_hibernate + bbit1 MOUSE_ENABLE_EEPROM,mouse_24g_attempt_fail_enter_hibernate + bbit1 MOUSE_ENABLE_FLASH,mouse_24g_attempt_fail_enter_hibernate branch mouse_24g_start_auto_pair+1 p_mouse_24g_attempt_fail_enter_hibernate: @@ -1158,7 +1158,7 @@ jam 1,mem_mouse_multi_led_blink_enable //disable flag jam 0,mem_mouse_multi_led_blink_timer jam MULTI_LED_ON,mem_mouse_multi_led_type - rtn + branch p_mouse_device_multi_led_poweron2s_init p_mouse_led_multi_timer: fetch 1,mem_mouse_multi_led_blink_enable Index: output/bt_program23.rom =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/bt_program23.rom (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/bt_program23.rom (working copy) @@ -595,14 +595,14 @@ 00100000010000000000001101010010 00100000001000000100100000101110 01101111111001000100101110101011 -11000011000101111000001001011110 +11000011000101111100100000111001 01101111111000001100101110110100 11000000000000001000001001011110 00100000001000000100100000011010 01101111111001000100101110101011 -11000011000101111000001001011110 -11000010100010011000001001011110 -11000010100010010000001001011110 +11000011000101111100100000111001 +11000010100010011100100000111001 +11000010100010010100100000111001 00100000001000000100100000010010 01101111111001000100101110101011 11000011000111100100100000111001 @@ -861,7 +861,7 @@ 01110000010011000100000100000001 01110000010011000100110000000000 01110000010011000100001100000000 -00100000011000000000000000000000 +00100000001000000000001101001101 01101111111000001100110001000001 00100000011110100000000000000000 01101111111000001100110001000011 Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/eeprom.dat (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/eeprom.dat (working copy) @@ -2394,8 +2394,8 @@ ab c3 17 -82 -5e +c8 +39 6f e0 cb @@ -2414,16 +2414,16 @@ ab c3 17 -82 -5e +c8 +39 c2 89 -82 -5e +c8 +39 c2 89 -02 -5e +48 +39 20 20 48 @@ -3457,9 +3457,9 @@ 43 00 20 -60 -00 -00 +20 +03 +4d 6f e0 cc @@ -5408,8 +5408,8 @@ 60 00 00 -b4 -11 +b8 +a1 aa 55 40 @@ -5558,7 +5558,7 @@ 00 00 22 -80 +81 1b aa 55 @@ -6718,10 +6718,10 @@ aa aa 55 -3e +3f 85 -4a -26 +08 +02 ff ff ff Index: output/flash.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/flash.dat (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/flash.dat (working copy) @@ -2394,8 +2394,8 @@ ab c3 17 -82 -5e +c8 +39 6f e0 cb @@ -2414,16 +2414,16 @@ ab c3 17 -82 -5e +c8 +39 c2 89 -82 -5e +c8 +39 c2 89 -02 -5e +48 +39 20 20 48 @@ -3457,9 +3457,9 @@ 43 00 20 -60 -00 -00 +20 +03 +4d 6f e0 cc @@ -5408,8 +5408,8 @@ 60 00 00 -b4 -11 +b8 +a1 aa 55 40 @@ -5558,7 +5558,7 @@ 00 00 22 -80 +81 1b aa 55 @@ -5633,8 +5633,8 @@ 00 24 49 -02 -02 +01 +01 00 aa 55 @@ -6718,10 +6718,10 @@ aa aa 55 -40 +3f 85 -6f -27 +08 +02 ff ff ff Index: output/otp.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/otp.dat (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/otp.dat (working copy) @@ -2394,8 +2394,8 @@ ab c3 17 -82 -5e +c8 +39 6f e0 cb @@ -2414,16 +2414,16 @@ ab c3 17 -82 -5e +c8 +39 c2 89 -82 -5e +c8 +39 c2 89 -02 -5e +48 +39 20 20 48 @@ -3457,9 +3457,9 @@ 43 00 20 -60 -00 -00 +20 +03 +4d 6f e0 cc @@ -5408,8 +5408,8 @@ 60 00 00 -b4 -11 +b8 +a1 aa 55 40 @@ -5558,7 +5558,7 @@ 00 00 22 -80 +81 1b aa 55 @@ -5633,8 +5633,8 @@ 00 24 49 -02 -02 +01 +01 00 aa 55 @@ -6718,7 +6718,7 @@ aa aa 55 -02 +01 85 -c1 -9f +eb +8e Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/program.lis (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/program.lis (working copy) @@ -759,16 +759,16 @@ p_mouse_24g_auto_pair_attempt_fail: 0254 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0255 c317825e bbit0 mouse_enable_24g_first_auto_pairing ,p_mouse_24g_attempt_fail_enter_hibernate +0255 c317c839 bbit0 mouse_enable_24g_first_auto_pairing ,mouse_24g_attempt_fail_enter_hibernate 0256 6fe0cbb4 fetch 1 ,mem_device_number 0257 c000825e beq 1 ,p_mouse_24g_attempt_fail_enter_hibernate 0258 2020481a branch mouse_24g_first_bluetooth_reconnect p_mouse_reconn_dongle_attempt_fail: 0259 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -025a c317825e bbit0 mouse_enable_24g_first_auto_pairing ,p_mouse_24g_attempt_fail_enter_hibernate -025b c289825e bbit1 mouse_enable_eeprom ,p_mouse_24g_attempt_fail_enter_hibernate -025c c289025e bbit1 mouse_enable_flash ,p_mouse_24g_attempt_fail_enter_hibernate +025a c317c839 bbit0 mouse_enable_24g_first_auto_pairing ,mouse_24g_attempt_fail_enter_hibernate +025b c289c839 bbit1 mouse_enable_eeprom ,mouse_24g_attempt_fail_enter_hibernate +025c c2894839 bbit1 mouse_enable_flash ,mouse_24g_attempt_fail_enter_hibernate 025d 20204812 branch mouse_24g_start_auto_pair + 1 p_mouse_24g_attempt_fail_enter_hibernate: @@ -1119,7 +1119,7 @@ 035c 704c4101 jam 1 ,mem_mouse_multi_led_blink_enable 035d 704c4c00 jam 0 ,mem_mouse_multi_led_blink_timer 035e 704c4300 jam multi_led_on ,mem_mouse_multi_led_type -035f 20600000 rtn +035f 2020034d branch p_mouse_device_multi_led_poweron2s_init p_mouse_led_multi_timer: 0360 6fe0cc41 fetch 1 ,mem_mouse_multi_led_blink_enable Index: output/ramcode.rom =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/ramcode.rom (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/ramcode.rom (working copy) @@ -595,14 +595,14 @@ 20400352 2020482e 6fe44bab -c317825e +c317c839 6fe0cbb4 c000825e 2020481a 6fe44bab -c317825e -c289825e -c289025e +c317c839 +c289c839 +c2894839 20204812 6fe44bab c31e4839 @@ -861,7 +861,7 @@ 704c4101 704c4c00 704c4300 -20600000 +2020034d 6fe0cc41 207a0000 6fe0cc43 Index: output/sched.rom =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/sched.rom (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/output/sched.rom (working copy) @@ -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 -80 +81 #mouse flag byte8 #bit0 MOUSE_ENABLE_SMOOTHER @@ -203,8 +203,8 @@ mem_dpi_led_gpio:ff #03 mem_firebutton_gpio:ff -mem_sensor_angle_default:02 #00--6CLK 01--9CLK 02--12CLK 03--3CLK -mem_sensor_angle_switch:02 #00--6CLK 01--9CLK 02--12CLK 03--3CLK +mem_sensor_angle_default:01 #00--6CLK 01--9CLK 02--12CLK 03--3CLK +mem_sensor_angle_switch:01 #00--6CLK 01--9CLK 02--12CLK 03--3CLK mem_config_sensor_dpi:00 #00--1200 01--1600 mem_mouse_logo_led_gpio:ff Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/program/patch.prog (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/program/patch.prog (working copy) @@ -823,16 +823,16 @@ p_mouse_24g_auto_pair_attempt_fail: fetch MOUSE_FLAG_LEN,mem_mouse_flag - bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,p_mouse_24g_attempt_fail_enter_hibernate + bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,mouse_24g_attempt_fail_enter_hibernate fetch 1,mem_device_number beq 1,p_mouse_24g_attempt_fail_enter_hibernate //24g first mode and only 2.4g device branch mouse_24g_first_bluetooth_reconnect p_mouse_reconn_dongle_attempt_fail: fetch MOUSE_FLAG_LEN,mem_mouse_flag - bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,p_mouse_24g_attempt_fail_enter_hibernate - bbit1 MOUSE_ENABLE_EEPROM,p_mouse_24g_attempt_fail_enter_hibernate - bbit1 MOUSE_ENABLE_FLASH,p_mouse_24g_attempt_fail_enter_hibernate + bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,mouse_24g_attempt_fail_enter_hibernate + bbit1 MOUSE_ENABLE_EEPROM,mouse_24g_attempt_fail_enter_hibernate + bbit1 MOUSE_ENABLE_FLASH,mouse_24g_attempt_fail_enter_hibernate branch mouse_24g_start_auto_pair+1 p_mouse_24g_attempt_fail_enter_hibernate: @@ -1195,7 +1195,7 @@ jam 1,mem_mouse_multi_led_blink_enable //disable flag jam 0,mem_mouse_multi_led_blink_timer jam MULTI_LED_ON,mem_mouse_multi_led_type - rtn + branch p_mouse_device_multi_led_poweron2s_init p_mouse_led_multi_timer: fetch 1,mem_mouse_multi_led_blink_enable Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/sched/mouse.dat (revision 4544) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_24G_BT1_M6-12clk_8Key_S201_DPI5/sched/mouse.dat (working copy) @@ -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 -80 +81 #mouse flag byte8 #bit0 MOUSE_ENABLE_SMOOTHER