Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/output/eeprom.dat (revision 481) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/output/eeprom.dat (working copy) @@ -2,48 +2,52 @@ 02 aa 55 -da +ee 03 c2 84 00 -0b +0c c0 00 00 -0d +0e c0 45 80 -11 +12 c0 57 00 -1c +1d c0 64 80 -5a +5b c0 65 00 -62 +63 c0 67 00 -89 +8a c0 68 00 -bb +bc c0 69 80 -df +dc +c0 +6a +00 +e6 c0 6b 00 -67 +68 20 20 13 @@ -51,7 +55,7 @@ c0 75 00 -4b +4c 20 20 13 @@ -129,15 +133,15 @@ 41 a7 20 -40 -40 -8e -20 75 80 00 20 40 +00 +be +20 +40 3d 8a 20 @@ -147,7 +151,7 @@ 20 40 00 -2c +2d 20 40 42 @@ -175,7 +179,7 @@ c0 00 00 -7b +7c 20 20 3d @@ -183,7 +187,7 @@ 58 00 00 -2f +30 67 e1 48 @@ -211,7 +215,7 @@ c3 0a 80 -36 +37 6f e0 cb @@ -231,7 +235,7 @@ c2 80 80 -45 +46 68 48 c7 @@ -327,7 +331,7 @@ 24 3a 00 -55 +56 6f e4 48 @@ -423,7 +427,7 @@ c0 1d 00 -6a +6b 20 20 43 @@ -443,7 +447,7 @@ c0 01 80 -6f +70 20 20 48 @@ -451,7 +455,7 @@ 20 40 00 -72 +73 20 34 48 @@ -491,7 +495,7 @@ c2 00 00 -76 +77 20 60 00 @@ -571,7 +575,7 @@ 20 40 00 -8f +90 20 20 3f @@ -595,7 +599,7 @@ 24 21 00 -95 +96 20 60 00 @@ -611,7 +615,7 @@ 20 40 00 -a8 +a9 6f e0 c8 @@ -619,11 +623,11 @@ c2 83 80 -9d +9e 20 40 00 -b0 +b1 67 e0 c8 @@ -635,7 +639,7 @@ 20 40 00 -a0 +a1 67 e0 c8 @@ -659,7 +663,7 @@ 20 40 00 -b0 +b1 1f e2 04 @@ -683,11 +687,11 @@ c2 83 80 -ad +ae 20 40 00 -b0 +b1 67 e0 c8 @@ -699,7 +703,7 @@ 20 40 00 -a0 +a1 67 e0 c8 @@ -739,7 +743,7 @@ 24 21 00 -b9 +ba 20 60 00 @@ -752,6 +756,14 @@ 60 00 00 +20 +40 +40 +8f +20 +40 +48 +e1 6f e0 c9 @@ -759,31 +771,15 @@ c0 06 00 -d0 +cf c0 01 80 -c1 -20 -40 -40 -8f -20 -40 -48 -e1 +c2 20 20 40 98 -20 -40 -46 -ee -20 -40 -48 -e1 6f e0 c9 @@ -791,19 +787,19 @@ c0 00 00 -ca +c9 c0 00 80 -c8 +c7 c0 01 00 -cc +cb c0 01 80 -ce +cd 6f e0 c9 @@ -836,14 +832,6 @@ 20 40 c7 -20 -40 -46 -ee -20 -40 -48 -e1 6f e0 c9 @@ -851,19 +839,19 @@ c0 00 00 -d9 +d6 c0 00 80 -d7 +d4 c0 01 00 -db +d8 c0 01 80 -dd +da 68 48 cc @@ -915,7 +903,7 @@ c0 18 00 -e9 +eb c0 18 c2 @@ -935,7 +923,27 @@ 20 20 00 -e2 +df +20 +40 +3f +65 +20 +40 +42 +32 +da +60 +4a +a3 +20 +40 +42 +2b +20 +20 +00 +be 6f e0 c9 @@ -943,11 +951,15 @@ c0 2d 00 -ef +f4 c0 29 00 -ed +f0 +c0 +01 +00 +f2 20 20 41 @@ -957,9 +969,17 @@ 27 0c 20 -60 -00 -00 +20 +46 +ee +20 +40 +46 +ee +20 +20 +41 +ea 70 49 27 @@ -986,10 +1006,10 @@ 2b 20 20 -40 -8e -ea -ce +00 +be +41 +cc aa 55 40 @@ -1022,7 +1042,7 @@ 00 00 46 -49 +59 00 00 00 @@ -1188,7 +1208,7 @@ ff ff 03 -00 +03 00 aa 55 @@ -1772,10 +1792,10 @@ 00 09 4c -70 -70 -40 -60 +07 +07 +04 +06 aa 55 5a @@ -2196,10 +2216,10 @@ aa aa 55 -f7 -68 -1e +a2 +67 5a +77 ff ff ff @@ -8168,25 +8188,5 @@ ff ff ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -b7 -05 +60 +ca Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/output/program.lis (revision 481) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/output/program.lis (working copy) @@ -1,351 +1,362 @@ include "bt_format " org 0x0000 -0000 c284000b bbit1 8 ,pf_patch_ext -0001 c000000d beq patch00_0 ,p_soft_reset -0002 c0458011 beq patch11_3 ,p_initialize_radio_cont -0003 c057001c beq patch15_6 ,p_app_init -0004 c064805a beq patch19_1 ,p_mouse_setgpio_hibernate -0005 c0650062 beq patch19_2 ,p_mouse_lpm_before_common -0006 c0670089 beq patch19_6 ,p_mouse_motion -0007 c06800bb beq patch1a_0 ,p_mouse_seting_dpi -0008 c06980df beq patch1a_3 ,p_mouse_init_sunt -0009 c06b0067 beq patch1a_6 ,p_mouse_priority_bb_event -000a 2020137c branch loop +0000 c284000c bbit1 8 ,pf_patch_ext +0001 c000000e beq patch00_0 ,p_soft_reset +0002 c0458012 beq patch11_3 ,p_initialize_radio_cont +0003 c057001d beq patch15_6 ,p_app_init +0004 c064805b beq patch19_1 ,p_mouse_setgpio_hibernate +0005 c0650063 beq patch19_2 ,p_mouse_lpm_before_common +0006 c067008a beq patch19_6 ,p_mouse_motion +0007 c06800bc beq patch1a_0 ,p_mouse_seting_dpi +0008 c06980dc beq patch1a_3 ,p_mouse_init_sunt +0009 c06a00e6 beq patch1a_4 ,p_mouse_sensor_poweron +000a c06b0068 beq patch1a_6 ,p_mouse_priority_bb_event +000b 2020137c branch loop pf_patch_ext: -000b c075004b beq patch3d_2 ,p_g24_transmit_no_interrupt -000c 2020137c branch loop +000c c075004c beq patch3d_2 ,p_g24_transmit_no_interrupt +000d 2020137c branch loop p_soft_reset: -000d 20800000 clear_stack -000e 204030f3 call app_param_init -000f 20403bfd call mouse_xtal_init -0010 20200804 branch soft_reset + 3 +000e 20800000 clear_stack +000f 204030f3 call app_param_init +0010 20403bfd call mouse_xtal_init +0011 20200804 branch soft_reset + 3 p_initialize_radio_cont: -0011 708a8be6 jam 0xe6 ,core_syn_aac_cfg1 -0012 2040126a call initialize_syn_afc_cfg1 -0013 20401271 call initialize_rf_ldo_cfg1 -0014 20401277 call initialize_rc_cal -0015 708a6d09 jam 0x09 ,core_rx_bq_cfg0 -0016 708a0305 jam 5 ,core_clkpll_cfg0 -0017 708a7a94 jam 0x94 ,core_rx_iqadc_cfg -0018 708a0e0b jam 0x0b ,core_rf_ldo_cfg2 -0019 708a0f05 jam 0x05 ,core_rf_ldo_cfg3 -001a 708a8390 jam 0x90 ,core_syn_pfd_lkd_cfg -001b 2020125d branch initialize_radio_cont + 8 +0012 708a8be6 jam 0xe6 ,core_syn_aac_cfg1 +0013 2040126a call initialize_syn_afc_cfg1 +0014 20401271 call initialize_rf_ldo_cfg1 +0015 20401277 call initialize_rc_cal +0016 708a6d09 jam 0x09 ,core_rx_bq_cfg0 +0017 708a0305 jam 5 ,core_clkpll_cfg0 +0018 708a7a94 jam 0x94 ,core_rx_iqadc_cfg +0019 708a0e0b jam 0x0b ,core_rf_ldo_cfg2 +001a 708a0f05 jam 0x05 ,core_rf_ldo_cfg3 +001b 708a8390 jam 0x90 ,core_syn_pfd_lkd_cfg +001c 2020125d branch initialize_radio_cont + 8 p_app_init: p_mouse_init: -001c 20406df3 call enable_authrom -001d 20403bf0 call mouse_setting_config -001e 204041a7 call mouse_init_sunt -001f 2040408e call mouse_dpi_config +001d 20406df3 call enable_authrom +001e 20403bf0 call mouse_setting_config +001f 204041a7 call mouse_init_sunt 0020 20758000 rtn wake -0021 20403d8a call mouse_usb_check_enable -0022 20404728 call mouse_drawing_optima_init -0023 2040002c call p_mouse_cb_fuction -0024 2040423c call mouse_sensor_powerdown -0025 6fe0c92a fetch 1 ,mem_usb_addr -0026 c3838000 rtnbit1 7 +0021 204000be call p_mouse_seting_sensor_type +0022 20403d8a call mouse_usb_check_enable +0023 20404728 call mouse_drawing_optima_init +0024 2040002d call p_mouse_cb_fuction +0025 2040423c call mouse_sensor_powerdown +0026 6fe0c92a fetch 1 ,mem_usb_addr +0027 c3838000 rtnbit1 7 p_mouse_init_wireless: -0027 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0028 c297c80a bbit1 mouse_enable_24g_first_auto_pairing ,mouse_24g_first_start_auto_pair_mode -0029 6fe0c938 fetch 1 ,mem_device_flag -002a c000007b beq mode_24g_device ,p_mouse_24g_start_mode -002b 20203d57 branch mouse_start_work + 5 +0028 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0029 c297c80a bbit1 mouse_enable_24g_first_auto_pairing ,mouse_24g_first_start_auto_pair_mode +002a 6fe0c938 fetch 1 ,mem_device_flag +002b c000007c beq mode_24g_device ,p_mouse_24g_start_mode +002c 20203d57 branch mouse_start_work + 5 p_mouse_cb_fuction: -002c 5800002f setarg p_mouse_24g_package_data -002d 67e1489b store 2 ,mem_cb_24g_transmit_data -002e 20203bd1 branch mouse_cb_fuction + 2 +002d 58000030 setarg p_mouse_24g_package_data +002e 67e1489b store 2 ,mem_cb_24g_transmit_data +002f 20203bd1 branch mouse_cb_fuction + 2 p_mouse_24g_package_data: -002f c6930000 rtnmark0 mark_24g -0030 20403f70 call mouse_motion -0031 24740000 nrtn user -0032 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0033 c30a8036 bbit0 mouse_enable_keyboard ,p_mouse_24g_mouse_package_data -0034 6fe0cb8b fetch 1 ,mem_customer_key -0035 243a4884 nbranch mouse_24g_keyboard_package_data ,blank +0030 c6930000 rtnmark0 mark_24g +0031 20403f70 call mouse_motion +0032 24740000 nrtn user +0033 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0034 c30a8037 bbit0 mouse_enable_keyboard ,p_mouse_24g_mouse_package_data +0035 6fe0cb8b fetch 1 ,mem_customer_key +0036 243a4884 nbranch mouse_24g_keyboard_package_data ,blank p_mouse_24g_mouse_package_data: -0036 204042cb call mouse_data_xy_release -0037 6fe0c836 fetch 1 ,mem_24g_data_type -0038 c2808045 bbit1 1 ,p_mouse_24g_mouse_package_data_now -0039 6848c7c7 fetcht 1 ,mem_24g_txbuf + 1 -003a 6fe0c8d0 fetch 1 ,mem_mouse_key -003b 9841fe00 ior temp ,pdata -003c 67e0c8d0 store 1 ,mem_mouse_key -003d 6848c7cc fetcht 1 ,mem_24g_txbuf + 6 -003e 6fe0c8d5 fetch 1 ,mem_mouse_z -003f 9840fe00 iadd temp ,pdata -0040 67e0c8d5 store 1 ,mem_mouse_z -0041 6848c7cd fetcht 1 ,mem_24g_txbuf + 7 -0042 6fe0c8d6 fetch 1 ,mem_mouse_tz -0043 9840fe00 iadd temp ,pdata -0044 67e0c8d6 store 1 ,mem_mouse_tz +0037 204042cb call mouse_data_xy_release +0038 6fe0c836 fetch 1 ,mem_24g_data_type +0039 c2808046 bbit1 1 ,p_mouse_24g_mouse_package_data_now +003a 6848c7c7 fetcht 1 ,mem_24g_txbuf + 1 +003b 6fe0c8d0 fetch 1 ,mem_mouse_key +003c 9841fe00 ior temp ,pdata +003d 67e0c8d0 store 1 ,mem_mouse_key +003e 6848c7cc fetcht 1 ,mem_24g_txbuf + 6 +003f 6fe0c8d5 fetch 1 ,mem_mouse_z +0040 9840fe00 iadd temp ,pdata +0041 67e0c8d5 store 1 ,mem_mouse_z +0042 6848c7cd fetcht 1 ,mem_24g_txbuf + 7 +0043 6fe0c8d6 fetch 1 ,mem_mouse_tz +0044 9840fe00 iadd temp ,pdata +0045 67e0c8d6 store 1 ,mem_mouse_tz p_mouse_24g_mouse_package_data_now: -0045 70483601 jam type_ms ,mem_24g_data_type -0046 da200007 arg 7 ,rega -0047 da4048d0 arg mem_mouse_key ,regb -0048 6fe148d5 fetch 2 ,mem_mouse_z -0049 207a0000 rtn blank -004a 202026e1 branch g24_transmit_by_interrupt_enable +0046 70483601 jam type_ms ,mem_24g_data_type +0047 da200007 arg 7 ,rega +0048 da4048d0 arg mem_mouse_key ,regb +0049 6fe148d5 fetch 2 ,mem_mouse_z +004a 207a0000 rtn blank +004b 202026e1 branch g24_transmit_by_interrupt_enable p_g24_transmit_no_interrupt: -004b 20402631 call g24_txdata_prep -004c 243426a1 nbranch g24_nodata_transmit ,user +004c 20402631 call g24_txdata_prep +004d 243426a1 nbranch g24_nodata_transmit ,user p_g24_transmit_start: -004d 20402646 call g24_transmit_process -004e 204026ee call power_ctrl_start -004f 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag -0050 243a0055 nbranch p_g24_short_sleep ,blank +004e 20402646 call g24_transmit_process +004f 204026ee call power_ctrl_start +0050 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag +0051 243a0056 nbranch p_g24_short_sleep ,blank p_g24_transmit_start_next: -0051 6fe448b0 fetch 8 ,mem_24g_long_sleep_set -0052 67e4485c store 8 ,mem_24g_enter_hibernate -0053 6fe148c2 fetch 2 ,mem_24g_long_sleep_param_update_timer_init -0054 67e148c4 store 2 ,mem_24g_long_sleep_param_update_timer +0052 6fe448b0 fetch 8 ,mem_24g_long_sleep_set +0053 67e4485c store 8 ,mem_24g_enter_hibernate +0054 6fe148c2 fetch 2 ,mem_24g_long_sleep_param_update_timer_init +0055 67e148c4 store 2 ,mem_24g_long_sleep_param_update_timer p_g24_short_sleep: -0055 204026bb call g24_lpm_wait -0056 24740000 nrtn user -0057 20407fdc call clear_wake -0058 6fe1c8ad fetch 3 ,mem_24g_short_sleep_set -0059 202026b8 branch g24_long_sleep2 +0056 204026bb call g24_lpm_wait +0057 24740000 nrtn user +0058 20407fdc call clear_wake +0059 6fe1c8ad fetch 3 ,mem_24g_short_sleep_set +005a 202026b8 branch g24_long_sleep2 p_mouse_setgpio_hibernate: -005a 204042e9 call mouse_set_sdio_high -005b 20407fdc call clear_wake -005c 20403e40 call mouse_lpm_before_common -005d d8400013 arg 19 ,temp -005e 20403f56 call mouse_gpio_config_input_pu -005f 6fe0c920 fetch 1 ,mem_mouse_sensor_sdio_gpio -0060 d840003f arg gpcfg_output_high ,temp -0061 20206093 branch gpio_config_function_int +005b 204042e9 call mouse_set_sdio_high +005c 20407fdc call clear_wake +005d 20403e40 call mouse_lpm_before_common +005e d8400013 arg 19 ,temp +005f 20403f56 call mouse_gpio_config_input_pu +0060 6fe0c920 fetch 1 ,mem_mouse_sensor_sdio_gpio +0061 d840003f arg gpcfg_output_high ,temp +0062 20206093 branch gpio_config_function_int p_mouse_lpm_before_common: -0062 20403f88 call mouse_wheel_check -0063 6fe0c91f fetch 1 ,mem_mouse_sensor_sclk_gpio -0064 d840003f arg gpcfg_output_high ,temp -0065 20406093 call gpio_config_function_int -0066 20203e44 branch mouse_lpm_before_common_next +0063 20403f88 call mouse_wheel_check +0064 6fe0c91f fetch 1 ,mem_mouse_sensor_sclk_gpio +0065 d840003f arg gpcfg_output_high ,temp +0066 20406093 call gpio_config_function_int +0067 20203e44 branch mouse_lpm_before_common_next p_mouse_priority_bb_event: -0067 1a627e00 copy regc ,pdata -0068 c01d006a beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail -0069 20204336 branch mouse_priority_bb_event + 2 +0068 1a627e00 copy regc ,pdata +0069 c01d006b beq bt_evt_24g_attempt_fail ,p_mouse_24g_attempt_fail +006a 20204336 branch mouse_priority_bb_event + 2 p_mouse_24g_attempt_fail: -006a 6fe0c8a5 fetch 1 ,mem_24g_attempt_fail_flag -006b 243a47e1 nbranch mouse_24g_hibernate_set ,blank -006c 6fe0c88b fetch 1 ,mem_24g_reconn_type -006d c001806f beq receiver_and_3_0_addr ,p_mouse_reconn_dongle_attempt_fail -006e 20204836 branch mouse_24g_attempt_fail + 3 +006b 6fe0c8a5 fetch 1 ,mem_24g_attempt_fail_flag +006c 243a47e1 nbranch mouse_24g_hibernate_set ,blank +006d 6fe0c88b fetch 1 ,mem_24g_reconn_type +006e c0018070 beq receiver_and_3_0_addr ,p_mouse_reconn_dongle_attempt_fail +006f 20204836 branch mouse_24g_attempt_fail + 3 p_mouse_reconn_dongle_attempt_fail: -006f 20400072 call p_g24_factory_check -0070 20344812 branch mouse_24g_start_auto_pair + 1 ,user -0071 20204849 branch mouse_reconn_dongle_attempt_fail +0070 20400073 call p_g24_factory_check +0071 20344812 branch mouse_24g_start_auto_pair + 1 ,user +0072 20204849 branch mouse_reconn_dongle_attempt_fail p_g24_factory_check: -0072 df200002 arg 2 ,loopcnt -0073 d8c04993 arg mem_mouse_24g_addr ,contr +0073 df200002 arg 2 ,loopcnt +0074 d8c04993 arg mem_mouse_24g_addr ,contr p_pdata_0xff_check: -0074 20407e54 call enable_user -0075 5800ffff setarg 0xffff +0075 20407e54 call enable_user +0076 5800ffff setarg 0xffff p_pdata_0xff_check_loop: -0076 e8410006 ifetcht 2 ,contr -0077 98467c00 isub temp ,null -0078 2442fe56 ncall disable_user ,zero -0079 c2000076 loop p_pdata_0xff_check_loop -007a 20600000 rtn +0077 e8410006 ifetcht 2 ,contr +0078 98467c00 isub temp ,null +0079 2442fe56 ncall disable_user ,zero +007a c2000077 loop p_pdata_0xff_check_loop +007b 20600000 rtn p_mouse_24g_start_mode: -007b 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -007c c308c803 bbit0 mouse_enable_24g ,mouse_24g_mode_setup_error -007d 20403d65 call mouse_wakeup_from_power_check -007e 20344806 branch mouse_24g_reconn_dongle_start ,user -007f 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0080 c298480c bbit1 mouse_enable_auto_24g_paring ,mouse_24g_reconn_general_dongle -0081 c318c80c bbit0 mouse_enable_24g_power_on_pairing ,mouse_24g_reconn_general_dongle -0082 20404110 call mouse_key_check_once -0083 1a227e00 copy rega ,pdata -0084 1fe17e07 and pdata ,0x07 ,pdata -0085 6848cbcb fetcht 1 ,mem_mouse_commbination_key_24g -0086 98467c00 isub temp ,null -0087 2022c827 branch mouse_24g_start_pair_mode ,zero -0088 2020480c branch mouse_24g_reconn_general_dongle +007c 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +007d c308c803 bbit0 mouse_enable_24g ,mouse_24g_mode_setup_error +007e 20403d65 call mouse_wakeup_from_power_check +007f 20344806 branch mouse_24g_reconn_dongle_start ,user +0080 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0081 c298480c bbit1 mouse_enable_auto_24g_paring ,mouse_24g_reconn_general_dongle +0082 c318c80c bbit0 mouse_enable_24g_power_on_pairing ,mouse_24g_reconn_general_dongle +0083 20404110 call mouse_key_check_once +0084 1a227e00 copy rega ,pdata +0085 1fe17e07 and pdata ,0x07 ,pdata +0086 6848cbcb fetcht 1 ,mem_mouse_commbination_key_24g +0087 98467c00 isub temp ,null +0088 2022c827 branch mouse_24g_start_pair_mode ,zero +0089 2020480c branch mouse_24g_reconn_general_dongle p_mouse_motion: -0089 78547c00 disable user -008a 58000000 setarg 0 -008b 67e348d1 store 6 ,mem_mouse_x -008c 20404240 call mouse_check_sensor_data -008d 2040008f call p_mouse_sensor_data_mul -008e 20203f75 branch mouse_motion + 5 +008a 78547c00 disable user +008b 58000000 setarg 0 +008c 67e348d1 store 6 ,mem_mouse_x +008d 20404240 call mouse_check_sensor_data +008e 20400090 call p_mouse_sensor_data_mul +008f 20203f75 branch mouse_motion + 5 p_mouse_sensor_data_mul: -008f 6fe0c927 fetch 1 ,mem_config_sensor_type -0090 c1860000 rtnne om16 -0091 6fe0c992 fetch 1 ,mem_mouse_dpi -0092 1fe67e03 sub pdata ,3 ,pdata -0093 24210095 nbranch p_mouse_sensor_data_set ,positive -0094 20600000 rtn +0090 6fe0c927 fetch 1 ,mem_config_sensor_type +0091 c1860000 rtnne om16 +0092 6fe0c992 fetch 1 ,mem_mouse_dpi +0093 1fe67e03 sub pdata ,3 ,pdata +0094 24210096 nbranch p_mouse_sensor_data_set ,positive +0095 20600000 rtn p_mouse_sensor_data_set: -0095 58000506 setarg 0x0506 -0096 67e14c0d store 2 ,mem_mouse_xy_date_times -0097 204000a8 call p_mouse_sensor_data_set_x +0096 58000506 setarg 0x0506 +0097 67e14c0d store 2 ,mem_mouse_xy_date_times +0098 204000a9 call p_mouse_sensor_data_set_x p_mouse_sensor_data_set_y: -0098 6fe0c8d3 fetch 1 ,mem_mouse_y -0099 c283809d bbit1 7 ,p_mouse_sensor_data_set_y_next -009a 204000b0 call p_mouse_sensor_data_set_next -009b 67e0c8d3 store 1 ,mem_mouse_y -009c 20600000 rtn +0099 6fe0c8d3 fetch 1 ,mem_mouse_y +009a c283809e bbit1 7 ,p_mouse_sensor_data_set_y_next +009b 204000b1 call p_mouse_sensor_data_set_next +009c 67e0c8d3 store 1 ,mem_mouse_y +009d 20600000 rtn p_mouse_sensor_data_set_y_next: -009d 204000a0 call p_mouse_sensor_data_set_reverse -009e 67e0c8d3 store 1 ,mem_mouse_y -009f 20600000 rtn +009e 204000a1 call p_mouse_sensor_data_set_reverse +009f 67e0c8d3 store 1 ,mem_mouse_y +00a0 20600000 rtn p_mouse_sensor_data_set_reverse: -00a0 1fe20400 copy pdata ,temp -00a1 dfe00100 arg 0x100 ,pdata -00a2 98467e00 isub temp ,pdata -00a3 204000b0 call p_mouse_sensor_data_set_next -00a4 1fe20400 copy pdata ,temp -00a5 dfe00100 arg 0x100 ,pdata -00a6 98467e00 isub temp ,pdata -00a7 20600000 rtn +00a1 1fe20400 copy pdata ,temp +00a2 dfe00100 arg 0x100 ,pdata +00a3 98467e00 isub temp ,pdata +00a4 204000b1 call p_mouse_sensor_data_set_next +00a5 1fe20400 copy pdata ,temp +00a6 dfe00100 arg 0x100 ,pdata +00a7 98467e00 isub temp ,pdata +00a8 20600000 rtn p_mouse_sensor_data_set_x: -00a8 6fe0c8d1 fetch 1 ,mem_mouse_x -00a9 c28380ad bbit1 7 ,p_mouse_sensor_data_set_x_next -00aa 204000b0 call p_mouse_sensor_data_set_next -00ab 67e0c8d1 store 1 ,mem_mouse_x -00ac 20600000 rtn +00a9 6fe0c8d1 fetch 1 ,mem_mouse_x +00aa c28380ae bbit1 7 ,p_mouse_sensor_data_set_x_next +00ab 204000b1 call p_mouse_sensor_data_set_next +00ac 67e0c8d1 store 1 ,mem_mouse_x +00ad 20600000 rtn p_mouse_sensor_data_set_x_next: -00ad 204000a0 call p_mouse_sensor_data_set_reverse -00ae 67e0c8d1 store 1 ,mem_mouse_x -00af 20600000 rtn +00ae 204000a1 call p_mouse_sensor_data_set_reverse +00af 67e0c8d1 store 1 ,mem_mouse_x +00b0 20600000 rtn p_mouse_sensor_data_set_next: -00b0 6848cc0d fetcht 1 ,mem_mouse_xy_date_times -00b1 984ffe00 imul32 temp ,pdata -00b2 6848cc0e fetcht 1 ,mem_mouse_xy_date_times + 1 -00b3 9846fc00 idiv temp -00b4 20407def call wait_div_end -00b5 1807fe00 quotient pdata -00b6 1fe67c7f sub pdata ,0x7f ,null -00b7 242100b9 nbranch p_mouse_sensor_data_set_next2 ,positive -00b8 20600000 rtn +00b1 6848cc0d fetcht 1 ,mem_mouse_xy_date_times +00b2 984ffe00 imul32 temp ,pdata +00b3 6848cc0e fetcht 1 ,mem_mouse_xy_date_times + 1 +00b4 9846fc00 idiv temp +00b5 20407def call wait_div_end +00b6 1807fe00 quotient pdata +00b7 1fe67c7f sub pdata ,0x7f ,null +00b8 242100ba nbranch p_mouse_sensor_data_set_next2 ,positive +00b9 20600000 rtn p_mouse_sensor_data_set_next2: -00b9 5800007f setarg 0x7f -00ba 20600000 rtn +00ba 5800007f setarg 0x7f +00bb 20600000 rtn p_mouse_seting_dpi: -00bb 6fe0c927 fetch 1 ,mem_config_sensor_type -00bc c00600d0 beq om16 ,p_mouse_seting_om16_dpi -00bd c00180c1 beq p3212 ,p_mouse_seting_3212_dpi -00be 2040408f call mouse_setting_dpi_4_level -00bf 204048e1 call mouse_dpi_led_blink_delay -00c0 20204098 branch mouse_seting_sensor_type +00bc 2040408f call mouse_setting_dpi_4_level +00bd 204048e1 call mouse_dpi_led_blink_delay + +p_mouse_seting_sensor_type: +00be 6fe0c927 fetch 1 ,mem_config_sensor_type +00bf c00600cf beq om16 ,p_mouse_seting_om16_dpi +00c0 c00180c2 beq p3212 ,p_mouse_seting_3212_dpi +00c1 20204098 branch mouse_seting_sensor_type p_mouse_seting_3212_dpi: -00c1 204046ee call mouse_dpi_4level_enable -00c2 204048e1 call mouse_dpi_led_blink_delay -00c3 6fe0c992 fetch 1 ,mem_mouse_dpi -00c4 c00000ca beq mouse_dpi_level1 ,p_mouse_set_p3212_cpi0 -00c5 c00080c8 beq mouse_dpi_level2 ,p_mouse_set_p3212_cpi1 -00c6 c00100cc beq mouse_dpi_level3 ,p_mouse_set_p3212_cpi2 -00c7 c00180ce beq mouse_dpi_level4 ,p_mouse_set_p3212_cpi3 +00c2 6fe0c992 fetch 1 ,mem_mouse_dpi +00c3 c00000c9 beq mouse_dpi_level1 ,p_mouse_set_p3212_cpi0 +00c4 c00080c7 beq mouse_dpi_level2 ,p_mouse_set_p3212_cpi1 +00c5 c00100cb beq mouse_dpi_level3 ,p_mouse_set_p3212_cpi2 +00c6 c00180cd beq mouse_dpi_level4 ,p_mouse_set_p3212_cpi3 p_mouse_set_p3212_cpi1: -00c8 6fe0c9d5 fetch 1 ,mem_3212_dpi_1 -00c9 202040c7 branch mouse_p3212_dpi +00c7 6fe0c9d5 fetch 1 ,mem_3212_dpi_1 +00c8 202040c7 branch mouse_p3212_dpi p_mouse_set_p3212_cpi0: -00ca 6fe0c9d4 fetch 1 ,mem_3212_dpi_0 -00cb 202040c7 branch mouse_p3212_dpi +00c9 6fe0c9d4 fetch 1 ,mem_3212_dpi_0 +00ca 202040c7 branch mouse_p3212_dpi p_mouse_set_p3212_cpi2: -00cc 6fe0c9d6 fetch 1 ,mem_3212_dpi_2 -00cd 202040c7 branch mouse_p3212_dpi +00cb 6fe0c9d6 fetch 1 ,mem_3212_dpi_2 +00cc 202040c7 branch mouse_p3212_dpi p_mouse_set_p3212_cpi3: -00ce 6fe0c9d7 fetch 1 ,mem_3212_dpi_3 -00cf 202040c7 branch mouse_p3212_dpi +00cd 6fe0c9d7 fetch 1 ,mem_3212_dpi_3 +00ce 202040c7 branch mouse_p3212_dpi p_mouse_seting_om16_dpi: -00d0 204046ee call mouse_dpi_4level_enable -00d1 204048e1 call mouse_dpi_led_blink_delay -00d2 6fe0c992 fetch 1 ,mem_mouse_dpi -00d3 c00000d9 beq mouse_dpi_level1 ,p_mouse_om16_set_cpi0 -00d4 c00080d7 beq mouse_dpi_level2 ,p_mouse_om16_set_cpi1 -00d5 c00100db beq mouse_dpi_level3 ,p_mouse_om16_set_cpi2 -00d6 c00180dd beq mouse_dpi_level4 ,p_mouse_om16_set_cpi3 +00cf 6fe0c992 fetch 1 ,mem_mouse_dpi +00d0 c00000d6 beq mouse_dpi_level1 ,p_mouse_om16_set_cpi0 +00d1 c00080d4 beq mouse_dpi_level2 ,p_mouse_om16_set_cpi1 +00d2 c00100d8 beq mouse_dpi_level3 ,p_mouse_om16_set_cpi2 +00d3 c00180da beq mouse_dpi_level4 ,p_mouse_om16_set_cpi3 p_mouse_om16_set_cpi1: -00d7 6848cc0a fetcht 1 ,mem_om16_dpi_1 -00d8 202040a8 branch mouse_dpi_store +00d4 6848cc0a fetcht 1 ,mem_om16_dpi_1 +00d5 202040a8 branch mouse_dpi_store p_mouse_om16_set_cpi0: -00d9 6848cc09 fetcht 1 ,mem_om16_dpi_0 -00da 202040a8 branch mouse_dpi_store +00d6 6848cc09 fetcht 1 ,mem_om16_dpi_0 +00d7 202040a8 branch mouse_dpi_store p_mouse_om16_set_cpi2: -00db 6848cc0b fetcht 1 ,mem_om16_dpi_2 -00dc 202040a8 branch mouse_dpi_store +00d8 6848cc0b fetcht 1 ,mem_om16_dpi_2 +00d9 202040a8 branch mouse_dpi_store p_mouse_om16_set_cpi3: -00dd 6848cc0c fetcht 1 ,mem_om16_dpi_3 -00de 202040a8 branch mouse_dpi_store +00da 6848cc0c fetcht 1 ,mem_om16_dpi_3 +00db 202040a8 branch mouse_dpi_store p_mouse_init_sunt: -00df 20403f65 call mouse_sensor_spi_init -00e0 20758000 rtn wake +00dc 20403f65 call mouse_sensor_spi_init +00dd 20758000 rtn wake p_mouse_init_sensor_wakeup: -00e1 20404236 call mouse_sensor_poweron +00de 20404236 call mouse_sensor_poweron p_mouse_init_sensor: -00e2 204041b5 call mouse_read_sensor_id -00e3 c01800e9 beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge -00e4 c018c217 beq p3065_id1 ,mouse_init_p3065 -00e5 c02c4220 beq pka8g2_id1 ,mouse_ka8g2_id2_judge -00e6 204041b2 call mouse_twspi_reset -00e7 20001af4 nop 6900 -00e8 202000e2 branch p_mouse_init_sensor +00df 204041b5 call mouse_read_sensor_id +00e0 c01800eb beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge +00e1 c018c217 beq p3065_id1 ,mouse_init_p3065 +00e2 c02c4220 beq pka8g2_id1 ,mouse_ka8g2_id2_judge +00e3 204041b2 call mouse_twspi_reset +00e4 20001af4 nop 6900 +00e5 202000df branch p_mouse_init_sensor + +p_mouse_sensor_poweron: +00e6 20403f65 call mouse_sensor_spi_init +00e7 20404232 call mouse_sensor_reset +00e8 da604aa3 arg mem_sensor_poweron_init ,regc +00e9 2040422b call mouse_sensor_wr_seq +00ea 202000be branch p_mouse_seting_sensor_type p_mouse_init_p32xx_id2_judge: -00e9 6fe0c9c2 fetch 1 ,mem_sensor_id2 -00ea c02d00ef beq p_mx8650 ,p_mouse_mx8650_init_param -00eb c02900ed beq om16_id2 ,p_mouse_om16_init_param -00ec 202041be branch mouse_init_p32xx_id2_judge + 2 +00eb 6fe0c9c2 fetch 1 ,mem_sensor_id2 +00ec c02d00f4 beq p_mx8650 ,p_mouse_mx8650_init_param +00ed c02900f0 beq om16_id2 ,p_mouse_om16_init_param +00ee c00100f2 beq p3212_id2 ,p_mouse_3212_init_param +00ef 202041be branch mouse_init_p32xx_id2_judge + 2 p_mouse_om16_init_param: -00ed 7049270c jam om16 ,mem_config_sensor_type -00ee 20600000 rtn +00f0 7049270c jam om16 ,mem_config_sensor_type +00f1 202046ee branch mouse_dpi_4level_enable + +p_mouse_3212_init_param: +00f2 204046ee call mouse_dpi_4level_enable +00f3 202041ea branch mouse_3212_init_param p_mouse_mx8650_init_param: -00ef 70492705 jam mx8650 ,mem_config_sensor_type -00f0 58008006 setarg 0x8006 -00f1 20405b0c call twspi_write -00f2 20407d12 call delay_10ms -00f3 da604be3 arg mem_sensor_8650_init_new ,regc -00f4 2040422b call mouse_sensor_wr_seq -00f5 2020408e branch mouse_dpi_config +00f4 70492705 jam mx8650 ,mem_config_sensor_type +00f5 58008006 setarg 0x8006 +00f6 20405b0c call twspi_write +00f7 20407d12 call delay_10ms +00f8 da604be3 arg mem_sensor_8650_init_new ,regc +00f9 2040422b call mouse_sensor_wr_seq +00fa 202000be branch p_mouse_seting_sensor_type org 0x800 start: @@ -19468,6 +19479,8 @@ 4098 6fe0c927 fetch 1 ,mem_config_sensor_type 4099 c001c0bb beq p3212 ,mouse_seting_3212_dpi 409a c005c0cf beq ka8g2 ,mouse_seting_ka8g2_dpi + +mouse_seting_sensor_type_next: 409b 6fe0c992 fetch 1 ,mem_mouse_dpi 409c c00040a2 beq mouse_dpi_level1 ,mouse_set_cpi0 409d c000c0a0 beq mouse_dpi_level2 ,mouse_set_cpi1 @@ -20088,6 +20101,8 @@ 4256 58000002 setarg pan_reg_motion_staus 4257 20405b0d call twspi_read 4258 c4038000 rtnbit0 7 + +mouse_p32xx_sensor_motion_3: 4259 204042db call mouse_read_sensor_common 425a 6fe0c8d1 fetch 1 ,mem_mouse_x 425b 204042d3 call mouse_data_extsign Index: program/app_mouse.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/program/app_mouse.prog (revision 480) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/program/app_mouse.prog (working copy) @@ -1676,6 +1676,7 @@ fetch 1,mem_config_sensor_type beq P3212,mouse_seting_3212_dpi beq KA8G2,mouse_seting_ka8g2_dpi +mouse_seting_sensor_type_next: fetch 1,mem_mouse_dpi beq MOUSE_DPI_LEVEL1,mouse_set_cpi0 //1200 beq MOUSE_DPI_LEVEL2,mouse_set_cpi1 //1600 @@ -2288,6 +2289,7 @@ setarg PAN_REG_MOTION_STAUS call twspi_read rtnbit0 7 +mouse_p32xx_sensor_motion_3: call mouse_read_sensor_common fetch 1,mem_mouse_x call mouse_data_extsign Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/program/patch.prog (revision 481) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/program/patch.prog (working copy) @@ -8,6 +8,7 @@ beq patch19_6,p_mouse_motion beq patch1a_0,p_mouse_seting_dpi beq patch1a_3,p_mouse_init_sunt + beq patch1a_4,p_mouse_sensor_poweron beq patch1a_6,p_mouse_priority_bb_event branch loop @@ -45,8 +46,8 @@ call enable_authrom call mouse_setting_config call mouse_init_sunt - call mouse_dpi_config rtn wake + call p_mouse_seting_sensor_type call mouse_usb_check_enable call mouse_drawing_optima_init call p_mouse_cb_fuction @@ -247,16 +248,15 @@ rtn p_mouse_seting_dpi: + call mouse_setting_dpi_4_level + call mouse_dpi_led_blink_delay +p_mouse_seting_sensor_type: fetch 1,mem_config_sensor_type beq OM16,p_mouse_seting_om16_dpi beq P3212,p_mouse_seting_3212_dpi - call mouse_setting_dpi_4_level - call mouse_dpi_led_blink_delay branch mouse_seting_sensor_type p_mouse_seting_3212_dpi: - call mouse_dpi_4level_enable - call mouse_dpi_led_blink_delay fetch 1,mem_mouse_dpi beq MOUSE_DPI_LEVEL1,p_mouse_set_p3212_cpi0 //1200 beq MOUSE_DPI_LEVEL2,p_mouse_set_p3212_cpi1 //1600 @@ -276,8 +276,6 @@ branch mouse_p3212_dpi p_mouse_seting_om16_dpi: - call mouse_dpi_4level_enable - call mouse_dpi_led_blink_delay fetch 1,mem_mouse_dpi beq MOUSE_DPI_LEVEL1,p_mouse_om16_set_cpi0 //1200 beq MOUSE_DPI_LEVEL2,p_mouse_om16_set_cpi1 //1600 @@ -310,16 +308,27 @@ nop 6900 branch p_mouse_init_sensor +p_mouse_sensor_poweron: + call mouse_sensor_spi_init + call mouse_sensor_reset + arg mem_sensor_poweron_init,regc + call mouse_sensor_wr_seq + branch p_mouse_seting_sensor_type + + p_mouse_init_p32xx_id2_judge: fetch 1,mem_sensor_id2 beq P_MX8650,p_mouse_mx8650_init_param beq OM16_ID2,p_mouse_om16_init_param + beq P3212_ID2,p_mouse_3212_init_param branch mouse_init_p32xx_id2_judge+2 p_mouse_om16_init_param: jam OM16,mem_config_sensor_type - rtn - + branch mouse_dpi_4level_enable +p_mouse_3212_init_param: + call mouse_dpi_4level_enable + branch mouse_3212_init_param @@ -330,6 +339,6 @@ call delay_10ms arg mem_sensor_8650_init_new,regc call mouse_sensor_wr_seq - branch mouse_dpi_config + branch p_mouse_seting_sensor_type Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/sched/mouse.dat (revision 481) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/sched/mouse.dat (working copy) @@ -131,7 +131,7 @@ mem_dpi_led_gpio:ff#03 mem_sensor_angle_default:03 #00--6CLK 01--9CLK 02--12CLK 03--3CLK -mem_sensor_angle_switch:00 #00--6CLK 01--9CLK 02--12CLK 03--3CLK +mem_sensor_angle_switch:03 #00--6CLK 01--9CLK 02--12CLK 03--3CLK mem_config_sensor_dpi:00 #00--1200 01--1600 @@ -151,7 +151,6 @@ mem_lpm_mode:01 - 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 @@ -317,10 +316,10 @@ mem_om16_dpi: -7 ##mem_om16_dpi_0 -7 ##mem_om16_dpi_1 -4 ##mem_om16_dpi_2 -6 ##mem_om16_dpi_3 +07 ##mem_om16_dpi_0 +07 ##mem_om16_dpi_1 +04 ##mem_om16_dpi_2 +06 ##mem_om16_dpi_3 mem_sensor_3212_init: 09 5a