Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/HaiQi_Project/T225/output/eeprom.dat (revision 4466) +++ /YC1308AC/branch/mouse_project/HaiQi_Project/T225/output/eeprom.dat (working copy) @@ -63,15 +63,15 @@ c0 63 82 -1c +1a c0 64 82 -25 +23 c0 65 02 -5d +5b c0 66 00 @@ -99,7 +99,7 @@ c0 6b 02 -81 +7f c0 6c 83 @@ -275,7 +275,7 @@ 20 3a 02 -1c +1a 1f e2 26 @@ -307,7 +307,7 @@ 20 3a 02 -1c +1a c2 00 00 @@ -1587,7 +1587,7 @@ 24 34 02 -67 +65 20 40 01 @@ -1683,7 +1683,7 @@ 20 40 02 -11 +0f 6f e0 cc @@ -1715,7 +1715,7 @@ 20 40 01 -f9 +f7 20 40 01 @@ -1795,7 +1795,7 @@ 20 40 01 -f6 +f4 20 40 40 @@ -1871,7 +1871,7 @@ 20 42 81 -f3 +f1 c0 00 84 @@ -1927,7 +1927,7 @@ 20 3a 01 -eb +e9 20 20 04 @@ -1956,14 +1956,6 @@ 4f 7e 00 -6f -e0 -cb -c0 -67 -e0 -cf -7b 20 20 04 @@ -2003,7 +1995,7 @@ 20 40 01 -ef +ed 70 4c a0 @@ -2059,7 +2051,7 @@ c0 7f 82 -0e +0c 20 40 41 @@ -2075,7 +2067,7 @@ 20 20 02 -06 +04 6f e0 cb @@ -2119,7 +2111,7 @@ 20 20 02 -03 +01 6f e0 cb @@ -2127,7 +2119,7 @@ 24 5a 02 -15 +13 70 4b e1 @@ -2247,7 +2239,7 @@ 20 40 02 -5d +5b 20 40 04 @@ -2275,19 +2267,19 @@ 20 40 02 -3b +39 20 40 02 -3f +3d 20 40 02 -4c +4a 20 20 02 -53 +51 6f e0 c9 @@ -2351,7 +2343,7 @@ c2 00 02 -43 +41 20 60 00 @@ -2471,7 +2463,7 @@ 20 5a 02 -73 +71 6f e0 c8 @@ -2503,7 +2495,7 @@ 24 5a 02 -25 +23 6f e4 48 @@ -2575,7 +2567,7 @@ c0 00 82 -9b +99 c0 1e 02 @@ -2599,7 +2591,7 @@ c0 0a 02 -99 +97 c0 22 02 @@ -2667,7 +2659,7 @@ 20 40 02 -9e +9c 20 20 43 @@ -2679,7 +2671,7 @@ 20 40 02 -9e +9c 20 20 43 @@ -2698,11 +2690,19 @@ 04 70 4c +41 +00 +70 +4c 4d 00 70 4c -43 +45 +00 +70 +4c +47 00 20 20 @@ -2843,7 +2843,7 @@ 20 40 02 -9e +9c 20 40 48 @@ -2875,7 +2875,7 @@ 20 40 02 -9e +9c 20 40 45 @@ -3047,7 +3047,7 @@ 20 20 02 -6c +6a 70 48 8b @@ -5591,11 +5591,11 @@ c2 94 81 -f9 +f7 c2 9b 81 -f9 +f7 20 60 00 @@ -5744,8 +5744,8 @@ 20 26 f6 -ad -67 +29 +78 aa 55 40 @@ -5887,7 +5887,7 @@ 4b 04 09 -4a +5a 00 00 14 @@ -7791,25 +7791,25 @@ 50 20 73 +aa +55 +05 +00 +f0 +4b +02 +40 +00 +85 +1e 55 aa aa 55 -74 -e7 -8b -42 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +a8 +ea +f7 +fb ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -fc -b4 +e6 +10 Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/HaiQi_Project/T225/output/program.lis (revision 4466) +++ /YC1308AC/branch/mouse_project/HaiQi_Project/T225/output/program.lis (working copy) @@ -14,16 +14,16 @@ 000b c0570104 beq patch15_6 ,p_app_init 000c c0618331 beq patch18_3 ,p_mouse_start_work 000d c062005c beq patch18_4 ,p_mouse_start_reconnect_device -000e c063821c beq patch18_7 ,p_mouse_app_enter_hibernate -000f c0648225 beq patch19_1 ,p_mouse_setgpio_hibernate -0010 c065025d beq patch19_2 ,p_mouse_lpm_before_common +000e c063821a beq patch18_7 ,p_mouse_app_enter_hibernate +000f c0648223 beq patch19_1 ,p_mouse_setgpio_hibernate +0010 c065025b beq patch19_2 ,p_mouse_lpm_before_common 0011 c06600ea beq patch19_4 ,p_mouse_adc_read_start 0012 c0670506 beq patch19_6 ,p_mouse_motion 0013 c0678589 beq patch19_7 ,p_mouse_dpi_process 0014 c0680353 beq patch1a_0 ,p_mouse_seting_dpi 0015 c0688536 beq patch1a_1 ,p_mouse_check_key_gpio 0016 c06a051c beq patch1a_4 ,p_mouse_sensor_poweron -0017 c06b0281 beq patch1a_6 ,p_mouse_priority_bb_event +0017 c06b027f beq patch1a_6 ,p_mouse_priority_bb_event 0018 c06c83a7 beq patch1b_1 ,p_mouse_bb_event_timer 0019 c06d047d beq patch1b_2 ,p_mouse_start_discovery 001a c06d848a beq patch1b_3 ,p_mouse_stop_discovery @@ -73,7 +73,7 @@ 0040 684a009f fetcht 4 ,mem_gpio_wakeup_low 0041 98417e00 iand temp ,pdata 0042 9842fe00 ixor temp ,pdata -0043 203a021c branch p_mouse_app_enter_hibernate ,blank +0043 203a021a branch p_mouse_app_enter_hibernate ,blank 0044 1fe22600 copy pdata ,regc 0045 20200046 branch p_lpm_check_wakeup_io_release @@ -83,7 +83,7 @@ 0048 684a009f fetcht 4 ,mem_gpio_wakeup_low 0049 98417e00 iand temp ,pdata 004a 9842fe00 ixor temp ,pdata -004b 203a021c branch p_mouse_app_enter_hibernate ,blank +004b 203a021a branch p_mouse_app_enter_hibernate ,blank 004c c2000047 loop p_lpm_check_wakeup_io_release + 1 004d 6fe0cf82 fetch 1 ,mem_mouse_long_sleep_flag 004e c1008000 rtneq g24_long_sleep_flag @@ -505,7 +505,7 @@ p_g24_transmit_no_interrupt: 018a 20402631 call g24_txdata_prep -018b 24340267 nbranch p_g24_nodata_transmit ,user +018b 24340265 nbranch p_g24_nodata_transmit ,user p_g24_transmit_start: 018c 2040019a call p_g24_transmit_process @@ -537,7 +537,7 @@ 01a0 242c01a9 nbranch p_g24_retransmit ,sync 01a1 243781a9 nbranch p_g24_retransmit ,user3 01a2 20402672 call g24_ackpayload_parse -01a3 20400211 call p_mouse_wakeup_24g +01a3 2040020f call p_mouse_wakeup_24g 01a4 6fe0cca0 fetch 1 ,mem_mouse_24g_reconnect_led_count 01a5 245a01a7 ncall p_mem_mouse_24g_reconnect_led_off ,blank 01a6 20202651 branch g24_transmit_no_ack @@ -549,7 +549,7 @@ p_g24_retransmit: 01a9 6fe0cac5 fetch 1 ,mem_mouse_need_soft_reset 01aa 247a0000 nrtn blank -01ab 204001f9 call p_mouse_select_device_by_pb_button +01ab 204001f7 call p_mouse_select_device_by_pb_button 01ac 204001bc call p_mouse_g24_retransmit_100ms_timer 01ad 6fe0c8a7 fetch 1 ,mem_24g_abort_pac 01ae 247a0000 nrtn blank @@ -573,7 +573,7 @@ 01bc d8e0000c arg 12 ,queue 01bd 20407d74 call timer_check 01be 247a0000 nrtn blank -01bf 204001f6 call p_mouse_dpi_check_once +01bf 204001f4 call p_mouse_dpi_check_once 01c0 2040407c call mouse_dpi_key_check_long_press 01c1 204003c4 call p_mouse_bt_discovery_check 01c2 204001c6 call p_mouse_24g_recon_led @@ -596,7 +596,7 @@ 01cf 1fe0fe01 increase 1 ,pdata 01d0 67e0cca0 store 1 ,mem_mouse_24g_reconnect_led_count 01d1 1fe67c09 sub pdata ,0x09 ,null -01d2 204281f3 call p_mouse_24g_reconnect_led_count_clean ,zero +01d2 204281f1 call p_mouse_24g_reconnect_led_count_clean ,zero 01d3 c000842a beq 1 ,p_mouse_device_multi_led_on + 1 01d4 c0030436 beq 6 ,p_mouse_device_multi_led_off + 1 01d5 20600000 rtn @@ -614,7 +614,7 @@ 01dd 67e0cf7d store 1 ,mem_bt_connected_successfully_blink_timer 01de 205a0435 call p_mouse_device_multi_led_off ,blank 01df 6fe0cf7d fetch 1 ,mem_bt_connected_successfully_blink_timer -01e0 203a01eb branch p_mouse_bt_connected_successfully_led_count_clean ,blank +01e0 203a01e9 branch p_mouse_bt_connected_successfully_led_count_clean ,blank 01e1 20200429 branch p_mouse_device_multi_led_on p_mouse_bt_connected_successfully_led_on_1s: @@ -624,251 +624,251 @@ 01e5 67e0cf7b store 1 ,mem_mouse_poweron_led_timer 01e6 243a042a nbranch p_mouse_device_multi_led_on + 1 ,blank 01e7 704f7e00 jam 0 ,mem_bt_connected_successfully_flag -01e8 6fe0cbc0 fetch 1 ,mem_mouse_device_poweron_timer_count_init -01e9 67e0cf7b store 1 ,mem_mouse_poweron_led_timer -01ea 20200436 branch p_mouse_device_multi_led_off + 1 +01e8 20200436 branch p_mouse_device_multi_led_off + 1 p_mouse_bt_connected_successfully_led_count_clean: -01eb 6fe0cf7c fetch 1 ,mem_bt_connected_successfully_blink_count -01ec 1fe0ffff increase -1 ,pdata -01ed 67e0cf7c store 1 ,mem_bt_connected_successfully_blink_count -01ee 20600000 rtn +01e9 6fe0cf7c fetch 1 ,mem_bt_connected_successfully_blink_count +01ea 1fe0ffff increase -1 ,pdata +01eb 67e0cf7c store 1 ,mem_bt_connected_successfully_blink_count +01ec 20600000 rtn p_mouse_24g_reconnect_led_blink_count_add: -01ef 6fe0cca1 fetch 1 ,mem_mouse_24g_reconnect_led_blink_count -01f0 1fe0fe01 increase 1 ,pdata -01f1 67e0cca1 store 1 ,mem_mouse_24g_reconnect_led_blink_count -01f2 20600000 rtn +01ed 6fe0cca1 fetch 1 ,mem_mouse_24g_reconnect_led_blink_count +01ee 1fe0fe01 increase 1 ,pdata +01ef 67e0cca1 store 1 ,mem_mouse_24g_reconnect_led_blink_count +01f0 20600000 rtn p_mouse_24g_reconnect_led_count_clean: -01f3 204001ef call p_mouse_24g_reconnect_led_blink_count_add -01f4 704ca000 jam 0 ,mem_mouse_24g_reconnect_led_count -01f5 20600000 rtn +01f1 204001ed call p_mouse_24g_reconnect_led_blink_count_add +01f2 704ca000 jam 0 ,mem_mouse_24g_reconnect_led_count +01f3 20600000 rtn p_mouse_dpi_check_once: -01f6 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -01f7 c4140000 rtnbit0 mouse_enable_select_device_by_dpi_button -01f8 20200577 branch p_mouse_dpi_check +01f4 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +01f5 c4140000 rtnbit0 mouse_enable_select_device_by_dpi_button +01f6 20200577 branch p_mouse_dpi_check p_mouse_select_device_by_pb_button: -01f9 6fe0c91b fetch 1 ,mem_config_select_device_button_gpio -01fa c17f8000 rtneq gpio_disable -01fb da200000 arg 0 ,rega -01fc 704b9606 jam mouse_pb_key ,mem_mouse_key_temp -01fd 6848c91b fetcht 1 ,mem_config_select_device_button_gpio -01fe 2040466a call mouse_pb_button_check -01ff 67e0cb94 store 1 ,mem_mouse_pbkey_press_status -0200 6fe0c910 fetch 1 ,mem_matrix_public_gpio -0201 c07f820e beq gpio_disable ,p_mouse_3io6key_pb_button_check_end -0202 20404168 call mouse_matrix_public_gpio_reset +01f7 6fe0c91b fetch 1 ,mem_config_select_device_button_gpio +01f8 c17f8000 rtneq gpio_disable +01f9 da200000 arg 0 ,rega +01fa 704b9606 jam mouse_pb_key ,mem_mouse_key_temp +01fb 6848c91b fetcht 1 ,mem_config_select_device_button_gpio +01fc 2040466a call mouse_pb_button_check +01fd 67e0cb94 store 1 ,mem_mouse_pbkey_press_status +01fe 6fe0c910 fetch 1 ,mem_matrix_public_gpio +01ff c07f820c beq gpio_disable ,p_mouse_3io6key_pb_button_check_end +0200 20404168 call mouse_matrix_public_gpio_reset p_mouse_select_device_by_pb_button_exit: -0203 1a227e00 copy rega ,pdata -0204 c283468d bbit1 mouse_pb_key ,mouse_select_device_button_down + 2 -0205 20200206 branch p_mouse_select_device_button_up +0201 1a227e00 copy rega ,pdata +0202 c283468d bbit1 mouse_pb_key ,mouse_select_device_button_down + 2 +0203 20200204 branch p_mouse_select_device_button_up p_mouse_select_device_button_up: -0206 6fe0cb9e fetch 1 ,mem_select_device_button_statue -0207 c1000000 rtneq pb_button_state_up -0208 704b9e00 jam pb_button_state_up ,mem_select_device_button_statue -0209 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -020a c39a0000 rtnbit1 mouse_enable_pb_button_short_press_enter_discovery -020b 6fe0cb9b fetch 1 ,mem_bt_discovery_count -020c 1fe67c0a sub pdata ,10 ,null -020d 20204687 branch mouse_select_device_button_up_next +0204 6fe0cb9e fetch 1 ,mem_select_device_button_statue +0205 c1000000 rtneq pb_button_state_up +0206 704b9e00 jam pb_button_state_up ,mem_select_device_button_statue +0207 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0208 c39a0000 rtnbit1 mouse_enable_pb_button_short_press_enter_discovery +0209 6fe0cb9b fetch 1 ,mem_bt_discovery_count +020a 1fe67c0a sub pdata ,10 ,null +020b 20204687 branch mouse_select_device_button_up_next p_mouse_3io6key_pb_button_check_end: -020e 6848c91b fetcht 1 ,mem_config_select_device_button_gpio -020f 20403f56 call mouse_gpio_config_input_pu -0210 20200203 branch p_mouse_select_device_by_pb_button_exit +020c 6848c91b fetcht 1 ,mem_config_select_device_button_gpio +020d 20403f56 call mouse_gpio_config_input_pu +020e 20200201 branch p_mouse_select_device_by_pb_button_exit p_mouse_wakeup_24g: -0211 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag -0212 245a0215 ncall p_mouse_wakeup_24g_from_long_sleep ,blank -0213 704be100 jam 0 ,mem_sensor_shutdown_flag -0214 20600000 rtn +020f 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag +0210 245a0213 ncall p_mouse_wakeup_24g_from_long_sleep ,blank +0211 704be100 jam 0 ,mem_sensor_shutdown_flag +0212 20600000 rtn p_mouse_wakeup_24g_from_long_sleep: -0215 204041aa call mouse_init_sensor_wakeup -0216 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0217 c41e0000 rtnbit0 mouse_enable_wheel_wake_up_cancel +0213 204041aa call mouse_init_sensor_wakeup +0214 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0215 c41e0000 rtnbit0 mouse_enable_wheel_wake_up_cancel p_mouse_wheel_set_wakeup: -0218 6848c913 fetcht 1 ,mem_whee_a_data_gpio -0219 20403f56 call mouse_gpio_config_input_pu -021a 6848c914 fetcht 1 ,mem_whee_b_data_gpio -021b 20203f56 branch mouse_gpio_config_input_pu +0216 6848c913 fetcht 1 ,mem_whee_a_data_gpio +0217 20403f56 call mouse_gpio_config_input_pu +0218 6848c914 fetcht 1 ,mem_whee_b_data_gpio +0219 20203f56 branch mouse_gpio_config_input_pu p_mouse_app_enter_hibernate: -021c 704f8202 jam normal_hibernate ,mem_mouse_long_sleep_flag -021d 5fffffff setarg -1 -021e 67e4485c store 8 ,mem_24g_enter_hibernate -021f 58000006 setarg pan_reg_config -0220 20405b0d call twspi_read -0221 c28182f8 bbit1 3 ,p_mouse_24g_hibernate_set + 10 -0222 20400526 call p_mouse_sensor_reset -0223 2040052d call p_mouse_sensor_powerdown -0224 202002f8 branch p_mouse_24g_hibernate_set + 10 +021a 704f8202 jam normal_hibernate ,mem_mouse_long_sleep_flag +021b 5fffffff setarg -1 +021c 67e4485c store 8 ,mem_24g_enter_hibernate +021d 58000006 setarg pan_reg_config +021e 20405b0d call twspi_read +021f c28182f8 bbit1 3 ,p_mouse_24g_hibernate_set + 10 +0220 20400526 call p_mouse_sensor_reset +0221 2040052d call p_mouse_sensor_powerdown +0222 202002f8 branch p_mouse_24g_hibernate_set + 10 p_mouse_setgpio_hibernate: -0225 204042e9 call mouse_set_sdio_high -0226 20407fdc call clear_wake -0227 20400456 call p_mouse_logo_led_off -0228 204003a5 call p_mouse_low_voltage_led_off -0229 20404015 call mouse_before_hibernate_wheel_gpio_set +0223 204042e9 call mouse_set_sdio_high +0224 20407fdc call clear_wake +0225 20400456 call p_mouse_logo_led_off +0226 204003a5 call p_mouse_low_voltage_led_off +0227 20404015 call mouse_before_hibernate_wheel_gpio_set +0228 6848c910 fetcht 1 ,mem_matrix_public_gpio +0229 20406069 call gpio_out_active 022a 6848c910 fetcht 1 ,mem_matrix_public_gpio -022b 20406069 call gpio_out_active -022c 6848c910 fetcht 1 ,mem_matrix_public_gpio -022d 20406042 call gpio_clr_wake -022e 6fe0c920 fetch 1 ,mem_mouse_sensor_sdio_gpio -022f 20400568 call p_mouse_gpio_config_output_high -0230 2040025d call p_mouse_lpm_before_common -0231 20400443 call p_mouse_1io2led_all_off -0232 6fe0cc48 fetch 1 ,mem_mouse_1io2led_multi_24gled -0233 d84000c0 arg gpcfg_no_ie ,temp -0234 20406093 call gpio_config_function_int -0235 d8400013 arg 19 ,temp -0236 20403f56 call mouse_gpio_config_input_pu -0237 2040023b call p_mouse_device_switch_gpio_high_impedance -0238 2040023f call p_mouse_gpio_set_high_impedance -0239 2040024c call p_mouse_adc_gpio_set_before_hibernate -023a 20200253 branch p_mouse_wheel_gpio_set_before_hibernate +022b 20406042 call gpio_clr_wake +022c 6fe0c920 fetch 1 ,mem_mouse_sensor_sdio_gpio +022d 20400568 call p_mouse_gpio_config_output_high +022e 2040025b call p_mouse_lpm_before_common +022f 20400443 call p_mouse_1io2led_all_off +0230 6fe0cc48 fetch 1 ,mem_mouse_1io2led_multi_24gled +0231 d84000c0 arg gpcfg_no_ie ,temp +0232 20406093 call gpio_config_function_int +0233 d8400013 arg 19 ,temp +0234 20403f56 call mouse_gpio_config_input_pu +0235 20400239 call p_mouse_device_switch_gpio_high_impedance +0236 2040023d call p_mouse_gpio_set_high_impedance +0237 2040024a call p_mouse_adc_gpio_set_before_hibernate +0238 20200251 branch p_mouse_wheel_gpio_set_before_hibernate p_mouse_device_switch_gpio_high_impedance: -023b 6fe0c91e fetch 1 ,mem_device_switch_gpio -023c c17f8000 rtneq 0xff -023d 6848c91e fetcht 1 ,mem_device_switch_gpio -023e 2020607f branch gpio_set_high_impedance +0239 6fe0c91e fetch 1 ,mem_device_switch_gpio +023a c17f8000 rtneq 0xff +023b 6848c91e fetcht 1 ,mem_device_switch_gpio +023c 2020607f branch gpio_set_high_impedance p_mouse_gpio_set_high_impedance: -023f 6fe1cbde fetch 3 ,mem_mouse_set_high_impedance_bit_set -0240 67e1895c store 3 ,mem_pdatatemp -0241 df200014 arg 20 ,loopcnt -0242 d8400000 arg 0 ,temp +023d 6fe1cbde fetch 3 ,mem_mouse_set_high_impedance_bit_set +023e 67e1895c store 3 ,mem_pdatatemp +023f df200014 arg 20 ,loopcnt +0240 d8400000 arg 0 ,temp p_mouse_gpio_set_high_impedance_bit_loop: -0243 6fe1895c fetch 3 ,mem_pdatatemp -0244 2feffe00 isolate1 0 ,pdata -0245 2040e07f call gpio_set_high_impedance ,true -0246 6fe1895c fetch 3 ,mem_pdatatemp -0247 1fe37e00 rshift pdata ,pdata -0248 67e1895c store 3 ,mem_pdatatemp -0249 18408401 increase 1 ,temp -024a c2000243 loop p_mouse_gpio_set_high_impedance_bit_loop -024b 20600000 rtn +0241 6fe1895c fetch 3 ,mem_pdatatemp +0242 2feffe00 isolate1 0 ,pdata +0243 2040e07f call gpio_set_high_impedance ,true +0244 6fe1895c fetch 3 ,mem_pdatatemp +0245 1fe37e00 rshift pdata ,pdata +0246 67e1895c store 3 ,mem_pdatatemp +0247 18408401 increase 1 ,temp +0248 c2000241 loop p_mouse_gpio_set_high_impedance_bit_loop +0249 20600000 rtn p_mouse_adc_gpio_set_before_hibernate: -024c 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -024d c40a0000 rtnbit0 mouse_enable_adc -024e 6fe0c8fd fetch 1 ,mem_adc_config_flag_init -024f c1810000 rtnne adc_config_gpio -0250 6fe0c8fc fetch 1 ,mem_adc_channel_gpio -0251 d84000c0 arg gpcfg_no_ie ,temp -0252 20206093 branch gpio_config_function_int +024a 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +024b c40a0000 rtnbit0 mouse_enable_adc +024c 6fe0c8fd fetch 1 ,mem_adc_config_flag_init +024d c1810000 rtnne adc_config_gpio +024e 6fe0c8fc fetch 1 ,mem_adc_channel_gpio +024f d84000c0 arg gpcfg_no_ie ,temp +0250 20206093 branch gpio_config_function_int p_mouse_wheel_gpio_set_before_hibernate: -0253 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0254 c41e0000 rtnbit0 mouse_enable_wheel_wake_up_cancel +0251 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0252 c41e0000 rtnbit0 mouse_enable_wheel_wake_up_cancel p_mouse_wheel_clr_wakeup: -0255 6848c913 fetcht 1 ,mem_whee_a_data_gpio +0253 6848c913 fetcht 1 ,mem_whee_a_data_gpio +0254 20406042 call gpio_clr_wake +0255 6848c914 fetcht 1 ,mem_whee_b_data_gpio 0256 20406042 call gpio_clr_wake -0257 6848c914 fetcht 1 ,mem_whee_b_data_gpio -0258 20406042 call gpio_clr_wake -0259 6848c913 fetcht 1 ,mem_whee_a_data_gpio -025a 20403f54 call mouse_gpio_config_input_pd -025b 6848c914 fetcht 1 ,mem_whee_b_data_gpio -025c 20203f54 branch mouse_gpio_config_input_pd +0257 6848c913 fetcht 1 ,mem_whee_a_data_gpio +0258 20403f54 call mouse_gpio_config_input_pd +0259 6848c914 fetcht 1 ,mem_whee_b_data_gpio +025a 20203f54 branch mouse_gpio_config_input_pd p_mouse_lpm_before_common: -025d 6848c913 fetcht 1 ,mem_whee_a_data_gpio +025b 6848c913 fetcht 1 ,mem_whee_a_data_gpio +025c 20406050 call gpio_config_input +025d 6848c914 fetcht 1 ,mem_whee_b_data_gpio 025e 20406050 call gpio_config_input -025f 6848c914 fetcht 1 ,mem_whee_b_data_gpio -0260 20406050 call gpio_config_input -0261 20403f88 call mouse_wheel_check -0262 6fe0c91f fetch 1 ,mem_mouse_sensor_sclk_gpio -0263 20400568 call p_mouse_gpio_config_output_high -0264 6848c91e fetcht 1 ,mem_device_switch_gpio -0265 20406042 call gpio_clr_wake -0266 20203e44 branch mouse_lpm_before_common + 4 +025f 20403f88 call mouse_wheel_check +0260 6fe0c91f fetch 1 ,mem_mouse_sensor_sclk_gpio +0261 20400568 call p_mouse_gpio_config_output_high +0262 6848c91e fetcht 1 ,mem_device_switch_gpio +0263 20406042 call gpio_clr_wake +0264 20203e44 branch mouse_lpm_before_common + 4 p_g24_nodata_transmit: -0267 6fe0c8a7 fetch 1 ,mem_24g_abort_pac -0268 205a0273 call p_g24_send_abort_packet ,blank -0269 6fe0c8bd fetch 1 ,mem_24g_transmit_by_interrupt -026a c1008000 rtneq g24_tx_timer_int_enable -026b 2040269f call g24_search_receiver +0265 6fe0c8a7 fetch 1 ,mem_24g_abort_pac +0266 205a0271 call p_g24_send_abort_packet ,blank +0267 6fe0c8bd fetch 1 ,mem_24g_transmit_by_interrupt +0268 c1008000 rtneq g24_tx_timer_int_enable +0269 2040269f call g24_search_receiver p_g24_long_sleep: -026c 204004f9 call p_g24_lpm_wait -026d 24740000 nrtn user -026e 204026c4 call g24_setgpio_lpm_before -026f 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag -0270 245a0225 ncall p_mouse_setgpio_hibernate ,blank -0271 6fe4485c fetch 8 ,mem_24g_enter_hibernate -0272 202026b8 branch g24_long_sleep2 +026a 204004f9 call p_g24_lpm_wait +026b 24740000 nrtn user +026c 204026c4 call g24_setgpio_lpm_before +026d 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag +026e 245a0223 ncall p_mouse_setgpio_hibernate ,blank +026f 6fe4485c fetch 8 ,mem_24g_enter_hibernate +0270 202026b8 branch g24_long_sleep2 p_g24_send_abort_packet: -0273 70483601 jam type_ms ,mem_24g_data_type -0274 7048a701 jam 1 ,mem_24g_abort_pac -0275 20402642 call g24_transmit_rf_ctrl_clear -0276 67e0c7c6 store 1 ,mem_24g_txbuf -0277 58000000 setarg 0 -0278 67e3c7c7 store 7 ,mem_24g_txbuf + 1 -0279 6fe248a9 fetch 4 ,mem_24g_device_addr -027a 67e247ce store 4 ,mem_24g_txbuf + 8 -027b 7048350c jam 12 ,mem_24g_datalen -027c 6fe0c836 fetch 1 ,mem_24g_data_type -027d 79207e03 set1 bit_abort ,pdata -027e 67e0c836 store 1 ,mem_24g_data_type -027f 20402291 call g24_transmit_prep -0280 2020018c branch p_g24_transmit_start +0271 70483601 jam type_ms ,mem_24g_data_type +0272 7048a701 jam 1 ,mem_24g_abort_pac +0273 20402642 call g24_transmit_rf_ctrl_clear +0274 67e0c7c6 store 1 ,mem_24g_txbuf +0275 58000000 setarg 0 +0276 67e3c7c7 store 7 ,mem_24g_txbuf + 1 +0277 6fe248a9 fetch 4 ,mem_24g_device_addr +0278 67e247ce store 4 ,mem_24g_txbuf + 8 +0279 7048350c jam 12 ,mem_24g_datalen +027a 6fe0c836 fetch 1 ,mem_24g_data_type +027b 79207e03 set1 bit_abort ,pdata +027c 67e0c836 store 1 ,mem_24g_data_type +027d 20402291 call g24_transmit_prep +027e 2020018c branch p_g24_transmit_start p_mouse_priority_bb_event: -0281 1a627e00 copy regc ,pdata -0282 c000829b beq bt_evt_bb_connected ,p_mouse_bb_event_connected -0283 c01e02c8 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success -0284 c01c82c0 beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete -0285 c01d02d9 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail -0286 c01902aa beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt -0287 c00a82a4 beq bt_evt_le_disconnected ,p_mouse_le_bb_disconnected -0288 c00a0299 beq bt_evt_le_connected ,p_mouse_le_bb_event_connected -0289 c02202b1 beq bt_evt_le_parse_conn_param_accepted ,p_mouse_le_parse_conn_param_accepted -028a c02002bb beq bt_evt_le_parse_conn_papa_update_rsp ,p_mouse_le_conn_param_update_rsp_recieved -028b 20204336 branch mouse_priority_bb_event + 2 +027f 1a627e00 copy regc ,pdata +0280 c0008299 beq bt_evt_bb_connected ,p_mouse_bb_event_connected +0281 c01e02c8 beq bt_evt_24g_attempt_success ,p_mouse_24g_attempt_success +0282 c01c82c0 beq bt_evt_24g_pairing_complete ,p_mouse_24g_pairing_complete +0283 c01d02d9 beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail +0284 c01902aa beq bt_evt_le_start_enc ,p_mouse_le_ll_start_encryt +0285 c00a82a4 beq bt_evt_le_disconnected ,p_mouse_le_bb_disconnected +0286 c00a0297 beq bt_evt_le_connected ,p_mouse_le_bb_event_connected +0287 c02202b1 beq bt_evt_le_parse_conn_param_accepted ,p_mouse_le_parse_conn_param_accepted +0288 c02002bb beq bt_evt_le_parse_conn_papa_update_rsp ,p_mouse_le_conn_param_update_rsp_recieved +0289 20204336 branch mouse_priority_bb_event + 2 p_mouse_bb_event_reconn_timeout: p_mouse_bb_event_reconn_failed: -028c 6fe0cac1 fetch 1 ,mem_mouse_bluetooth_fast_conn_flag -028d c07fc2f8 beq 0xff ,mouse_buletooth_fast_conn_end -028e 6fe1478c fetch 2 ,mem_ui_state_map -028f c3860000 rtnbit1 ui_state_btn_down -0290 c3830000 rtnbit1 ui_state_bt_discovery -0291 c3858000 rtnbit1 ui_state_ble_adv -0292 6fe0cf7f fetch 1 ,mem_poweron_flag -0293 203a3e20 branch mouse_app_enter_hibernate ,blank -0294 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0295 c3828000 rtnbit1 mouse_bt_discovery_button_down_flag -0296 c299c553 bbit1 mouse_enable_bt_reconnect_timeout_enter_discovery ,mouse_start_discovery -0297 c297c81f bbit1 mouse_enable_24g_first_auto_pairing ,mouse_24g_first_bb_event_reconn_timeout -0298 20203e20 branch mouse_app_enter_hibernate +028a 6fe0cac1 fetch 1 ,mem_mouse_bluetooth_fast_conn_flag +028b c07fc2f8 beq 0xff ,mouse_buletooth_fast_conn_end +028c 6fe1478c fetch 2 ,mem_ui_state_map +028d c3860000 rtnbit1 ui_state_btn_down +028e c3830000 rtnbit1 ui_state_bt_discovery +028f c3858000 rtnbit1 ui_state_ble_adv +0290 6fe0cf7f fetch 1 ,mem_poweron_flag +0291 203a3e20 branch mouse_app_enter_hibernate ,blank +0292 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0293 c3828000 rtnbit1 mouse_bt_discovery_button_down_flag +0294 c299c553 bbit1 mouse_enable_bt_reconnect_timeout_enter_discovery ,mouse_start_discovery +0295 c297c81f bbit1 mouse_enable_24g_first_auto_pairing ,mouse_24g_first_bb_event_reconn_timeout +0296 20203e20 branch mouse_app_enter_hibernate p_mouse_le_bb_event_connected: -0299 2040029e call p_device_connected_finish_led_config -029a 20204350 branch mouse_le_bb_event_connected +0297 2040029c call p_device_connected_finish_led_config +0298 20204350 branch mouse_le_bb_event_connected p_mouse_bb_event_connected: -029b 20404544 call mouse_no_data_timer_init -029c 2040029e call p_device_connected_finish_led_config -029d 202043fa branch mouse_bb_event_connected +0299 20404544 call mouse_no_data_timer_init +029a 2040029c call p_device_connected_finish_led_config +029b 202043fa branch mouse_bb_event_connected p_device_connected_finish_led_config: -029e 2040051c call p_mouse_sensor_poweron -029f 704f7e01 jam 1 ,mem_bt_connected_successfully_flag -02a0 704f7c04 jam 4 ,mem_bt_connected_successfully_blink_count -02a1 704c4d00 jam 0 ,mem_mouse_multi_led_blink_timer -02a2 704c4300 jam multi_led_on ,mem_mouse_multi_led_type +029c 2040051c call p_mouse_sensor_poweron +029d 704f7e01 jam 1 ,mem_bt_connected_successfully_flag +029e 704f7c04 jam 4 ,mem_bt_connected_successfully_blink_count +029f 704c4100 jam 0 ,mem_mouse_multi_led_blink_enable +02a0 704c4d00 jam 0 ,mem_mouse_multi_led_blink_timer +02a1 704c4500 jam 0 ,mem_mouse_multi_led_poweron_flag +02a2 704c4700 jam 0 ,mem_mouse_multi_led_powon_timer 02a3 20200435 branch p_mouse_device_multi_led_off p_mouse_le_bb_disconnected: @@ -915,7 +915,7 @@ 02c2 20404544 call mouse_no_data_timer_init 02c3 d8e00001 arg mouse_24g_pairing_flag ,queue 02c4 204046f4 call mouse_disable_function_flag -02c5 2040029e call p_device_connected_finish_led_config +02c5 2040029c call p_device_connected_finish_led_config 02c6 204048c9 call mouse_device_poweron_timer_init + 3 02c7 2020485a branch mouse_24g_pairing_complete + 3 @@ -925,7 +925,7 @@ 02ca 67e24891 store 4 ,mem_24g_receiver_addr 02cb 67e24993 store 4 ,mem_mouse_24g_addr 02cc 2040257e call g24_ch_syncword_crc8_init -02cd 2040029e call p_device_connected_finish_led_config +02cd 2040029c call p_device_connected_finish_led_config 02ce 20404544 call mouse_no_data_timer_init 02cf 204042ca call mouse_init_sensor_reset 02d0 704aae00 jam 0 ,mem_mouse_long_mult_flag @@ -978,7 +978,7 @@ 02f5 67e3c8d0 store 7 ,mem_mouse_key 02f6 704be101 jam 1 ,mem_sensor_shutdown_flag 02f7 2040052d call p_mouse_sensor_powerdown -02f8 2020026c branch p_g24_long_sleep +02f8 2020026a branch p_g24_long_sleep p_g24_pair_dispatch: 02f9 70488b00 jam default_24g_device ,mem_24g_reconn_type @@ -1852,8 +1852,8 @@ p_mouse_select_device_check: 0573 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0574 c29481f9 bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button -0575 c29b81f9 bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button +0574 c29481f7 bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button +0575 c29b81f7 bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button 0576 20600000 rtn p_mouse_dpi_check: Index: output/ramcode.rom =================================================================== --- /YC1308AC/branch/mouse_project/HaiQi_Project/T225/output/ramcode.rom (revision 4466) +++ /YC1308AC/branch/mouse_project/HaiQi_Project/T225/output/ramcode.rom (working copy) @@ -12,16 +12,16 @@ c0570104 c0618331 c062005c -c063821c -c0648225 -c065025d +c063821a +c0648223 +c065025b c06600ea c0670506 c0678589 c0680353 c0688536 c06a051c -c06b0281 +c06b027f c06c83a7 c06d047d c06d848a @@ -65,7 +65,7 @@ 684a009f 98417e00 9842fe00 -203a021c +203a021a 1fe22600 20200046 df200032 @@ -73,7 +73,7 @@ 684a009f 98417e00 9842fe00 -203a021c +203a021a c2000047 6fe0cf82 c1008000 @@ -393,7 +393,7 @@ 204022cb 20200171 20402631 -24340267 +24340265 2040019a 204026ee 204000a0 @@ -417,7 +417,7 @@ 242c01a9 243781a9 20402672 -20400211 +2040020f 6fe0cca0 245a01a7 20202651 @@ -425,7 +425,7 @@ 202048c9 6fe0cac5 247a0000 -204001f9 +204001f7 204001bc 6fe0c8a7 247a0000 @@ -445,7 +445,7 @@ d8e0000c 20407d74 247a0000 -204001f6 +204001f4 2040407c 204003c4 204001c6 @@ -464,7 +464,7 @@ 1fe0fe01 67e0cca0 1fe67c09 -204281f3 +204281f1 c000842a c0030436 20600000 @@ -478,7 +478,7 @@ 67e0cf7d 205a0435 6fe0cf7d -203a01eb +203a01e9 20200429 6fe0cf7b 207a0000 @@ -486,8 +486,6 @@ 67e0cf7b 243a042a 704f7e00 -6fe0cbc0 -67e0cf7b 20200436 6fe0cf7c 1fe0ffff @@ -497,7 +495,7 @@ 1fe0fe01 67e0cca1 20600000 -204001ef +204001ed 704ca000 20600000 6fe44bab @@ -511,11 +509,11 @@ 2040466a 67e0cb94 6fe0c910 -c07f820e +c07f820c 20404168 1a227e00 c283468d -20200206 +20200204 6fe0cb9e c1000000 704b9e00 @@ -526,9 +524,9 @@ 20204687 6848c91b 20403f56 -20200203 +20200201 6fe0cbe1 -245a0215 +245a0213 704be100 20600000 204041aa @@ -558,17 +556,17 @@ 20406042 6fe0c920 20400568 -2040025d +2040025b 20400443 6fe0cc48 d84000c0 20406093 d8400013 20403f56 -2040023b -2040023f -2040024c -20200253 +20400239 +2040023d +2040024a +20200251 6fe0c91e c17f8000 6848c91e @@ -584,7 +582,7 @@ 1fe37e00 67e1895c 18408401 -c2000243 +c2000241 20600000 6fe44bab c40a0000 @@ -614,7 +612,7 @@ 20406042 20203e44 6fe0c8a7 -205a0273 +205a0271 6fe0c8bd c1008000 2040269f @@ -622,7 +620,7 @@ 24740000 204026c4 6fe0cbe1 -245a0225 +245a0223 6fe4485c 202026b8 70483601 @@ -640,13 +638,13 @@ 20402291 2020018c 1a627e00 -c000829b +c0008299 c01e02c8 c01c82c0 c01d02d9 c01902aa c00a82a4 -c00a0299 +c00a0297 c02202b1 c02002bb 20204336 @@ -663,16 +661,18 @@ c299c553 c297c81f 20203e20 -2040029e +2040029c 20204350 20404544 -2040029e +2040029c 202043fa 2040051c 704f7e01 704f7c04 +704c4100 704c4d00 -704c4300 +704c4500 +704c4700 20200435 58000000 67e14af2 @@ -707,7 +707,7 @@ 20404544 d8e00001 204046f4 -2040029e +2040029c 204048c9 2020485a 704c9b01 @@ -715,7 +715,7 @@ 67e24891 67e24993 2040257e -2040029e +2040029c 20404544 204042ca 704aae00 @@ -758,7 +758,7 @@ 67e3c8d0 704be101 2040052d -2020026c +2020026a 70488b00 6fe14beb 1fe0fe01 @@ -1394,8 +1394,8 @@ 20400573 20204650 6fe44bab -c29481f9 -c29b81f9 +c29481f7 +c29b81f7 20600000 6fe0c90f c17f8000 Index: output/sched.rom =================================================================== --- /YC1308AC/branch/mouse_project/HaiQi_Project/T225/output/sched.rom (revision 4466) +++ /YC1308AC/branch/mouse_project/HaiQi_Project/T225/output/sched.rom (working copy) @@ -108,7 +108,7 @@ #bit4 MOUSE_ENABLE_ADC #bit5 MOUSE_ENABLE_KEYBOARD #bit6 MOUSE_ENABLE_24G_SEARCH_DONGLE -4a +5a #mouse flag byte4 #bit0 MOUSE_ENABLE_24G_250Hz Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/HaiQi_Project/T225/program/patch.prog (revision 4466) +++ /YC1308AC/branch/mouse_project/HaiQi_Project/T225/program/patch.prog (working copy) @@ -709,8 +709,8 @@ store 1,mem_mouse_poweron_led_timer nbranch p_mouse_device_multi_led_on+1,blank jam 0,mem_bt_connected_successfully_flag - fetch 1,mem_mouse_device_poweron_timer_count_init - store 1,mem_mouse_poweron_led_timer + // fetch 1,mem_mouse_device_poweron_timer_count_init + // store 1,mem_mouse_poweron_led_timer branch p_mouse_device_multi_led_off+1 p_mouse_bt_connected_successfully_led_count_clean: // jam 0,mem_bt_connected_successfully_blink_timer @@ -979,8 +979,10 @@ call p_mouse_sensor_poweron jam 1,mem_bt_connected_successfully_flag jam 4,mem_bt_connected_successfully_blink_count + jam 0,mem_mouse_multi_led_blink_enable jam 0,mem_mouse_multi_led_blink_timer - jam MULTI_LED_ON,mem_mouse_multi_led_type + jam 0,mem_mouse_multi_led_poweron_flag + jam 0,mem_mouse_multi_led_powon_timer branch p_mouse_device_multi_led_off p_mouse_le_bb_disconnected: Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/HaiQi_Project/T225/sched/mouse.dat (revision 4466) +++ /YC1308AC/branch/mouse_project/HaiQi_Project/T225/sched/mouse.dat (working copy) @@ -41,7 +41,7 @@ #bit4 MOUSE_ENABLE_ADC #bit5 MOUSE_ENABLE_KEYBOARD #bit6 MOUSE_ENABLE_24G_SEARCH_DONGLE -4a +5a #mouse flag byte4 #bit0 MOUSE_ENABLE_24G_250Hz