Index: output/eeprom.dat =================================================================== --- /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/output/eeprom.dat (revision 5196) +++ /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/output/eeprom.dat (working copy) @@ -866,32 +866,32 @@ 07 67 e0 -c7 -c9 +cc +fc 6f e0 c9 3d 67 e0 -c7 -ca +cc +fd 6f e0 c9 97 67 e0 -c7 -cb +cc +fe 6f e0 cb 00 67 e0 -c7 cc +ff 20 60 00 @@ -950,16 +950,16 @@ 05 67 e0 -c7 -c9 +cc +fc 6f e0 c9 97 67 e0 -c7 -ca +cc +fd 20 60 00 @@ -1018,16 +1018,16 @@ 06 67 e0 -c7 -c9 +cc +fc 6f e0 cb 00 67 e0 -c7 -ca +cc +fd 20 60 00 @@ -1046,16 +1046,16 @@ 49 67 e0 -c7 -c9 +cc +fc 6f e3 c8 d4 67 e3 -c7 -ca +cc +fd 18 42 72 @@ -1066,8 +1066,8 @@ 00 d8 a0 -47 -d1 +4d +04 20 20 7d @@ -4997,7 +4997,7 @@ 3e 6a 6f -e2 +e4 48 5f 20 @@ -6788,8 +6788,8 @@ 20 3f a5 -18 -21 +f1 +03 aa 55 40 @@ -9394,7 +9394,7 @@ ff ff 67 -e2 +e4 48 5f 58 @@ -9462,7 +9462,7 @@ 42 72 b8 -4d +4f 07 16 20 @@ -9725,5 +9725,5 @@ 00 00 00 -00 -95 +e1 +98 Index: output/flash.dat =================================================================== --- /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/output/flash.dat (revision 5196) +++ /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/output/flash.dat (working copy) @@ -866,32 +866,32 @@ 07 67 e0 -c7 -c9 +cc +fc 6f e0 c9 3d 67 e0 -c7 -ca +cc +fd 6f e0 c9 97 67 e0 -c7 -cb +cc +fe 6f e0 cb 00 67 e0 -c7 cc +ff 20 60 00 @@ -950,16 +950,16 @@ 05 67 e0 -c7 -c9 +cc +fc 6f e0 c9 97 67 e0 -c7 -ca +cc +fd 20 60 00 @@ -1018,16 +1018,16 @@ 06 67 e0 -c7 -c9 +cc +fc 6f e0 cb 00 67 e0 -c7 -ca +cc +fd 20 60 00 @@ -1046,16 +1046,16 @@ 49 67 e0 -c7 -c9 +cc +fc 6f e3 c8 d4 67 e3 -c7 -ca +cc +fd 18 42 72 @@ -1066,8 +1066,8 @@ 00 d8 a0 -47 -d1 +4d +04 20 20 7d @@ -4997,7 +4997,7 @@ 3e 6a 6f -e2 +e4 48 5f 20 @@ -6788,8 +6788,8 @@ 20 3f a5 -18 -21 +f1 +03 aa 55 40 @@ -9394,7 +9394,7 @@ ff ff 67 -e2 +e4 48 5f 58 @@ -9462,7 +9462,7 @@ 42 72 b8 -4d +4f 07 16 20 @@ -9725,5 +9725,5 @@ 00 00 00 -00 -95 +e1 +98 Index: output/program.lis =================================================================== --- /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/output/program.lis (revision 5196) +++ /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/output/program.lis (working copy) @@ -257,13 +257,13 @@ 00d4 70483804 jam 4 ,mem_24g_datalen 00d5 6fe0c839 fetch 1 ,mem_24g_data_type 00d6 79207e07 set1 data_device_info ,pdata -00d7 67e0c7c9 store 1 ,mem_24g_txbuf +00d7 67e0ccfc store 1 ,mem_24g_txbuf_new 00d8 6fe0c93d fetch 1 ,mem_device_flag -00d9 67e0c7ca store 1 ,mem_24g_txbuf + 1 +00d9 67e0ccfd store 1 ,mem_24g_txbuf_new + 1 00da 6fe0c997 fetch 1 ,mem_mouse_dpi -00db 67e0c7cb store 1 ,mem_24g_txbuf + 2 +00db 67e0ccfe store 1 ,mem_24g_txbuf_new + 2 00dc 6fe0cb00 fetch 1 ,mem_le_battery_level_percentage -00dd 67e0c7cc store 1 ,mem_24g_txbuf + 3 +00dd 67e0ccff store 1 ,mem_24g_txbuf_new + 3 00de 20600000 rtn p_g24_send_dpi_info_check: @@ -284,9 +284,9 @@ 00e9 70483802 jam 2 ,mem_24g_datalen 00ea 6fe0c839 fetch 1 ,mem_24g_data_type 00eb 79207e05 set1 data_dpi ,pdata -00ec 67e0c7c9 store 1 ,mem_24g_txbuf +00ec 67e0ccfc store 1 ,mem_24g_txbuf_new 00ed 6fe0c997 fetch 1 ,mem_mouse_dpi -00ee 67e0c7ca store 1 ,mem_24g_txbuf + 1 +00ee 67e0ccfd store 1 ,mem_24g_txbuf_new + 1 00ef 20600000 rtn p_g24_send_battery_info_check: @@ -307,21 +307,21 @@ 00fa 70483802 jam 2 ,mem_24g_datalen 00fb 6fe0c839 fetch 1 ,mem_24g_data_type 00fc 79207e06 set1 data_battery ,pdata -00fd 67e0c7c9 store 1 ,mem_24g_txbuf +00fd 67e0ccfc store 1 ,mem_24g_txbuf_new 00fe 6fe0cb00 fetch 1 ,mem_le_battery_level_percentage -00ff 67e0c7ca store 1 ,mem_24g_txbuf + 1 +00ff 67e0ccfd store 1 ,mem_24g_txbuf_new + 1 0100 20600000 rtn p_g24_send_rf_other_data: 0101 1840fe08 add temp ,8 ,pdata 0102 67e0c838 store 1 ,mem_24g_datalen 0103 20402649 call g24_transmit_rf_ctrl_clear -0104 67e0c7c9 store 1 ,mem_24g_txbuf +0104 67e0ccfc store 1 ,mem_24g_txbuf_new 0105 6fe3c8d4 fetch 7 ,mem_mouse_key -0106 67e3c7ca store 7 ,mem_24g_txbuf + 1 +0106 67e3ccfd store 7 ,mem_24g_txbuf_new + 1 0107 18427200 copy temp ,loopcnt 0108 1a220c00 copy rega ,contr -0109 d8a047d1 arg mem_24g_txbuf + 8 ,contw +0109 d8a04d04 arg mem_24g_txbuf_new + 8 ,contw 010a 20207dd4 branch memcpy p_g24_receive_packet: @@ -1672,7 +1672,7 @@ 04dd 2040028d call p_send_time_long_wake 04de 6fe0cbf2 fetch 1 ,mem_sensor_shutdown_flag 04df 245a3e6a ncall mouse_setgpio_hibernate ,blank -04e0 6fe2485f fetch 4 ,mem_24g_enter_hibernate +04e0 6fe4485f fetch 8 ,mem_24g_enter_hibernate 04e1 202026bf branch g24_long_seep2 p_g24_send_abort_packet: @@ -42817,7 +42817,7 @@ 2002b 7048a900 jam 0 ,mem_24g_attempt_fail_flag 2002c 204002c5 call p_g24_transmit_next_packet 2002d 5fffffff setarg -1 -2002e 67e2485f store 4 ,mem_24g_enter_hibernate +2002e 67e4485f store 8 ,mem_24g_enter_hibernate 2002f 58000000 setarg 0 20030 67e3c8d4 store 7 ,mem_mouse_key 20031 67e0c8ab store 1 ,mem_24g_abort_pac Index: output/ramcode.rom =================================================================== --- /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/output/ramcode.rom (revision 5196) +++ /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/output/ramcode.rom (working copy) @@ -213,13 +213,13 @@ 70483804 6fe0c839 79207e07 -67e0c7c9 +67e0ccfc 6fe0c93d -67e0c7ca +67e0ccfd 6fe0c997 -67e0c7cb +67e0ccfe 6fe0cb00 -67e0c7cc +67e0ccff 20600000 6fe0cde1 203a00e9 @@ -234,9 +234,9 @@ 70483802 6fe0c839 79207e05 -67e0c7c9 +67e0ccfc 6fe0c997 -67e0c7ca +67e0ccfd 20600000 6fe0cde1 203a00fa @@ -251,19 +251,19 @@ 70483802 6fe0c839 79207e06 -67e0c7c9 +67e0ccfc 6fe0cb00 -67e0c7ca +67e0ccfd 20600000 1840fe08 67e0c838 20402649 -67e0c7c9 +67e0ccfc 6fe3c8d4 -67e3c7ca +67e3ccfd 18427200 1a220c00 -d8a047d1 +d8a04d04 20207dd4 6fe0c867 20401637 @@ -1246,7 +1246,7 @@ 2040028d 6fe0cbf2 245a3e6a -6fe2485f +6fe4485f 202026bf 70483901 6fe0cbf2 Index: output/romcode.rom =================================================================== --- /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/output/romcode.rom (revision 5196) +++ /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/output/romcode.rom (working copy) @@ -30650,7 +30650,7 @@ 7048a900 204002c5 5fffffff -67e2485f +67e4485f 58000000 67e3c8d4 67e0c8ab @@ -30778,4 +30778,4 @@ 67e1cc16 202026e8 20600000 -00003e33 +00006cdc Index: program/patch.prog =================================================================== --- /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/program/patch.prog (revision 5196) +++ /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/program/patch.prog (working copy) @@ -298,13 +298,13 @@ jam 4,mem_24g_datalen fetch 1,mem_24g_data_type set1 DATA_DEVICE_INFO,pdata - store 1,mem_24g_txbuf + store 1,mem_24g_txbuf_new fetch 1,mem_device_flag - store 1,mem_24g_txbuf+1 + store 1,mem_24g_txbuf_new+1 fetch 1,mem_mouse_dpi - store 1,mem_24g_txbuf+2 + store 1,mem_24g_txbuf_new+2 fetch 1,mem_le_battery_level_percentage - store 1,mem_24g_txbuf+3 + store 1,mem_24g_txbuf_new+3 rtn /**************************************************************************** @@ -328,9 +328,9 @@ jam 2,mem_24g_datalen fetch 1,mem_24g_data_type set1 DATA_DPI,pdata - store 1,mem_24g_txbuf + store 1,mem_24g_txbuf_new fetch 1,mem_mouse_dpi - store 1,mem_24g_txbuf+1 + store 1,mem_24g_txbuf_new+1 rtn /**************************************************************************** @@ -354,9 +354,9 @@ jam 2,mem_24g_datalen fetch 1,mem_24g_data_type set1 DATA_BATTERY,pdata - store 1,mem_24g_txbuf + store 1,mem_24g_txbuf_new fetch 1,mem_le_battery_level_percentage - store 1,mem_24g_txbuf+1 + store 1,mem_24g_txbuf_new+1 rtn /**************************************************************************** @@ -367,12 +367,12 @@ add temp,8,pdata store 1,mem_24g_datalen call g24_transmit_rf_ctrl_clear - store 1,mem_24g_txbuf + store 1,mem_24g_txbuf_new fetch 7,mem_mouse_key - store 7,mem_24g_txbuf+1 + store 7,mem_24g_txbuf_new+1 copy temp,loopcnt copy rega,contr - arg mem_24g_txbuf+8,contw + arg mem_24g_txbuf_new+8,contw branch memcpy //================RX FIXED===========// @@ -1064,6 +1064,7 @@ store 2,mem_retransmit // call p_delay_40ms branch p_g24_transmit_loop + p_g24_transmit_hop_process: fetcht 1,mem_24g_retry fetch 1,mem_24g_fast_hop_count // 125Hz=30 250Hz=15 @@ -1815,7 +1816,7 @@ call p_send_time_long_wake fetch 1,mem_sensor_shutdown_flag ncall mouse_setgpio_hibernate,blank - fetch 4,mem_24g_enter_hibernate + fetch 8,mem_24g_enter_hibernate branch g24_long_seep2 p_g24_send_abort_packet: @@ -2830,18 +2831,18 @@ store 1,mem_mouse_search_dongle_ch sub pdata,G24_CH_NUMBER,null nbranch p_mouse_24g_search_dongle_loop_end,positive - call g24_reconn_data_prep + call p_g24_reconn_data_prep call p_g24_transmit_receive_ack nbranch p_mouse_24g_search_dongle_loop_retry,sync nbranch p_mouse_24g_search_dongle_loop_retry,user3 call p_mouse_24g_search_dongle_success p_mouse_24g_search_dongle_loop_end: - call g24_txbuf_clear + call p_g24_txbuf_clear fetch 1,mem_mouse_search_dongle_count increase 1,pdata store 1,mem_mouse_search_dongle_count beq G24_CH_POLL_COUNT,p_mouse_24g_search_dongle_check - rtn + rtn p_mouse_24g_search_dongle_loop_retry: call g24_ch Index: program/z.prog =================================================================== --- /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/program/z.prog (revision 5196) +++ /YC1308AF/branch/mouse/USB_4Mode_Project/RongYuan_Project/mouse_public_3mode_usb/program/z.prog (working copy) @@ -143,7 +143,7 @@ jam 0,mem_24g_attempt_fail_flag call p_g24_transmit_next_packet setarg -1 - store 4,mem_24g_enter_hibernate + store 8,mem_24g_enter_hibernate setarg 0 store 7,mem_mouse_key store 1,mem_24g_abort_pac