Index: output/bt_program23.icode =================================================================== --- /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/bt_program23.icode (revision 5573) +++ /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/bt_program23.icode (working copy) @@ -655,7 +655,7 @@ 00000654 0x0000037c branch 0x00003e1c 00000655 0x0000037f fetch 0x00000008 , 0x00004bbc 00000656 0x00000380 bbit0 0x00000011 , 0x00004842 - 00000657 0x00000382 jam 0x000000a2 , 0x00004cea + 00000657 0x00000382 jam 0x000000a2 , 0x00004ceb 00000658 0x00000383 call 0x00000726 00000659 0x00000384 call 0x00003e28 00000660 0x00000385 branch 0x00004845 , 0x00000028 @@ -856,7 +856,7 @@ 00000855 0x000004a9 beq 0x0000000a , 0x00000359 00000856 0x000004aa pincrease 0x00000001 00000857 0x000004ab mul32 0x0000003f , 0x0000000a , 0x0000003f - 00000858 0x000004ac store 0x00000001 , 0x00004cea + 00000858 0x000004ac store 0x00000001 , 0x00004ceb 00000859 0x000004ad branch 0x00000726 00000860 0x000004b0 fetch 0x00000001 , 0x00004cb5 00000861 0x000004b1 rtn 0x00000034 @@ -906,11 +906,11 @@ 00000905 0x000004fb beq 0x00000001 , 0x0000038e 00000906 0x000004fc beq 0x00000002 , 0x00000390 00000907 0x000004fd rtn - 00000908 0x00000505 jam 0x000000d1 , 0x00004cea + 00000908 0x00000505 jam 0x000000d1 , 0x00004ceb 00000909 0x00000506 branch 0x0000072b - 00000910 0x00000508 jam 0x000000d2 , 0x00004cea + 00000910 0x00000508 jam 0x000000d2 , 0x00004ceb 00000911 0x00000509 branch 0x0000072b - 00000912 0x0000050b jam 0x000000d3 , 0x00004cea + 00000912 0x0000050b jam 0x000000d3 , 0x00004ceb 00000913 0x0000050c branch 0x0000072b 00000914 0x0000050f fetch 0x00000001 , 0x00004cb4 00000915 0x00000510 rtn 0x00000034 @@ -921,17 +921,17 @@ 00000920 0x00000516 jam 0x00000001 , 0x00004cb5 00000921 0x00000517 jam 0x00000001 , 0x00004cb6 00000922 0x00000518 branch 0x00000370 - 00000923 0x0000051b jam 0x000000c1 , 0x00004cea + 00000923 0x0000051b jam 0x000000c1 , 0x00004ceb 00000924 0x0000051c branch 0x00000726 00000925 0x0000051e fetch 0x00000001 , 0x0000493d 00000926 0x0000051f beq 0x00000002 , 0x0000039b - 00000927 0x00000520 jam 0x000000b1 , 0x00004cea + 00000927 0x00000520 jam 0x000000b1 , 0x00004ceb 00000928 0x00000521 branch 0x00000726 - 00000929 0x00000528 jam 0x000000c2 , 0x00004cea + 00000929 0x00000528 jam 0x000000c2 , 0x00004ceb 00000930 0x00000529 branch 0x00000726 00000931 0x0000052b fetch 0x00000001 , 0x0000493d 00000932 0x0000052c beq 0x00000002 , 0x000003a1 - 00000933 0x0000052d jam 0x000000b2 , 0x00004cea + 00000933 0x0000052d jam 0x000000b2 , 0x00004ceb 00000934 0x0000052e branch 0x00000726 00000935 0x0000053b fetch 0x00000001 , 0x0000493d 00000936 0x0000053c beq 0x00000000 , 0x000003ad @@ -1087,7 +1087,7 @@ 00001086 0x0000063a call 0x00004272 00001087 0x0000063b call 0x0000427c 00001088 0x0000063c branch 0x00003e5d - 00001089 0x0000064a jam 0x000000ff , 0x00004cea + 00001089 0x0000064a jam 0x000000ff , 0x00004ceb 00001090 0x0000064b call 0x0000072b 00001091 0x0000064c call 0x00004329 00001092 0x0000064d call 0x00007f52 @@ -1244,7 +1244,7 @@ 00001243 0x0000071e branch 0x000004e0 00001244 0x00000722 fetch 0x00000001 , 0x00004997 00001245 0x00000723 pincrease 0x00000001 - 00001246 0x00000724 store 0x00000001 , 0x00004cea + 00001246 0x00000724 store 0x00000001 , 0x00004ceb 00001247 0x00000725 branch 0x00000726 00001248 0x00000734 call 0x000040cf 00001249 0x00000736 fetch 0x00000001 , 0x0000492c @@ -1387,7 +1387,7 @@ 00001386 0x00000828 fetch 0x00000001 , 0x00004d4e 00001387 0x00000829 beq 0x00000000 , 0x00002683 00001388 0x0000082a jam 0x00000000 , 0x00004d4e - 00001389 0x0000082b jam 0x000000a2 , 0x00004cea + 00001389 0x0000082b jam 0x000000a2 , 0x00004ceb 00001390 0x0000082c call 0x00000726 00001391 0x0000082d branch 0x0000029d 00001392 0x0000082f arg 0x00004887 , 0x00000013 @@ -1440,7 +1440,7 @@ 00001439 0x0000086b isub 0x00000002 , 0x0000003e 00001440 0x0000086c branch 0x000005a2 , 0x00000005 00001441 0x0000086d branch 0x00004845 - 00001442 0x00000871 jam 0x000000a1 , 0x00004cea + 00001442 0x00000871 jam 0x000000a1 , 0x00004ceb 00001443 0x00000872 call 0x00000726 00001444 0x00000873 jam 0x00000000 , 0x0000488f 00001445 0x00000874 branch 0x00004866 @@ -1843,8 +1843,8 @@ 00001842 0x00000b04 call 0x000006fb 00001843 0x00000b05 nop 0x00005dc0 00001844 0x00000b08 call 0x0000070e - 00001845 0x00000b09 nop 0x00000064 - 00001846 0x00000b0c arg 0x00000001 , 0x00000039 + 00001845 0x00000b0b jam 0x0000008a , 0x00004cea + 00001846 0x00000b0c arg 0x00000002 , 0x00000039 00001847 0x00000b0d arg 0x00004cea , 0x00000013 00001848 0x00000b0e branch 0x0000074b 00001849 0x00000b14 rshift4 0x0000003f , 0x00000011 Index: output/bt_program23.list =================================================================== --- /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/bt_program23.list (revision 5573) +++ /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/bt_program23.list (working copy) @@ -757,7 +757,7 @@ : 000894 p_mouse_24g_start_mode: 0x28f 000895 fetch mouse_flag_len ,mem_mouse_flag 0x290 000896 bbit0 mouse_enable_24g ,mouse_24g_mode_setup_error -0x291 000898 jam 0xa2 ,mem_24g_txbuf_temp +0x291 000898 jam 0xa2 ,mem_24g_txbuf_temp + 1 0x292 000899 call p_g24_txbuf_data_print 0x293 000900 call mouse_wakeup_from_power_check 0x294 000901 branch mouse_24g_reconn_dongle_start ,user @@ -988,7 +988,7 @@ 0x357 001193 beq 10 ,p_mouse_digital_display_tube_updata + 5 0x358 001194 pincrease 1 0x359 001195 mul32 pdata ,10 ,pdata -0x35a 001196 store 1 ,mem_24g_txbuf_temp +0x35a 001196 store 1 ,mem_24g_txbuf_temp + 1 0x35b 001197 branch p_g24_txbuf_data_print : 001199 p_mouse_led_multi_timer: 0x35c 001200 fetch 1 ,mem_mouse_multi_led_blink_enable @@ -1055,13 +1055,13 @@ 0x38a 001276 beq mode_bt_device2 ,p_mouse_device_bt2_poweron_led_config 0x38b 001277 rtn : 001284 p_mouse_device_24g_poweron_led_config: -0x38c 001285 jam 0xd1 ,mem_24g_txbuf_temp +0x38c 001285 jam 0xd1 ,mem_24g_txbuf_temp + 1 0x38d 001286 branch p_g24_txbuf_data_print_next : 001287 p_mouse_device_bt1_poweron_led_config: -0x38e 001288 jam 0xd2 ,mem_24g_txbuf_temp +0x38e 001288 jam 0xd2 ,mem_24g_txbuf_temp + 1 0x38f 001289 branch p_g24_txbuf_data_print_next : 001290 p_mouse_device_bt2_poweron_led_config: -0x390 001291 jam 0xd3 ,mem_24g_txbuf_temp +0x390 001291 jam 0xd3 ,mem_24g_txbuf_temp + 1 0x391 001292 branch p_g24_txbuf_data_print_next : 001294 p_mouse_device_pair_led_config: 0x392 001295 fetch 1 ,mem_mouse_led_new_interface_enable @@ -1075,20 +1075,20 @@ 0x399 001303 jam multi_led_blink ,mem_mouse_multi_led_type 0x39a 001304 branch p_mouse_device_multi_led_on : 001306 p_mouse_device_discovery_bt2_led_config: -0x39b 001307 jam 0xc1 ,mem_24g_txbuf_temp +0x39b 001307 jam 0xc1 ,mem_24g_txbuf_temp + 1 0x39c 001308 branch p_g24_txbuf_data_print : 001309 p_mouse_device_discovery_led_config: 0x39d 001310 fetch 1 ,mem_device_flag 0x39e 001311 beq mode_bt_device2 ,p_mouse_device_discovery_bt2_led_config -0x39f 001312 jam 0xb1 ,mem_24g_txbuf_temp +0x39f 001312 jam 0xb1 ,mem_24g_txbuf_temp + 1 0x3a0 001313 branch p_g24_txbuf_data_print : 001319 p_mouse_device_le_reconn_bt2_led_config: -0x3a1 001320 jam 0xc2 ,mem_24g_txbuf_temp +0x3a1 001320 jam 0xc2 ,mem_24g_txbuf_temp + 1 0x3a2 001321 branch p_g24_txbuf_data_print : 001322 p_mouse_device_le_reconn_led_config: 0x3a3 001323 fetch 1 ,mem_device_flag 0x3a4 001324 beq mode_bt_device2 ,p_mouse_device_le_reconn_bt2_led_config -0x3a5 001325 jam 0xb2 ,mem_24g_txbuf_temp +0x3a5 001325 jam 0xb2 ,mem_24g_txbuf_temp + 1 0x3a6 001326 branch p_g24_txbuf_data_print : 001338 p_mouse_commbination_key_process: 0x3a7 001339 fetch 1 ,mem_device_flag @@ -1275,7 +1275,7 @@ 0x43f 001595 call mouse_sensor_powerdown 0x440 001596 branch mouse_app_enter_hibernate + 3 : 001609 p_mouse_setgpio_hibernate: -0x441 001610 jam 0xff ,mem_24g_txbuf_temp +0x441 001610 jam 0xff ,mem_24g_txbuf_temp + 1 0x442 001611 call p_g24_txbuf_data_print_next 0x443 001612 call mouse_set_sdio_high 0x444 001613 call clear_wake @@ -1459,7 +1459,7 @@ : 001825 p_mouse_dpi_num_display: 0x4dc 001826 fetch 1 ,mem_mouse_dpi 0x4dd 001827 pincrease 1 -0x4de 001828 store 1 ,mem_24g_txbuf_temp +0x4de 001828 store 1 ,mem_24g_txbuf_temp + 1 0x4df 001829 branch p_g24_txbuf_data_print : 001843 p_mouse_seting_dpi: 0x4e0 001844 call mouse_setting_dpi_4_level @@ -1628,7 +1628,7 @@ 0x56a 002088 fetch 1 ,mem_mouse_pb_long_pressed_flag 0x56b 002089 beq 0 ,g24_stop_24g_mode 0x56c 002090 jam 0 ,mem_mouse_pb_long_pressed_flag -0x56d 002091 jam 0xa2 ,mem_24g_txbuf_temp +0x56d 002091 jam 0xa2 ,mem_24g_txbuf_temp + 1 0x56e 002092 call p_g24_txbuf_data_print 0x56f 002093 branch p_mouse_24g_reconn_general_dongle : 002094 p_g24_pair_timeout_timer: @@ -1688,7 +1688,7 @@ 0x5a0 002156 branch p_mouse_24g_start_pair_mode ,zero 0x5a1 002157 branch mouse_24g_reconn_dongle_start : 002160 p_mouse_24g_start_pair_mode: -0x5a2 002161 jam 0xa1 ,mem_24g_txbuf_temp +0x5a2 002161 jam 0xa1 ,mem_24g_txbuf_temp + 1 0x5a3 002162 call p_g24_txbuf_data_print 0x5a4 002163 jam 0 ,mem_24g_reconn_type 0x5a5 002164 branch mouse_24g_start_pair_mode @@ -2160,8 +2160,8 @@ 0x732 002820 call p_mouse_gpio_config_output_high 0x733 002821 nop 24000 0x734 002824 call p_device_hardware_init -0x735 002825 nop 100 -0x736 002828 arg 1 ,loopcnt +0x735 002827 jam 0x8a ,mem_24g_txbuf_temp +0x736 002828 arg 2 ,loopcnt 0x737 002829 arg mem_24g_txbuf_temp ,regc 0x738 002830 branch log_bytes : 002835 hex2ascii: Index: output/bt_program23.meta =================================================================== --- /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/bt_program23.meta (revision 5573) +++ /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/bt_program23.meta (working copy) @@ -895,7 +895,7 @@ fetch MOUSE_FLAG_LEN,mem_mouse_flag bbit0 MOUSE_ENABLE_24G,mouse_24g_mode_setup_error // call p_mouse_device_pair_led_config - jam 0xa2,mem_24g_txbuf_temp + jam 0xa2,mem_24g_txbuf_temp+1 call p_g24_txbuf_data_print call mouse_wakeup_from_power_check // wake from hibernate :enble user branch mouse_24g_reconn_dongle_start,user @@ -1193,7 +1193,7 @@ beq 10,p_mouse_digital_display_tube_updata+5 pincrease 1 mul32 pdata,10,pdata - store 1,mem_24g_txbuf_temp + store 1,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print p_mouse_led_multi_timer: @@ -1282,13 +1282,13 @@ // jam ON,mem_mouse_multi_led_blink_enable // rtn p_mouse_device_24g_poweron_led_config: - jam 0xd1,mem_24g_txbuf_temp + jam 0xd1,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print_next p_mouse_device_bt1_poweron_led_config: - jam 0xd2,mem_24g_txbuf_temp + jam 0xd2,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print_next p_mouse_device_bt2_poweron_led_config: - jam 0xd3,mem_24g_txbuf_temp + jam 0xd3,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print_next p_mouse_device_pair_led_config: //24g pair led config @@ -1304,12 +1304,12 @@ branch p_mouse_device_multi_led_on p_mouse_device_discovery_bt2_led_config: - jam 0xc1,mem_24g_txbuf_temp + jam 0xc1,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print p_mouse_device_discovery_led_config: //ble discovery led config fetch 1,mem_device_flag beq MODE_BT_DEVICE2,p_mouse_device_discovery_bt2_led_config - jam 0xb1,mem_24g_txbuf_temp + jam 0xb1,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print // fetch 1,mem_mouse_led_new_interface_enable // rtn blank @@ -1317,12 +1317,12 @@ // branch p_mouse_multi_led_blink_enable p_mouse_device_le_reconn_bt2_led_config: - jam 0xc2,mem_24g_txbuf_temp + jam 0xc2,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print p_mouse_device_le_reconn_led_config: //le recon led config fetch 1,mem_device_flag beq MODE_BT_DEVICE2,p_mouse_device_le_reconn_bt2_led_config - jam 0xb2,mem_24g_txbuf_temp + jam 0xb2,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print // fetch 1,mem_mouse_led_new_interface_enable // rtn blank @@ -1607,7 +1607,7 @@ ////////////////////////////////////////////////sensor init end//////////////////////////////////////////// p_mouse_setgpio_hibernate: - jam 0xff,mem_24g_txbuf_temp + jam 0xff,mem_24g_txbuf_temp+1 call p_g24_txbuf_data_print_next call mouse_set_sdio_high call clear_wake @@ -1825,7 +1825,7 @@ p_mouse_dpi_num_display: fetch 1,mem_mouse_dpi pincrease 1 - store 1,mem_24g_txbuf_temp + store 1,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print // p_mouse_dpi_level6_set: @@ -2088,7 +2088,7 @@ fetch 1,mem_mouse_pb_long_pressed_flag beq 0,g24_stop_24g_mode jam 0,mem_mouse_pb_long_pressed_flag - jam 0xa2,mem_24g_txbuf_temp + jam 0xa2,mem_24g_txbuf_temp+1 call p_g24_txbuf_data_print branch p_mouse_24g_reconn_general_dongle p_g24_pair_timeout_timer: @@ -2158,7 +2158,7 @@ p_mouse_24g_start_pair_mode: - jam 0xa1,mem_24g_txbuf_temp + jam 0xa1,mem_24g_txbuf_temp+1 call p_g24_txbuf_data_print jam 0,mem_24g_reconn_type branch mouse_24g_start_pair_mode @@ -2822,10 +2822,10 @@ // 3. 恢复 UART 功能 call p_device_hardware_init - nop 100 - + // 4. 发送真正命令，只发一次 - arg 1,loopcnt + jam 0x8a,mem_24g_txbuf_temp + arg 2,loopcnt arg mem_24g_txbuf_temp,regc branch log_bytes Index: output/bt_program23.rom =================================================================== --- /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/bt_program23.rom (revision 5573) +++ /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/bt_program23.rom (working copy) @@ -655,7 +655,7 @@ 00100000001000000011111000011100 01101111111001000100101110111100 11000011000010001100100001000010 -01110000010011001110101010100010 +01110000010011001110101110100010 00100000010000000000011100100110 00100000010000000011111000101000 00100000001101000100100001000101 @@ -856,7 +856,7 @@ 11000000000001010000001101011001 00011111111000001111111000000001 00011111111011111111111000001010 -01100111111000001100110011101010 +01100111111000001100110011101011 00100000001000000000011100100110 01101111111000001100110010110101 00100000011110100000000000000000 @@ -906,11 +906,11 @@ 11000000000000001000001110001110 11000000000000010000001110010000 00100000011000000000000000000000 -01110000010011001110101011010001 +01110000010011001110101111010001 00100000001000000000011100101011 -01110000010011001110101011010010 +01110000010011001110101111010010 00100000001000000000011100101011 -01110000010011001110101011010011 +01110000010011001110101111010011 00100000001000000000011100101011 01101111111000001100110010110100 00100000011110100000000000000000 @@ -921,17 +921,17 @@ 01110000010011001011010100000001 01110000010011001011011000000001 00100000001000000000001101110000 -01110000010011001110101011000001 +01110000010011001110101111000001 00100000001000000000011100100110 01101111111000001100100100111101 11000000000000010000001110011011 -01110000010011001110101010110001 +01110000010011001110101110110001 00100000001000000000011100100110 -01110000010011001110101011000010 +01110000010011001110101111000010 00100000001000000000011100100110 01101111111000001100100100111101 11000000000000010000001110100001 -01110000010011001110101010110010 +01110000010011001110101110110010 00100000001000000000011100100110 01101111111000001100100100111101 11000000000000000000001110101101 @@ -1087,7 +1087,7 @@ 00100000010000000100001001110010 00100000010000000100001001111100 00100000001000000011111001011101 -01110000010011001110101011111111 +01110000010011001110101111111111 00100000010000000000011100101011 00100000010000000100001100101001 00100000010000000111111101010010 @@ -1244,7 +1244,7 @@ 00100000001000000000010011100000 01101111111000001100100110010111 00011111111000001111111000000001 -01100111111000001100110011101010 +01100111111000001100110011101011 00100000001000000000011100100110 00100000010000000100000011001111 01101111111000001100100100101100 @@ -1387,7 +1387,7 @@ 01101111111000001100110101001110 11000000000000000010011010000011 01110000010011010100111000000000 -01110000010011001110101010100010 +01110000010011001110101110100010 00100000010000000000011100100110 00100000001000000000001010011101 11011010011000000100100010000111 @@ -1440,7 +1440,7 @@ 10011000010001100111110000000000 00100000001000101000010110100010 00100000001000000100100001000101 -01110000010011001110101010100001 +01110000010011001110101110100001 00100000010000000000011100100110 01110000010010001000111100000000 00100000001000000100100001100110 @@ -1843,8 +1843,8 @@ 00100000010000000000011011111011 00100000000000000101110111000000 00100000010000000000011100001110 -00100000000000000000000001100100 -11011111001000000000000000000001 +01110000010011001110101010001010 +11011111001000000000000000000010 11011010011000000100110011101010 00100000001000000000011101001011 00011111111100011010001000000000 Index: output/eeprom.dat =================================================================== --- /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/eeprom.dat (revision 5573) +++ /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/eeprom.dat (working copy) @@ -2634,7 +2634,7 @@ 42 70 4c -ea +eb a2 20 40 @@ -3439,7 +3439,7 @@ 67 e0 cc -ea +eb 20 20 07 @@ -3638,7 +3638,7 @@ 00 70 4c -ea +eb d1 20 20 @@ -3646,7 +3646,7 @@ 2b 70 4c -ea +eb d2 20 20 @@ -3654,7 +3654,7 @@ 2b 70 4c -ea +eb d3 20 20 @@ -3698,7 +3698,7 @@ 70 70 4c -ea +eb c1 20 20 @@ -3714,7 +3714,7 @@ 9b 70 4c -ea +eb b1 20 20 @@ -3722,7 +3722,7 @@ 26 70 4c -ea +eb c2 20 20 @@ -3738,7 +3738,7 @@ a1 70 4c -ea +eb b2 20 20 @@ -4362,7 +4362,7 @@ 5d 70 4c -ea +eb ff 20 40 @@ -4991,7 +4991,7 @@ 67 e0 cc -ea +eb 20 20 07 @@ -5562,7 +5562,7 @@ 00 70 4c -ea +eb a2 20 40 @@ -5774,7 +5774,7 @@ 45 70 4c -ea +eb a1 20 40 @@ -7384,14 +7384,14 @@ 40 07 0e -20 -00 -00 -64 +70 +4c +ea +8a df 20 00 -01 +02 da 60 4c @@ -7596,8 +7596,8 @@ 20 5f a5 -74 -1f +2a +da aa 55 40 Index: output/flash.dat =================================================================== --- /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/flash.dat (revision 5573) +++ /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/flash.dat (working copy) @@ -2634,7 +2634,7 @@ 42 70 4c -ea +eb a2 20 40 @@ -3439,7 +3439,7 @@ 67 e0 cc -ea +eb 20 20 07 @@ -3638,7 +3638,7 @@ 00 70 4c -ea +eb d1 20 20 @@ -3646,7 +3646,7 @@ 2b 70 4c -ea +eb d2 20 20 @@ -3654,7 +3654,7 @@ 2b 70 4c -ea +eb d3 20 20 @@ -3698,7 +3698,7 @@ 70 70 4c -ea +eb c1 20 20 @@ -3714,7 +3714,7 @@ 9b 70 4c -ea +eb b1 20 20 @@ -3722,7 +3722,7 @@ 26 70 4c -ea +eb c2 20 20 @@ -3738,7 +3738,7 @@ a1 70 4c -ea +eb b2 20 20 @@ -4362,7 +4362,7 @@ 5d 70 4c -ea +eb ff 20 40 @@ -4991,7 +4991,7 @@ 67 e0 cc -ea +eb 20 20 07 @@ -5562,7 +5562,7 @@ 00 70 4c -ea +eb a2 20 40 @@ -5774,7 +5774,7 @@ 45 70 4c -ea +eb a1 20 40 @@ -7384,14 +7384,14 @@ 40 07 0e -20 -00 -00 -64 +70 +4c +ea +8a df 20 00 -01 +02 da 60 4c @@ -7596,8 +7596,8 @@ 20 5f a5 -74 -1f +2a +da aa 55 40 Index: output/program.lis =================================================================== --- /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/program.lis (revision 5573) +++ /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/program.lis (working copy) @@ -857,7 +857,7 @@ p_mouse_24g_start_mode: 028f 6fe44bbc fetch mouse_flag_len ,mem_mouse_flag 0290 c308c842 bbit0 mouse_enable_24g ,mouse_24g_mode_setup_error -0291 704ceaa2 jam 0xa2 ,mem_24g_txbuf_temp +0291 704ceba2 jam 0xa2 ,mem_24g_txbuf_temp + 1 0292 20400726 call p_g24_txbuf_data_print 0293 20403e28 call mouse_wakeup_from_power_check 0294 20344845 branch mouse_24g_reconn_dongle_start ,user @@ -1118,7 +1118,7 @@ 0357 c0050359 beq 10 ,p_mouse_digital_display_tube_updata + 5 0358 1fe0fe01 pincrease 1 0359 1feffe0a mul32 pdata ,10 ,pdata -035a 67e0ccea store 1 ,mem_24g_txbuf_temp +035a 67e0cceb store 1 ,mem_24g_txbuf_temp + 1 035b 20200726 branch p_g24_txbuf_data_print p_mouse_led_multi_timer: @@ -1202,15 +1202,15 @@ 038b 20600000 rtn p_mouse_device_24g_poweron_led_config: -038c 704cead1 jam 0xd1 ,mem_24g_txbuf_temp +038c 704cebd1 jam 0xd1 ,mem_24g_txbuf_temp + 1 038d 2020072b branch p_g24_txbuf_data_print_next p_mouse_device_bt1_poweron_led_config: -038e 704cead2 jam 0xd2 ,mem_24g_txbuf_temp +038e 704cebd2 jam 0xd2 ,mem_24g_txbuf_temp + 1 038f 2020072b branch p_g24_txbuf_data_print_next p_mouse_device_bt2_poweron_led_config: -0390 704cead3 jam 0xd3 ,mem_24g_txbuf_temp +0390 704cebd3 jam 0xd3 ,mem_24g_txbuf_temp + 1 0391 2020072b branch p_g24_txbuf_data_print_next p_mouse_device_pair_led_config: @@ -1227,23 +1227,23 @@ 039a 20200370 branch p_mouse_device_multi_led_on p_mouse_device_discovery_bt2_led_config: -039b 704ceac1 jam 0xc1 ,mem_24g_txbuf_temp +039b 704cebc1 jam 0xc1 ,mem_24g_txbuf_temp + 1 039c 20200726 branch p_g24_txbuf_data_print p_mouse_device_discovery_led_config: 039d 6fe0c93d fetch 1 ,mem_device_flag 039e c001039b beq mode_bt_device2 ,p_mouse_device_discovery_bt2_led_config -039f 704ceab1 jam 0xb1 ,mem_24g_txbuf_temp +039f 704cebb1 jam 0xb1 ,mem_24g_txbuf_temp + 1 03a0 20200726 branch p_g24_txbuf_data_print p_mouse_device_le_reconn_bt2_led_config: -03a1 704ceac2 jam 0xc2 ,mem_24g_txbuf_temp +03a1 704cebc2 jam 0xc2 ,mem_24g_txbuf_temp + 1 03a2 20200726 branch p_g24_txbuf_data_print p_mouse_device_le_reconn_led_config: 03a3 6fe0c93d fetch 1 ,mem_device_flag 03a4 c00103a1 beq mode_bt_device2 ,p_mouse_device_le_reconn_bt2_led_config -03a5 704ceab2 jam 0xb2 ,mem_24g_txbuf_temp +03a5 704cebb2 jam 0xb2 ,mem_24g_txbuf_temp + 1 03a6 20200726 branch p_g24_txbuf_data_print p_mouse_commbination_key_process: @@ -1461,7 +1461,7 @@ 0440 20203e5d branch mouse_app_enter_hibernate + 3 p_mouse_setgpio_hibernate: -0441 704ceaff jam 0xff ,mem_24g_txbuf_temp +0441 704cebff jam 0xff ,mem_24g_txbuf_temp + 1 0442 2040072b call p_g24_txbuf_data_print_next 0443 20404329 call mouse_set_sdio_high 0444 20407f52 call clear_wake @@ -1672,7 +1672,7 @@ p_mouse_dpi_num_display: 04dc 6fe0c997 fetch 1 ,mem_mouse_dpi 04dd 1fe0fe01 pincrease 1 -04de 67e0ccea store 1 ,mem_24g_txbuf_temp +04de 67e0cceb store 1 ,mem_24g_txbuf_temp + 1 04df 20200726 branch p_g24_txbuf_data_print p_mouse_seting_dpi: @@ -1867,7 +1867,7 @@ 056a 6fe0cd4e fetch 1 ,mem_mouse_pb_long_pressed_flag 056b c0002683 beq 0 ,g24_stop_24g_mode 056c 704d4e00 jam 0 ,mem_mouse_pb_long_pressed_flag -056d 704ceaa2 jam 0xa2 ,mem_24g_txbuf_temp +056d 704ceba2 jam 0xa2 ,mem_24g_txbuf_temp + 1 056e 20400726 call p_g24_txbuf_data_print 056f 2020029d branch p_mouse_24g_reconn_general_dongle @@ -1934,7 +1934,7 @@ 05a1 20204845 branch mouse_24g_reconn_dongle_start p_mouse_24g_start_pair_mode: -05a2 704ceaa1 jam 0xa1 ,mem_24g_txbuf_temp +05a2 704ceba1 jam 0xa1 ,mem_24g_txbuf_temp + 1 05a3 20400726 call p_g24_txbuf_data_print 05a4 70488f00 jam 0 ,mem_24g_reconn_type 05a5 20204866 branch mouse_24g_start_pair_mode @@ -2475,8 +2475,8 @@ 0732 204006fb call p_mouse_gpio_config_output_high 0733 20005dc0 nop 24000 0734 2040070e call p_device_hardware_init -0735 20000064 nop 100 -0736 df200001 arg 1 ,loopcnt +0735 704cea8a jam 0x8a ,mem_24g_txbuf_temp +0736 df200002 arg 2 ,loopcnt 0737 da604cea arg mem_24g_txbuf_temp ,regc 0738 2020074b branch log_bytes Index: output/ramcode.rom =================================================================== --- /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/ramcode.rom (revision 5573) +++ /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/output/ramcode.rom (working copy) @@ -655,7 +655,7 @@ 20203e1c 6fe44bbc c308c842 -704ceaa2 +704ceba2 20400726 20403e28 20344845 @@ -856,7 +856,7 @@ c0050359 1fe0fe01 1feffe0a -67e0ccea +67e0cceb 20200726 6fe0ccb5 207a0000 @@ -906,11 +906,11 @@ c000838e c0010390 20600000 -704cead1 +704cebd1 2020072b -704cead2 +704cebd2 2020072b -704cead3 +704cebd3 2020072b 6fe0ccb4 207a0000 @@ -921,17 +921,17 @@ 704cb501 704cb601 20200370 -704ceac1 +704cebc1 20200726 6fe0c93d c001039b -704ceab1 +704cebb1 20200726 -704ceac2 +704cebc2 20200726 6fe0c93d c00103a1 -704ceab2 +704cebb2 20200726 6fe0c93d c00003ad @@ -1087,7 +1087,7 @@ 20404272 2040427c 20203e5d -704ceaff +704cebff 2040072b 20404329 20407f52 @@ -1244,7 +1244,7 @@ 202004e0 6fe0c997 1fe0fe01 -67e0ccea +67e0cceb 20200726 204040cf 6fe0c92c @@ -1387,7 +1387,7 @@ 6fe0cd4e c0002683 704d4e00 -704ceaa2 +704ceba2 20400726 2020029d da604887 @@ -1440,7 +1440,7 @@ 98467c00 202285a2 20204845 -704ceaa1 +704ceba1 20400726 70488f00 20204866 @@ -1843,8 +1843,8 @@ 204006fb 20005dc0 2040070e -20000064 -df200001 +704cea8a +df200002 da604cea 2020074b 1ff1a200 Index: program/patch.prog =================================================================== --- /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/program/patch.prog (revision 5573) +++ /YC1308AF/branch/mouse/ATS_Project/ATS_1066-F_610_2M/program/patch.prog (working copy) @@ -1001,7 +1001,7 @@ fetch MOUSE_FLAG_LEN,mem_mouse_flag bbit0 MOUSE_ENABLE_24G,mouse_24g_mode_setup_error // call p_mouse_device_pair_led_config - jam 0xa2,mem_24g_txbuf_temp + jam 0xa2,mem_24g_txbuf_temp+1 call p_g24_txbuf_data_print call mouse_wakeup_from_power_check // wake from hibernate :enble user branch mouse_24g_reconn_dongle_start,user @@ -1309,7 +1309,7 @@ beq 10,p_mouse_digital_display_tube_updata+5 pincrease 1 mul32 pdata,10,pdata - store 1,mem_24g_txbuf_temp + store 1,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print p_mouse_led_multi_timer: @@ -1398,13 +1398,13 @@ // jam ON,mem_mouse_multi_led_blink_enable // rtn p_mouse_device_24g_poweron_led_config: - jam 0xd1,mem_24g_txbuf_temp + jam 0xd1,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print_next p_mouse_device_bt1_poweron_led_config: - jam 0xd2,mem_24g_txbuf_temp + jam 0xd2,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print_next p_mouse_device_bt2_poweron_led_config: - jam 0xd3,mem_24g_txbuf_temp + jam 0xd3,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print_next p_mouse_device_pair_led_config: //24g pair led config @@ -1420,12 +1420,12 @@ branch p_mouse_device_multi_led_on p_mouse_device_discovery_bt2_led_config: - jam 0xc1,mem_24g_txbuf_temp + jam 0xc1,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print p_mouse_device_discovery_led_config: //ble discovery led config fetch 1,mem_device_flag beq MODE_BT_DEVICE2,p_mouse_device_discovery_bt2_led_config - jam 0xb1,mem_24g_txbuf_temp + jam 0xb1,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print // fetch 1,mem_mouse_led_new_interface_enable // rtn blank @@ -1433,12 +1433,12 @@ // branch p_mouse_multi_led_blink_enable p_mouse_device_le_reconn_bt2_led_config: - jam 0xc2,mem_24g_txbuf_temp + jam 0xc2,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print p_mouse_device_le_reconn_led_config: //le recon led config fetch 1,mem_device_flag beq MODE_BT_DEVICE2,p_mouse_device_le_reconn_bt2_led_config - jam 0xb2,mem_24g_txbuf_temp + jam 0xb2,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print // fetch 1,mem_mouse_led_new_interface_enable // rtn blank @@ -1745,7 +1745,7 @@ ////////////////////////////////////////////////sensor init end//////////////////////////////////////////// p_mouse_setgpio_hibernate: - jam 0xff,mem_24g_txbuf_temp + jam 0xff,mem_24g_txbuf_temp+1 call p_g24_txbuf_data_print_next call mouse_set_sdio_high call clear_wake @@ -1987,7 +1987,7 @@ p_mouse_dpi_num_display: fetch 1,mem_mouse_dpi pincrease 1 - store 1,mem_24g_txbuf_temp + store 1,mem_24g_txbuf_temp+1 branch p_g24_txbuf_data_print // p_mouse_dpi_level6_set: @@ -2256,7 +2256,7 @@ fetch 1,mem_mouse_pb_long_pressed_flag beq 0,g24_stop_24g_mode jam 0,mem_mouse_pb_long_pressed_flag - jam 0xa2,mem_24g_txbuf_temp + jam 0xa2,mem_24g_txbuf_temp+1 call p_g24_txbuf_data_print branch p_mouse_24g_reconn_general_dongle p_g24_pair_timeout_timer: @@ -2326,7 +2326,7 @@ p_mouse_24g_start_pair_mode: - jam 0xa1,mem_24g_txbuf_temp + jam 0xa1,mem_24g_txbuf_temp+1 call p_g24_txbuf_data_print jam 0,mem_24g_reconn_type branch mouse_24g_start_pair_mode @@ -3441,10 +3441,10 @@ // 3. 恢复 UART 功能 call p_device_hardware_init - nop 100 - + // 4. 发送真正命令，只发一次 - arg 1,loopcnt + jam 0x8a,mem_24g_txbuf_temp + arg 2,loopcnt arg mem_24g_txbuf_temp,regc branch log_bytes