Index: format/rom.format =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/format/rom.format (revision 4201) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/format/rom.format (working copy) @@ -9780,20 +9780,6 @@ 1 mem_commbination_dpi_timer 1 mem_mouse_commbination_key_dpi -//rgb -1 mem_rgb_led_off_enable -1 mem_rgb_led_on_enable -1 mem_rgb_led_off_enable_timer -1 mem_rgb_led_on_enable_timer -2 mem_rgb_led_on_timer - -2 mem_rgb_led_off_check_count -2 mem_rgb_led_on_check_count -1 mem_rgb_led_on_continue_1min_timeout_flag -1 mem_mbutton_function_disable -1 mem_mouse_rgb_ctrl_gpio -1 mem_mouse_rgb_adc_no_power_flag - 30 mem_sensor_8650_init_new 1 mem_long_sleep_flag 1 mem_mouse_customer_key_connect_vin_flag Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/output/eeprom.dat (revision 4201) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -2e +26 17 c2 84 @@ -75,7 +75,7 @@ c0 67 85 -95 +93 c0 68 03 @@ -83,7 +83,7 @@ c0 68 85 -27 +25 c0 69 83 @@ -91,7 +91,7 @@ c0 6a 05 -0f +0d c0 6b 02 @@ -111,7 +111,7 @@ c0 6f 05 -73 +71 c0 6f 80 @@ -199,7 +199,7 @@ c0 76 85 -9d +9b 20 20 13 @@ -1231,7 +1231,7 @@ 20 40 05 -1e +1c 20 20 3b @@ -1250,7 +1250,7 @@ 00 70 4d -c6 +b8 01 20 60 @@ -1499,10 +1499,10 @@ 6f e0 cd -c5 +b7 70 4d -c5 +b7 00 24 5a @@ -1747,7 +1747,7 @@ 20 20 05 -1e +1c 6f e0 c8 @@ -2015,7 +2015,7 @@ 20 40 05 -c2 +c0 20 40 27 @@ -2067,7 +2067,7 @@ 20 20 05 -83 +81 70 4b 94 @@ -2195,11 +2195,11 @@ 20 40 05 -19 +17 20 40 05 -1e +1c 20 20 3e @@ -2243,7 +2243,7 @@ 20 40 05 -5a +58 d8 40 00 @@ -2431,7 +2431,7 @@ 20 40 05 -5a +58 20 20 3e @@ -2470,7 +2470,7 @@ c4 70 4d -c5 +b7 01 6f e0 @@ -2891,7 +2891,7 @@ 20 40 05 -1e +1c 20 20 02 @@ -3367,11 +3367,11 @@ da 60 4d -a7 +99 20 20 05 -14 +12 58 00 00 @@ -4467,7 +4467,7 @@ 20 40 05 -27 +25 1f e1 7e @@ -5075,7 +5075,7 @@ 20 40 05 -25 +23 6f e0 c8 @@ -5090,12 +5090,12 @@ d0 24 34 -05 -09 +47 +28 20 40 05 -0b +09 20 20 45 @@ -5160,14 +5160,6 @@ 20 42 79 -20 -40 -47 -28 -20 -60 -00 -00 6f e0 c9 @@ -5195,7 +5187,7 @@ c0 05 85 -16 +14 20 40 42 @@ -5215,7 +5207,7 @@ 20 40 05 -1c +1a da 60 4b @@ -5223,7 +5215,7 @@ 20 20 05 -14 +12 6f e0 c9 @@ -5231,7 +5223,7 @@ c0 05 85 -1c +1a 20 20 42 @@ -5259,7 +5251,7 @@ c0 05 85 -23 +21 20 20 42 @@ -5275,7 +5267,7 @@ 20 40 05 -27 +25 20 20 40 @@ -5295,27 +5287,27 @@ 20 40 05 -31 +2f 20 40 05 -36 +34 20 40 05 -3b +39 20 40 05 -40 +3e 20 40 05 -4d +4b 20 40 05 -60 +5e 20 20 41 @@ -5327,7 +5319,7 @@ 20 40 05 -5a +58 20 40 41 @@ -5347,7 +5339,7 @@ 20 40 05 -5a +58 20 40 41 @@ -5367,7 +5359,7 @@ 20 40 05 -5a +58 20 40 41 @@ -5411,7 +5403,7 @@ c0 7f 85 -49 +47 20 20 41 @@ -5423,7 +5415,7 @@ 20 40 05 -5d +5b 68 48 c9 @@ -5463,7 +5455,7 @@ c0 7f 85 -56 +54 20 20 41 @@ -5475,7 +5467,7 @@ 20 40 05 -5d +5b 68 48 c9 @@ -5511,7 +5503,7 @@ 6f e0 cd -c6 +b8 20 3a 41 @@ -5559,7 +5551,7 @@ 20 40 05 -5d +5b 68 48 c9 @@ -5587,7 +5579,7 @@ 20 40 05 -78 +76 20 40 79 @@ -5595,11 +5587,11 @@ 20 40 05 -83 +81 20 40 05 -7c +7a 20 20 46 @@ -5627,11 +5619,11 @@ c2 94 85 -80 +7e c2 9b 85 -80 +7e 20 60 00 @@ -5671,7 +5663,7 @@ 20 40 05 -8a +88 20 20 40 @@ -5699,7 +5691,7 @@ c0 7f 85 -91 +8f 20 20 40 @@ -5711,7 +5703,7 @@ 20 40 05 -5d +5b 68 48 c9 @@ -5787,7 +5779,7 @@ c5 13 05 -a7 +a5 6f e0 c8 @@ -5799,7 +5791,7 @@ 24 21 05 -c1 +bf 6f e0 c8 @@ -5811,7 +5803,7 @@ 24 21 05 -af +ad 6f e0 c8 @@ -5819,7 +5811,7 @@ c0 00 05 -c2 +c0 20 60 00 @@ -5855,7 +5847,7 @@ c5 13 05 -b8 +b6 6f e0 c8 @@ -5887,7 +5879,7 @@ c0 01 05 -c9 +c7 c0 00 a7 @@ -5907,7 +5899,7 @@ c0 01 85 -c8 +c6 1f e0 fe @@ -5923,11 +5915,11 @@ c0 01 05 -c9 +c7 20 20 05 -c9 +c7 70 41 e8 @@ -5936,8 +5928,8 @@ 60 00 00 -5e -a6 +dd +89 aa 55 40 @@ -6161,13 +6153,6 @@ ff aa 55 -01 -00 -a5 -4d -ff -aa -55 03 00 24 @@ -6945,7 +6930,7 @@ 55 1e 00 -a7 +99 4d 09 5a @@ -7307,10 +7292,10 @@ aa aa 55 -06 -9d -ec -2e +07 +9a +20 +a4 ff ff ff @@ -8188,5 +8173,20 @@ ff ff ff -93 -2b +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +9a +a6 Index: output/memmap.format =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/output/memmap.format (revision 4201) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/output/memmap.format (working copy) @@ -2288,20 +2288,9 @@ 0x4d96 mem_mouse_commbination_dpi_check_enable 0x4d97 mem_commbination_dpi_timer 0x4d98 mem_mouse_commbination_key_dpi -0x4d99 mem_rgb_led_off_enable -0x4d9a mem_rgb_led_on_enable -0x4d9b mem_rgb_led_off_enable_timer -0x4d9c mem_rgb_led_on_enable_timer -0x4d9d mem_rgb_led_on_timer -0x4d9f mem_rgb_led_off_check_count -0x4da1 mem_rgb_led_on_check_count -0x4da3 mem_rgb_led_on_continue_1min_timeout_flag -0x4da4 mem_mbutton_function_disable -0x4da5 mem_mouse_rgb_ctrl_gpio -0x4da6 mem_mouse_rgb_adc_no_power_flag -0x4da7 mem_sensor_8650_init_new -0x4dc5 mem_long_sleep_flag -0x4dc6 mem_mouse_customer_key_connect_vin_flag +0x4d99 mem_sensor_8650_init_new +0x4db7 mem_long_sleep_flag +0x4db8 mem_mouse_customer_key_connect_vin_flag 0x48d0 mem_remote_car_hard_soft_switch 0x48d1 mem_remote_car_queue_each_size 0x48d2 mem_remote_car_queue_length Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/output/program.lis (revision 4201) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/output/program.lis (working copy) @@ -17,16 +17,16 @@ 000e c0650258 beq patch19_2 ,p_mouse_lpm_before_common 000f c06600c2 beq patch19_4 ,p_mouse_adc_read_start 0010 c06704ea beq patch19_6 ,p_mouse_motion -0011 c0678595 beq patch19_7 ,p_mouse_dpi_process +0011 c0678593 beq patch19_7 ,p_mouse_dpi_process 0012 c0680320 beq patch1a_0 ,p_mouse_seting_dpi -0013 c0688527 beq patch1a_1 ,p_mouse_check_key_gpio +0013 c0688525 beq patch1a_1 ,p_mouse_check_key_gpio 0014 c0698337 beq patch1a_3 ,p_mouse_init_sunt -0015 c06a050f beq patch1a_4 ,p_mouse_sensor_poweron +0015 c06a050d beq patch1a_4 ,p_mouse_sensor_poweron 0016 c06b027b beq patch1a_6 ,p_mouse_priority_bb_event 0017 c06c8365 beq patch1b_1 ,p_mouse_bb_event_timer 0018 c06d0474 beq patch1b_2 ,p_mouse_start_discovery 0019 c06d847e beq patch1b_3 ,p_mouse_stop_discovery -001a c06f0573 beq patch1b_6 ,p_mouse_idle +001a c06f0571 beq patch1b_6 ,p_mouse_idle 001b c06f8057 beq patch1b_7 ,p_mouse_ready_reconnection_by_button 001c c0708050 beq patch1c_1 ,p_mouse_led_off 001d c071004d beq patch1c_2 ,p_mouse_led_on @@ -50,7 +50,7 @@ 002d c07501bf beq patch3d_2 ,p_g24_transmit_no_interrupt 002e c07581ed beq patch3d_3 ,p_g24_transmit_hop_process 002f c07604df beq patch3d_4 ,p_g24_lpm_wait -0030 c076859d beq patch3d_5 ,p_power_ctrl_start +0030 c076859b beq patch3d_5 ,p_power_ctrl_start 0031 2020137c branch loop p_soft_reset: @@ -398,14 +398,14 @@ 012f 20403d8a call mouse_usb_check_enable 0130 20404728 call mouse_drawing_optima_init 0131 2040016d call p_mouse_cb_fuction -0132 2040051e call p_mouse_sensor_powerdown +0132 2040051c call p_mouse_sensor_powerdown 0133 20203bc9 branch mouse_init + 8 p_mouse_customer_key_connect_vin: 0134 6fe0c912 fetch 1 ,mem_customer_key_gpio 0135 c17f8000 rtneq gpio_disable 0136 c4038000 rtnbit0 7 -0137 704dc601 jam 1 ,mem_mouse_customer_key_connect_vin_flag +0137 704db801 jam 1 ,mem_mouse_customer_key_connect_vin_flag 0138 20600000 rtn p_mouse_le_name_load: @@ -485,8 +485,8 @@ 0172 c6930000 rtnmark0 mark_24g 0173 20403f70 call mouse_motion 0174 24740000 nrtn user -0175 6fe0cdc5 fetch 1 ,mem_long_sleep_flag -0176 704dc500 jam 0 ,mem_long_sleep_flag +0175 6fe0cdb7 fetch 1 ,mem_long_sleep_flag +0176 704db700 jam 0 ,mem_long_sleep_flag 0177 245a018f ncall p_mouse_short_sleep_clear_wake ,blank 0178 6fe44bab fetch mouse_flag_len ,mem_mouse_flag 0179 c30a817c bbit0 mouse_enable_keyboard ,p_mouse_24g_mouse_package_data @@ -561,7 +561,7 @@ 01b0 67e0cba4 store 1 ,mem_mouse_search_dongle_action 01b1 6fe14bbc fetch 2 ,mem_mouse_24g_search_dongle_time_init 01b2 67e14ab2 store 2 ,mem_mouse_no_data_timer -01b3 2020051e branch p_mouse_sensor_powerdown +01b3 2020051c branch p_mouse_sensor_powerdown p_mouse_24g_search_dongle_success: 01b4 6fe0c8a7 fetch 1 ,mem_24g_abort_pac @@ -650,7 +650,7 @@ 01f3 684a488d fetcht 4 ,mem_24g_fast_conn_addr 01f4 98467c00 isub temp ,null 01f5 2022a2cb branch g24_ch ,zero -01f6 204005c2 call p_power_ctrl_txpower_incrs +01f6 204005c0 call p_power_ctrl_txpower_incrs 01f7 20402724 call power_ctrl_pac_succ_decrs 01f8 202022cb branch g24_ch @@ -669,7 +669,7 @@ p_mouse_dpi_check_once: 0201 6fe44bab fetch mouse_flag_len ,mem_mouse_flag 0202 c4140000 rtnbit0 mouse_enable_select_device_by_dpi_button -0203 20200583 branch p_mouse_dpi_check +0203 20200581 branch p_mouse_dpi_check p_mouse_select_device_by_pb_button_check_once: 0204 704b9403 jam 0x03 ,mem_mouse_pbkey_press_status @@ -717,8 +717,8 @@ 0220 58000006 setarg pan_reg_config 0221 20405b0d call twspi_read 0222 c281be23 bbit1 3 ,mouse_app_enter_hibernate + 3 -0223 20400519 call p_mouse_sensor_reset -0224 2040051e call p_mouse_sensor_powerdown +0223 20400517 call p_mouse_sensor_reset +0224 2040051c call p_mouse_sensor_powerdown 0225 20203e23 branch mouse_app_enter_hibernate + 3 p_mouse_setgpio_hibernate: @@ -731,7 +731,7 @@ 022c 6848c910 fetcht 1 ,mem_matrix_public_gpio 022d 20406042 call gpio_clr_wake 022e 6fe0c920 fetch 1 ,mem_mouse_sensor_sdio_gpio -022f 2040055a call p_mouse_gpio_config_output_high +022f 20400558 call p_mouse_gpio_config_output_high 0230 d8400003 arg 3 ,temp 0231 20403f56 call mouse_gpio_config_input_pu 0232 20400258 call p_mouse_lpm_before_common @@ -796,7 +796,7 @@ 025b 20406050 call gpio_config_input 025c 20403f88 call mouse_wheel_check 025d 6fe0c91f fetch 1 ,mem_mouse_sensor_sclk_gpio -025e 2040055a call p_mouse_gpio_config_output_high +025e 20400558 call p_mouse_gpio_config_output_high 025f 20203e44 branch mouse_lpm_before_common + 4 p_g24_nodata_transmit: @@ -810,7 +810,7 @@ 0265 204004df call p_g24_lpm_wait 0266 24740000 nrtn user 0267 204026c4 call g24_setgpio_lpm_before -0268 704dc501 jam 1 ,mem_long_sleep_flag +0268 704db701 jam 1 ,mem_long_sleep_flag 0269 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag 026a 245a0226 ncall p_mouse_setgpio_hibernate ,blank 026b 6fe4485c fetch 8 ,mem_24g_enter_hibernate @@ -942,8 +942,6 @@ 02c9 20204827 branch mouse_24g_start_pair_mode p_mouse_24g_hibernate_set: - -p_mouse_24g_hibernate_set_next: 02ca 7048a500 jam 0 ,mem_24g_attempt_fail_flag 02cb 20402652 call g24_transmit_next_packet 02cc 5fffffff setarg -1 @@ -951,7 +949,7 @@ 02ce 58000000 setarg 0 02cf 67e3c8d0 store 7 ,mem_mouse_key 02d0 704be101 jam 1 ,mem_sensor_shutdown_flag -02d1 2040051e call p_mouse_sensor_powerdown +02d1 2040051c call p_mouse_sensor_powerdown 02d2 20200265 branch p_g24_long_sleep p_g24_pair_dispatch: @@ -1118,8 +1116,8 @@ 0345 70492705 jam mx8650 ,mem_config_sensor_type 0346 20404232 call mouse_sensor_reset 0347 20407d12 call delay_10ms -0348 da604da7 arg mem_sensor_8650_init_new ,regc -0349 20200514 branch p_mouse_sensor_end +0348 da604d99 arg mem_sensor_8650_init_new ,regc +0349 20200512 branch p_mouse_sensor_end p_mouse_3205_3t_init_param: 034a 58000049 setarg 0x49 @@ -1535,7 +1533,7 @@ p_mouse_commbination_key_start: 045a 6048cb9d storet 1 ,mem_mouse_commbination_key -045b 20400527 call p_mouse_check_key_gpio +045b 20400525 call p_mouse_check_key_gpio 045c 1fe17e07 and pdata ,0x07 ,pdata 045d 6848cb9d fetcht 1 ,mem_mouse_commbination_key 045e 98467c00 isub temp ,null @@ -1737,12 +1735,12 @@ 04f0 20400322 call p_mouse_seting_sensor_type 04f1 20403f7e call mouse_zwheel 04f2 20403f83 call mouse_t_zwheel -04f3 20400525 call p_mouse_key +04f3 20400523 call p_mouse_key 04f4 6fe0c8d0 fetch 1 ,mem_mouse_key 04f5 1fe17e1f and_into 0x1f ,pdata 04f6 67e0c8d0 store 1 ,mem_mouse_key -04f7 24340509 nbranch p_mouse_motion_nodata ,user -04f8 2040050b call p_mouse_drawing_optima +04f7 24344728 nbranch mouse_drawing_optima_init ,user +04f8 20400509 call p_mouse_drawing_optima 04f9 20204544 branch mouse_no_data_timer_init p_mouse_check_sensor_data: @@ -1766,285 +1764,281 @@ 0507 c0ac41b2 bne pka8g2_id1 ,mouse_twspi_reset 0508 20204279 branch mouse_p3212_sensor_motion_2 -p_mouse_motion_nodata: -0509 20404728 call mouse_drawing_optima_init -050a 20600000 rtn - p_mouse_drawing_optima: -050b 6fe0c927 fetch 1 ,mem_config_sensor_type -050c c1018000 rtneq p3212 -050d c1058000 rtneq ka8g2 -050e 2020471a branch mouse_drawing_optima +0509 6fe0c927 fetch 1 ,mem_config_sensor_type +050a c1018000 rtneq p3212 +050b c1058000 rtneq ka8g2 +050c 2020471a branch mouse_drawing_optima p_mouse_sensor_poweron: -050f 20403f65 call mouse_sensor_spi_init -0510 6fe0c927 fetch 1 ,mem_config_sensor_type -0511 c0058516 beq ka8g2 ,p_mouse_ka8g2_sensor_init -0512 20404232 call mouse_sensor_reset -0513 da604aa3 arg mem_sensor_poweron_init ,regc +050d 20403f65 call mouse_sensor_spi_init +050e 6fe0c927 fetch 1 ,mem_config_sensor_type +050f c0058514 beq ka8g2 ,p_mouse_ka8g2_sensor_init +0510 20404232 call mouse_sensor_reset +0511 da604aa3 arg mem_sensor_poweron_init ,regc p_mouse_sensor_end: -0514 2040422b call mouse_sensor_wr_seq -0515 20200322 branch p_mouse_seting_sensor_type +0512 2040422b call mouse_sensor_wr_seq +0513 20200322 branch p_mouse_seting_sensor_type p_mouse_ka8g2_sensor_init: -0516 2040051c call p_mouse_ka8g2_sensor_reset -0517 da604be3 arg mem_ka8g2_sensor_poweron_init ,regc -0518 20200514 branch p_mouse_sensor_end +0514 2040051a call p_mouse_ka8g2_sensor_reset +0515 da604be3 arg mem_ka8g2_sensor_poweron_init ,regc +0516 20200512 branch p_mouse_sensor_end p_mouse_sensor_reset: -0519 6fe0c927 fetch 1 ,mem_config_sensor_type -051a c005851c beq ka8g2 ,p_mouse_ka8g2_sensor_reset -051b 20204232 branch mouse_sensor_reset +0517 6fe0c927 fetch 1 ,mem_config_sensor_type +0518 c005851a beq ka8g2 ,p_mouse_ka8g2_sensor_reset +0519 20204232 branch mouse_sensor_reset p_mouse_ka8g2_sensor_reset: -051c 58009706 setarg 0x9706 -051d 20204233 branch mouse_sensor_reset_end +051a 58009706 setarg 0x9706 +051b 20204233 branch mouse_sensor_reset_end p_mouse_sensor_powerdown: -051e 204041a7 call mouse_init_sunt -051f 20403f65 call mouse_sensor_spi_init -0520 6fe0c927 fetch 1 ,mem_config_sensor_type -0521 c0058523 beq ka8g2 ,p_mouse_ka8g2_sensor_powerdown -0522 2020423e branch mouse_sensor_powerdown_end +051c 204041a7 call mouse_init_sunt +051d 20403f65 call mouse_sensor_spi_init +051e 6fe0c927 fetch 1 ,mem_config_sensor_type +051f c0058521 beq ka8g2 ,p_mouse_ka8g2_sensor_powerdown +0520 2020423e branch mouse_sensor_powerdown_end p_mouse_ka8g2_sensor_powerdown: -0523 58001f06 setarg 0x1f06 -0524 20205b0c branch twspi_write +0521 58001f06 setarg 0x1f06 +0522 20205b0c branch twspi_write p_mouse_key: -0525 20400527 call p_mouse_check_key_gpio -0526 202040dd branch mouse_key + 1 +0523 20400525 call p_mouse_check_key_gpio +0524 202040dd branch mouse_key + 1 p_mouse_check_key_gpio: -0527 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag -0528 245a4121 ncall mouse_check_key_gpio_once ,blank -0529 da200000 arg 0 ,rega -052a 20400531 call p_mouse_check_lkey_gpio -052b 20400536 call p_mouse_check_rkey_gpio -052c 2040053b call p_mouse_check_mkey_gpio -052d 20400540 call p_mouse_check_bkkey_gpio -052e 2040054d call p_mouse_check_fwkey_gpio -052f 20400560 call p_mouse_check_customerkey_gpio -0530 2020411f branch mouse_check_key_gpio_next + 1 +0525 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag +0526 245a4121 ncall mouse_check_key_gpio_once ,blank +0527 da200000 arg 0 ,rega +0528 2040052f call p_mouse_check_lkey_gpio +0529 20400534 call p_mouse_check_rkey_gpio +052a 20400539 call p_mouse_check_mkey_gpio +052b 2040053e call p_mouse_check_bkkey_gpio +052c 2040054b call p_mouse_check_fwkey_gpio +052d 2040055e call p_mouse_check_customerkey_gpio +052e 2020411f branch mouse_check_key_gpio_next + 1 p_mouse_check_lkey_gpio: -0531 6fe0c918 fetch 1 ,mem_lbutton_gpio -0532 2040055a call p_mouse_gpio_config_output_high -0533 20404124 call mouse_check_lkey_gpio -0534 6848c918 fetcht 1 ,mem_lbutton_gpio -0535 20203f56 branch mouse_gpio_config_input_pu +052f 6fe0c918 fetch 1 ,mem_lbutton_gpio +0530 20400558 call p_mouse_gpio_config_output_high +0531 20404124 call mouse_check_lkey_gpio +0532 6848c918 fetcht 1 ,mem_lbutton_gpio +0533 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_rkey_gpio: -0536 6fe0c919 fetch 1 ,mem_rbutton_gpio -0537 2040055a call p_mouse_gpio_config_output_high -0538 2040412a call mouse_check_rkey_gpio -0539 6848c919 fetcht 1 ,mem_rbutton_gpio -053a 20203f56 branch mouse_gpio_config_input_pu +0534 6fe0c919 fetch 1 ,mem_rbutton_gpio +0535 20400558 call p_mouse_gpio_config_output_high +0536 2040412a call mouse_check_rkey_gpio +0537 6848c919 fetcht 1 ,mem_rbutton_gpio +0538 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_mkey_gpio: -053b 6fe0c91a fetch 1 ,mem_mbutton_gpio -053c 2040055a call p_mouse_gpio_config_output_high -053d 20404130 call mouse_check_mkey_gpio -053e 6848c91a fetcht 1 ,mem_mbutton_gpio -053f 20203f56 branch mouse_gpio_config_input_pu +0539 6fe0c91a fetch 1 ,mem_mbutton_gpio +053a 20400558 call p_mouse_gpio_config_output_high +053b 20404130 call mouse_check_mkey_gpio +053c 6848c91a fetcht 1 ,mem_mbutton_gpio +053d 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_bkkey_gpio: -0540 6fe0c90d fetch 1 ,mem_bk_button_gpio -0541 c17f8000 rtneq gpio_disable -0542 704b9603 jam mouse_bk_key ,mem_mouse_key_temp -0543 6fe0cb91 fetch 1 ,mem_mouse_bkkey_press_status -0544 1fe22600 copy pdata ,regc -0545 6848c90d fetcht 1 ,mem_bk_button_gpio -0546 6fe0c910 fetch 1 ,mem_matrix_public_gpio -0547 c07f8549 beq gpio_disable ,p_mouse_3io6key_bk_check -0548 2020413e branch mouse_check_bkkey_gpio_next +053e 6fe0c90d fetch 1 ,mem_bk_button_gpio +053f c17f8000 rtneq gpio_disable +0540 704b9603 jam mouse_bk_key ,mem_mouse_key_temp +0541 6fe0cb91 fetch 1 ,mem_mouse_bkkey_press_status +0542 1fe22600 copy pdata ,regc +0543 6848c90d fetcht 1 ,mem_bk_button_gpio +0544 6fe0c910 fetch 1 ,mem_matrix_public_gpio +0545 c07f8547 beq gpio_disable ,p_mouse_3io6key_bk_check +0546 2020413e branch mouse_check_bkkey_gpio_next p_mouse_3io6key_bk_check: -0549 6fe0c90d fetch 1 ,mem_bk_button_gpio -054a 2040055d call p_mouse_gpio_config_output_low -054b 6848c90d fetcht 1 ,mem_bk_button_gpio -054c 2020414b branch mouse_3io6key_bk_check +0547 6fe0c90d fetch 1 ,mem_bk_button_gpio +0548 2040055b call p_mouse_gpio_config_output_low +0549 6848c90d fetcht 1 ,mem_bk_button_gpio +054a 2020414b branch mouse_3io6key_bk_check p_mouse_check_fwkey_gpio: -054d 6fe0c90e fetch 1 ,mem_fw_button_gpio -054e c17f8000 rtneq gpio_disable -054f 704b9604 jam mouse_fw_key ,mem_mouse_key_temp -0550 6fe0cb92 fetch 1 ,mem_mouse_fwkey_press_status -0551 1fe22600 copy pdata ,regc -0552 6848c90e fetcht 1 ,mem_fw_button_gpio -0553 6fe0c910 fetch 1 ,mem_matrix_public_gpio -0554 c07f8556 beq gpio_disable ,p_mouse_3io6key_fw_check -0555 20204157 branch mouse_check_fwkey_gpio_next +054b 6fe0c90e fetch 1 ,mem_fw_button_gpio +054c c17f8000 rtneq gpio_disable +054d 704b9604 jam mouse_fw_key ,mem_mouse_key_temp +054e 6fe0cb92 fetch 1 ,mem_mouse_fwkey_press_status +054f 1fe22600 copy pdata ,regc +0550 6848c90e fetcht 1 ,mem_fw_button_gpio +0551 6fe0c910 fetch 1 ,mem_matrix_public_gpio +0552 c07f8554 beq gpio_disable ,p_mouse_3io6key_fw_check +0553 20204157 branch mouse_check_fwkey_gpio_next p_mouse_3io6key_fw_check: -0556 6fe0c90e fetch 1 ,mem_fw_button_gpio -0557 2040055d call p_mouse_gpio_config_output_low -0558 6848c90e fetcht 1 ,mem_fw_button_gpio -0559 20204164 branch mouse_3io6key_fw_check +0554 6fe0c90e fetch 1 ,mem_fw_button_gpio +0555 2040055b call p_mouse_gpio_config_output_low +0556 6848c90e fetcht 1 ,mem_fw_button_gpio +0557 20204164 branch mouse_3io6key_fw_check p_mouse_gpio_config_output_high: -055a c17f8000 rtneq gpio_disable -055b d840003f arg gpcfg_output_high ,temp -055c 20206093 branch gpio_config_function_int +0558 c17f8000 rtneq gpio_disable +0559 d840003f arg gpcfg_output_high ,temp +055a 20206093 branch gpio_config_function_int p_mouse_gpio_config_output_low: -055d c17f8000 rtneq gpio_disable -055e d840003e arg gpcfg_output_low ,temp -055f 20206093 branch gpio_config_function_int +055b c17f8000 rtneq gpio_disable +055c d840003e arg gpcfg_output_low ,temp +055d 20206093 branch gpio_config_function_int p_mouse_check_customerkey_gpio: -0560 6fe0cdc6 fetch 1 ,mem_mouse_customer_key_connect_vin_flag -0561 203a416a branch mouse_check_customerkey_gpio ,blank -0562 704b8b00 jam 0 ,mem_customer_key -0563 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0564 c40a8000 rtnbit0 mouse_enable_keyboard -0565 6fe0c912 fetch 1 ,mem_customer_key_gpio -0566 793ffe07 set0 gpio_active_bit ,pdata -0567 67e0c912 store 1 ,mem_customer_key_gpio -0568 704b9607 jam mouse_customer_key ,mem_mouse_key_temp -0569 6fe0cb95 fetch 1 ,mem_mouse_customerkey_press_status -056a 1fe22600 copy pdata ,regc +055e 6fe0cdb8 fetch 1 ,mem_mouse_customer_key_connect_vin_flag +055f 203a416a branch mouse_check_customerkey_gpio ,blank +0560 704b8b00 jam 0 ,mem_customer_key +0561 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0562 c40a8000 rtnbit0 mouse_enable_keyboard +0563 6fe0c912 fetch 1 ,mem_customer_key_gpio +0564 793ffe07 set0 gpio_active_bit ,pdata +0565 67e0c912 store 1 ,mem_customer_key_gpio +0566 704b9607 jam mouse_customer_key ,mem_mouse_key_temp +0567 6fe0cb95 fetch 1 ,mem_mouse_customerkey_press_status +0568 1fe22600 copy pdata ,regc p_mouse_3io6key_customerkey_check: -056b 6fe0c912 fetch 1 ,mem_customer_key_gpio -056c 2040055d call p_mouse_gpio_config_output_low -056d 6848c912 fetcht 1 ,mem_customer_key_gpio -056e 20404195 call mouse_3io6key_check -056f 67e0cb95 store 1 ,mem_mouse_customerkey_press_status -0570 20404174 call mouse_check_customerkey_state -0571 6848c912 fetcht 1 ,mem_customer_key_gpio -0572 20203f56 branch mouse_gpio_config_input_pu +0569 6fe0c912 fetch 1 ,mem_customer_key_gpio +056a 2040055b call p_mouse_gpio_config_output_low +056b 6848c912 fetcht 1 ,mem_customer_key_gpio +056c 20404195 call mouse_3io6key_check +056d 67e0cb95 store 1 ,mem_mouse_customerkey_press_status +056e 20404174 call mouse_check_customerkey_state +056f 6848c912 fetcht 1 ,mem_customer_key_gpio +0570 20203f56 branch mouse_gpio_config_input_pu p_mouse_idle: -0573 20400578 call p_mouse_low_voltage_led_no_enter_lpm -0574 20407936 call ui_check_paring_button -0575 20400583 call p_mouse_dpi_check -0576 2040057c call p_mouse_select_device_check -0577 20204650 branch mouse_idle + 5 +0571 20400576 call p_mouse_low_voltage_led_no_enter_lpm +0572 20407936 call ui_check_paring_button +0573 20400581 call p_mouse_dpi_check +0574 2040057a call p_mouse_select_device_check +0575 20204650 branch mouse_idle + 5 p_mouse_low_voltage_led_no_enter_lpm: -0578 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config -0579 c301c990 bbit0 mouse_enable_low_led ,mouse_low_voltage_led_no_enter_lpm +0576 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config +0577 c301c990 bbit0 mouse_enable_low_led ,mouse_low_voltage_led_no_enter_lpm p_mouse_low_voltage_led_no_enter_lpm_next: -057a 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -057b 20204992 branch mouse_low_voltage_led_no_enter_lpm + 2 +0578 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0579 20204992 branch mouse_low_voltage_led_no_enter_lpm + 2 p_mouse_select_device_check: -057c 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -057d c2948580 bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge -057e c29b8580 bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge -057f 20600000 rtn +057a 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +057b c294857e bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge +057c c29b857e bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge +057d 20600000 rtn p_mouse_select_device_by_pb_button_check_judge: -0580 6fe1478c fetch 2 ,mem_ui_state_map -0581 c2830204 bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once -0582 2020465a branch mouse_select_device_by_pb_button +057e 6fe1478c fetch 2 ,mem_ui_state_map +057f c2830204 bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once +0580 2020465a branch mouse_select_device_by_pb_button p_mouse_dpi_check: -0583 6fe0c90f fetch 1 ,mem_dpi_button_gpio -0584 c17f8000 rtneq gpio_disable -0585 da200000 arg 0 ,rega -0586 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp -0587 6848c90f fetcht 1 ,mem_dpi_button_gpio -0588 2040058a call p_mouse_dpi_key_check -0589 2020402f branch mouse_dpi_check_next +0581 6fe0c90f fetch 1 ,mem_dpi_button_gpio +0582 c17f8000 rtneq gpio_disable +0583 da200000 arg 0 ,rega +0584 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp +0585 6848c90f fetcht 1 ,mem_dpi_button_gpio +0586 20400588 call p_mouse_dpi_key_check +0587 2020402f branch mouse_dpi_check_next p_mouse_dpi_key_check: -058a 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -058b c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd -058c 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status -058d 1fe22600 copy pdata ,regc -058e 6fe0c910 fetch 1 ,mem_matrix_public_gpio -058f c07f8591 beq gpio_disable ,p_mouse_3io6key_dpi_check -0590 2020403f branch mouse_dpi_key_check_next +0588 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0589 c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd +058a 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status +058b 1fe22600 copy pdata ,regc +058c 6fe0c910 fetch 1 ,mem_matrix_public_gpio +058d c07f858f beq gpio_disable ,p_mouse_3io6key_dpi_check +058e 2020403f branch mouse_dpi_key_check_next p_mouse_3io6key_dpi_check: -0591 6fe0c90f fetch 1 ,mem_dpi_button_gpio -0592 2040055d call p_mouse_gpio_config_output_low -0593 6848c90f fetcht 1 ,mem_dpi_button_gpio -0594 20204195 branch mouse_3io6key_check +058f 6fe0c90f fetch 1 ,mem_dpi_button_gpio +0590 2040055b call p_mouse_gpio_config_output_low +0591 6848c90f fetcht 1 ,mem_dpi_button_gpio +0592 20204195 branch mouse_3io6key_check p_mouse_dpi_process: -0595 20404072 call mouse_dpi_ghost_check -0596 20740000 rtn user +0593 20404072 call mouse_dpi_ghost_check +0594 20740000 rtn user p_mouse_dpi_process_next: -0597 6fe0c992 fetch 1 ,mem_mouse_dpi -0598 1fe0fe01 increase 1 ,pdata -0599 1fe17e03 and pdata ,0x03 ,pdata +0595 6fe0c992 fetch 1 ,mem_mouse_dpi +0596 1fe0fe01 increase 1 ,pdata +0597 1fe17e03 and pdata ,0x03 ,pdata p_mouse_dpi_store: -059a 67e0c992 store 1 ,mem_mouse_dpi -059b 20400320 call p_mouse_seting_dpi -059c 20204643 branch mouse_store_eerpom_dpi +0598 67e0c992 store 1 ,mem_mouse_dpi +0599 20400320 call p_mouse_seting_dpi +059a 20204643 branch mouse_store_eerpom_dpi p_power_ctrl_start: -059d 6fe1478c fetch 2 ,mem_ui_state_map -059e c3858000 rtnbit1 ui_state_ble_adv -059f c3838000 rtnbit1 ui_state_bt_reconnect -05a0 c3830000 rtnbit1 ui_state_bt_discovery -05a1 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr -05a2 204025cb call rssi_average -05a3 6048c8c7 storet 1 ,mem_rssi_avg_received -05a4 6fe0c8cc fetch 1 ,mem_rssi_dis_max_24g -05a5 c51305a7 bmark1 mark_24g ,p_power_ctrl_start_next -05a6 6fe0c8cf fetch 1 ,mem_rssi_dis_max_ble +059b 6fe1478c fetch 2 ,mem_ui_state_map +059c c3858000 rtnbit1 ui_state_ble_adv +059d c3838000 rtnbit1 ui_state_bt_reconnect +059e c3830000 rtnbit1 ui_state_bt_discovery +059f 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr +05a0 204025cb call rssi_average +05a1 6048c8c7 storet 1 ,mem_rssi_avg_received +05a2 6fe0c8cc fetch 1 ,mem_rssi_dis_max_24g +05a3 c51305a5 bmark1 mark_24g ,p_power_ctrl_start_next +05a4 6fe0c8cf fetch 1 ,mem_rssi_dis_max_ble p_power_ctrl_start_next: -05a7 98467c00 isub temp ,null -05a8 242105c1 nbranch p_power_ctrl_txpower_incrs_force ,positive -05a9 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -05aa 1fe67c02 sub pdata ,2 ,null -05ab 242105af nbranch p_power_ctrl_txpower_decrs_check ,positive -05ac 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -05ad c00005c2 beq 0 ,p_power_ctrl_txpower_incrs -05ae 20600000 rtn +05a5 98467c00 isub temp ,null +05a6 242105bf nbranch p_power_ctrl_txpower_incrs_force ,positive +05a7 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +05a8 1fe67c02 sub pdata ,2 ,null +05a9 242105ad nbranch p_power_ctrl_txpower_decrs_check ,positive +05aa 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +05ab c00005c0 beq 0 ,p_power_ctrl_txpower_incrs +05ac 20600000 rtn p_power_ctrl_txpower_decrs_check: -05af 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -05b0 6848c8ca fetcht 1 ,mem_power_ctrl_pac_succ_cnt_init -05b1 98467c00 isub temp ,null -05b2 24628000 nrtn zero -05b3 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt +05ad 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +05ae 6848c8ca fetcht 1 ,mem_power_ctrl_pac_succ_cnt_init +05af 98467c00 isub temp ,null +05b0 24628000 nrtn zero +05b1 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt p_power_ctrl_txpower_decrs: -05b4 6848c8c7 fetcht 1 ,mem_rssi_avg_received -05b5 6fe0c8cb fetch 1 ,mem_rssi_dis_min_24g -05b6 c51305b8 bmark1 mark_24g ,p_power_ctrl_txpower_decrs_next -05b7 6fe0c8ce fetch 1 ,mem_rssi_dis_min_ble +05b2 6848c8c7 fetcht 1 ,mem_rssi_avg_received +05b3 6fe0c8cb fetch 1 ,mem_rssi_dis_min_24g +05b4 c51305b6 bmark1 mark_24g ,p_power_ctrl_txpower_decrs_next +05b5 6fe0c8ce fetch 1 ,mem_rssi_dis_min_ble p_power_ctrl_txpower_decrs_next: -05b8 98467c00 isub temp ,null -05b9 24610000 nrtn positive -05ba 6fe0c8c8 fetch 1 ,mem_power_ctrl_level -05bb c000271b beq 0 ,power_ctrl_decrs_level0 -05bc 1fe0ffff increase -1 ,pdata -05bd 67e0c8c8 store 1 ,mem_power_ctrl_level -05be c00105c9 beq 2 ,p_power_ctrl_decrs_level2 -05bf c000a711 beq 1 ,power_ctrl_decrs_level1 -05c0 2020271b branch power_ctrl_decrs_level0 +05b6 98467c00 isub temp ,null +05b7 24610000 nrtn positive +05b8 6fe0c8c8 fetch 1 ,mem_power_ctrl_level +05b9 c000271b beq 0 ,power_ctrl_decrs_level0 +05ba 1fe0ffff increase -1 ,pdata +05bb 67e0c8c8 store 1 ,mem_power_ctrl_level +05bc c00105c7 beq 2 ,p_power_ctrl_decrs_level2 +05bd c000a711 beq 1 ,power_ctrl_decrs_level1 +05be 2020271b branch power_ctrl_decrs_level0 p_power_ctrl_txpower_incrs_force: -05c1 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt +05bf 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt p_power_ctrl_txpower_incrs: -05c2 6fe0c8c8 fetch 1 ,mem_power_ctrl_level -05c3 c00185c8 beq 3 ,p_power_ctrl_incrs_level3 -05c4 1fe0fe01 increase 1 ,pdata -05c5 67e0c8c8 store 1 ,mem_power_ctrl_level -05c6 c000a711 beq 1 ,power_ctrl_incrs_level1 -05c7 c00105c9 beq 2 ,p_power_ctrl_incrs_level2 +05c0 6fe0c8c8 fetch 1 ,mem_power_ctrl_level +05c1 c00185c6 beq 3 ,p_power_ctrl_incrs_level3 +05c2 1fe0fe01 increase 1 ,pdata +05c3 67e0c8c8 store 1 ,mem_power_ctrl_level +05c4 c000a711 beq 1 ,power_ctrl_incrs_level1 +05c5 c00105c7 beq 2 ,p_power_ctrl_incrs_level2 p_power_ctrl_incrs_level3: -05c8 202005c9 branch p_power_ctrl_incrs_level2 +05c6 202005c7 branch p_power_ctrl_incrs_level2 p_power_ctrl_decrs_level2: p_power_ctrl_incrs_level2: -05c9 7041e803 jam tx_power_3db ,mem_tx_power -05ca 20600000 rtn +05c7 7041e803 jam tx_power_3db ,mem_tx_power +05c8 20600000 rtn org 0x3bc1 mouse_init: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/program/patch.prog (revision 4201) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/program/patch.prog (working copy) @@ -6,9 +6,6 @@ //define DOUBLE_DPI_KEY define LOGO_LED define S201X_SENSOR -//define RGB_LED -//define RGB_LED_MKEY -//define RGB_LED_ON_AFTER_PAIR //define COMMBINATION_DPI define G24_RETRANSMIT_DPI //define YJX_ICE_SELECT_ANGLE @@ -466,12 +463,7 @@ call enable_authrom call p_mouse_setting_config call mouse_init_sunt - rtn wake -ifdef RGB_LED_ON_AFTER_PAIR - jam 1,mem_rgb_led_on_continue_1min_timeout_flag - call p_mouse_rgb_led_off_time_init -endif - + rtn wake ifdef COMMBINATION_DPI jam 0,mem_mouse_commbination_dpi_check_enable endif @@ -874,11 +866,6 @@ /////////////////////////////////// g24 250Hz use lpm////////////////////////////////////// p_mouse_app_enter_hibernate: // 1.3mA hibernate after sensroe reset -ifdef RGB_LED - fetch 1,mem_mouse_rgb_adc_no_power_flag - nrtn blank - jam 1,mem_mouse_rgb_adc_no_power_flag -endif setarg PAN_REG_CONFIG call twspi_read bbit1 3,mouse_app_enter_hibernate+3 @@ -1035,9 +1022,6 @@ branch mouse_bt_hid_handshake+3 p_mouse_le_bb_event_connected: -ifdef RGB_LED_ON_AFTER_PAIR - call p_mouse_rgb_led_on_check_next -endif ifdef COMMBINATION_DPI jam 1,mem_mouse_commbination_dpi_check_enable endif @@ -1046,9 +1030,6 @@ p_mouse_bb_event_connected: call mouse_no_data_timer_init -ifdef RGB_LED_ON_AFTER_PAIR - call p_mouse_rgb_led_on_check_next -endif ifdef COMMBINATION_DPI jam 1,mem_mouse_commbination_dpi_check_enable endif @@ -1088,9 +1069,6 @@ rtn p_mouse_24g_pairing_complete: -ifdef RGB_LED_ON_AFTER_PAIR - call p_mouse_rgb_led_on_check_next -endif ifdef COMMBINATION_DPI jam 1,mem_mouse_commbination_dpi_check_enable endif @@ -1100,9 +1078,6 @@ branch mouse_24g_pairing_complete p_mouse_24g_attempt_success: -ifdef RGB_LED_ON_AFTER_PAIR - call p_mouse_rgb_led_on_check_next -endif ifdef COMMBINATION_DPI jam 1,mem_mouse_commbination_dpi_check_enable endif @@ -1149,11 +1124,6 @@ branch mouse_24g_start_pair_mode p_mouse_24g_hibernate_set: -ifdef RGB_LED - set0 mark_24g,mark - branch p_mouse_rgb_led_off -endif -p_mouse_24g_hibernate_set_next: jam 0,mem_24g_attempt_fail_flag call g24_transmit_next_packet setarg -1 @@ -1238,10 +1208,6 @@ p_g24_dispatch: -ifdef RGB_LED - fetch 1,mem_sensor_shutdown_flag - ncall p_mouse_enable_g24_mark,blank -endif bmark1 mark_24g_rxmode,g24_receive_dispatch p_g24_transmit_dispatch: rtnmark0 mark_24g @@ -1251,18 +1217,6 @@ endif branch g24_transmit_dispatch+2 -ifdef RGB_LED -p_mouse_enable_g24_mark: - jam ON,mem_rgb_led_on_enable - call p_mouse_rgb_led_on_enable_timer_init - set1 mark_24g,mark - rtn -p_mouse_rgb_led_on_enable_timer_init: - jam OFF,mem_rgb_led_off_enable //gpio ouput active 1s enable rgb led - jam 11,mem_rgb_led_on_enable_timer - rtn -endif - p_mouse_start_work: fetch MOUSE_FLAG_LEN,mem_mouse_flag bbit1 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,mouse_24g_first_start_auto_pair_mode @@ -1408,11 +1362,6 @@ // call mouse_device_poweron_timer call p_mouse_dpi_led_blink_delay_timer call p_mouse_led_multi_timer -ifdef RGB_LED - call p_mouse_rgb_led_off_enable_timer - call p_mouse_rgb_led_on_enable_timer - call p_mouse_rgb_led_on_timer -endif ifdef LOGO_LED call p_mouse_logo_led_on_timer endif @@ -1466,86 +1415,6 @@ branch timer_single_step endif -ifdef RGB_LED -/**************************rgb led start************************/ -/********************* -****rgb on--mbutton output active 1s**** -****rgb off--mbutton output active 3s**** -**********************/ -p_mouse_rgb_led_off: - jam 0,mem_rgb_led_on_continue_1min_timeout_flag - branch p_mouse_rgb_led_off_time_init - -p_mouse_rgb_led_off_enable_timer: - fetch 1,mem_rgb_led_off_enable - rtn blank - arg mem_rgb_led_off_enable_timer,regc - arg p_mouse_rgb_led_off_timeout,regb - branch timer_single_step - -p_mouse_rgb_led_off_timeout: - call p_mouse_mbutton_function_enable - fetch 1,mem_rgb_led_on_continue_1min_timeout_flag - nrtn blank - jam 0,mem_rgb_led_on_continue_1min_timeout_flag - fetch 1,mem_device_flag - beq MODE_24G_DEVICE,p_mouse_24g_hibernate_set_next - branch mouse_app_enter_hibernate+3 - -p_mouse_rgb_led_off_time_init: - jam 0x1e,mem_rgb_led_off_enable_timer - jam ON,mem_rgb_led_off_enable -p_mouse_mbutton_function_disable: -ifdef RGB_LED_MKEY - jam ON,mem_mbutton_function_disable -endif - fetcht 1,mem_mouse_rgb_ctrl_gpio - branch p_mouse_multi_led_on - -p_mouse_rgb_led_on_enable_timer: - fetch 1,mem_rgb_led_off_enable - nrtn blank - fetch 1,mem_rgb_led_on_enable_timer - rtn blank - beq 1,p_mouse_rgb_led_enable_timeout - increase -1,pdata - store 1,mem_rgb_led_on_enable_timer - branch p_mouse_mbutton_function_disable - -p_mouse_rgb_led_enable_timeout: - jam 0,mem_rgb_led_on_enable_timer -p_mouse_mbutton_function_enable: -ifdef RGB_LED_MKEY - jam OFF,mem_mbutton_function_disable -endif - fetcht 1,mem_mouse_rgb_ctrl_gpio - call p_mouse_multi_led_on -ifdef RGB_LED_MKEY - nop 12000 - fetcht 1,mem_mouse_rgb_ctrl_gpio - call mouse_gpio_config_input_pu -endif - rtn - -p_mouse_rgb_led_on_timer: - fetch 1,mem_rgb_led_on_enable - nrtn blank - fetch 1,mem_rgb_led_off_enable - nrtn blank -p_mouse_rgb_led_on: - fetch 2,mem_rgb_led_on_timer - increase 1,pdata - store 2,mem_rgb_led_on_timer - arg 0x0258,temp //1min - isub temp,null - nrtn zero -p_mouse_rgb_led_on_continue_1min: - jam 1,mem_rgb_led_on_continue_1min_timeout_flag - call p_mouse_rgb_led_on_timer_init - branch p_mouse_rgb_led_off_time_init - -endif - //================led multi start===================// //===multi led parm init===// @@ -2082,11 +1951,8 @@ fetch 1,mem_mouse_key and_into 0x1f,pdata store 1,mem_mouse_key - nbranch p_mouse_motion_nodata,user + nbranch mouse_drawing_optima_init,user call p_mouse_drawing_optima -ifdef RGB_LED - call p_mouse_rgb_led_on_check -endif branch mouse_no_data_timer_init p_mouse_check_sensor_data: @@ -2109,20 +1975,6 @@ bne PKA8G2_ID1,mouse_twspi_reset branch mouse_p3212_sensor_motion_2 -p_mouse_motion_nodata: - call mouse_drawing_optima_init -ifdef RGB_LED - fetch 2,mem_rgb_led_off_check_count - increase 1,pdata - store 2,mem_rgb_led_off_check_count - arg 0x0258,temp - isub temp,null - nrtn zero - setarg 0 - store 2,mem_rgb_led_off_check_count - jam OFF,mem_rgb_led_on_enable -endif - rtn p_mouse_drawing_optima: fetch 1,mem_config_sensor_type @@ -2130,27 +1982,7 @@ rtneq KA8G2 branch mouse_drawing_optima -ifdef RGB_LED -p_mouse_rgb_led_on_check: - fetch 2,mem_rgb_led_on_check_count - increase 1,pdata - store 2,mem_rgb_led_on_check_count - arg 0x0258,temp - isub temp,null - nrtn zero - setarg 0 - store 2,mem_rgb_led_on_check_count - fetch 1,mem_rgb_led_on_enable - rtneq ON -p_mouse_rgb_led_on_check_next: - jam ON,mem_rgb_led_on_enable - jam OFF,mem_rgb_led_off_enable - jam 11,mem_rgb_led_on_enable_timer -p_mouse_rgb_led_on_timer_init: - setarg 0 - store 2,mem_rgb_led_on_timer - rtn -endif + p_mouse_sensor_poweron: call mouse_sensor_spi_init fetch 1,mem_config_sensor_type @@ -2226,10 +2058,6 @@ fetcht 1,mem_rbutton_gpio branch mouse_gpio_config_input_pu p_mouse_check_mkey_gpio: -ifdef RGB_LED_MKEY - fetch 1,mem_mbutton_function_disable - nrtn blank -endif fetch 1,mem_mbutton_gpio call p_mouse_gpio_config_output_high call mouse_check_mkey_gpio Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/sched/mouse.dat (revision 4201) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_2ch_ADC_M3/sched/mouse.dat (working copy) @@ -143,7 +143,6 @@ mem_dpi_led_gpio:ff #03 mem_firebutton_gpio:ff -mem_mouse_rgb_ctrl_gpio:ff mem_sensor_angle_default:02 #00--6CLK 01--9CLK 02--12CLK 03--3CLK mem_sensor_angle_switch:02 #00--6CLK 01--9CLK 02--12CLK 03--3CLK mem_config_sensor_dpi:00 #00--1200 01--1600