Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/DPI_3mode_3ch_HYC-344/output/eeprom.dat (revision 4422) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/DPI_3mode_3ch_HYC-344/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -3e +3a 18 c2 84 @@ -83,7 +83,7 @@ c0 67 85 -ef +ee c0 68 03 @@ -91,7 +91,7 @@ c0 68 85 -91 +90 c0 69 83 @@ -99,7 +99,7 @@ c0 6a 05 -78 +77 c0 6b 02 @@ -119,7 +119,7 @@ c0 6f 05 -c9 +c8 c0 6f 80 @@ -199,7 +199,7 @@ c0 76 86 -07 +06 20 20 13 @@ -1279,7 +1279,7 @@ 20 40 05 -88 +87 20 20 3b @@ -1843,7 +1843,7 @@ 20 20 05 -88 +87 20 40 26 @@ -2075,7 +2075,7 @@ 20 20 05 -db +da 6f e0 cb @@ -2231,11 +2231,11 @@ 20 40 05 -83 +82 20 40 05 -88 +87 20 20 3e @@ -2283,7 +2283,7 @@ 20 40 05 -c3 +c2 d8 40 00 @@ -2471,7 +2471,7 @@ 20 40 05 -c3 +c2 20 20 3e @@ -3079,7 +3079,7 @@ 20 40 05 -88 +87 20 20 02 @@ -3699,7 +3699,7 @@ 20 20 05 -7d +7c 70 49 27 @@ -4827,7 +4827,7 @@ 20 40 05 -91 +90 1f e1 7e @@ -5423,7 +5423,7 @@ 20 40 05 -5a +59 20 40 03 @@ -5439,7 +5439,7 @@ 20 40 05 -8f +8e 6f e0 c8 @@ -5454,24 +5454,16 @@ d0 24 34 -05 -55 +47 +28 20 40 05 -57 +55 20 20 45 44 -20 -40 -47 -28 -20 -60 -00 -00 6f e0 c9 @@ -5480,6 +5472,10 @@ 01 80 00 +c1 +06 +80 +00 20 20 47 @@ -5507,7 +5503,7 @@ 20 40 05 -65 +64 67 e1 48 @@ -5519,7 +5515,7 @@ 20 40 05 -65 +64 67 e1 48 @@ -5531,11 +5527,11 @@ c2 85 85 -68 +67 c3 05 85 -6c +6b 20 60 00 @@ -5547,7 +5543,7 @@ 20 40 05 -6c +6b 1f e6 7e @@ -5583,7 +5579,7 @@ 24 41 05 -75 +74 6f e1 4c @@ -5615,7 +5611,7 @@ c0 05 85 -7f +7e 20 40 42 @@ -5635,7 +5631,7 @@ 20 40 05 -86 +85 da 60 4b @@ -5655,7 +5651,7 @@ c0 05 85 -86 +85 20 20 42 @@ -5683,7 +5679,7 @@ c0 05 85 -8d +8c 20 20 42 @@ -5699,7 +5695,7 @@ 20 40 05 -91 +90 20 20 40 @@ -5719,23 +5715,23 @@ 20 40 05 -9a +99 20 40 05 -9f +9e 20 40 05 -a4 +a3 20 40 05 -a9 +a8 20 40 05 -b6 +b5 20 20 41 @@ -5747,7 +5743,7 @@ 20 40 05 -c3 +c2 20 40 41 @@ -5767,7 +5763,7 @@ 20 40 05 -c3 +c2 20 40 41 @@ -5787,7 +5783,7 @@ 20 40 05 -c3 +c2 20 40 41 @@ -5831,7 +5827,7 @@ c0 7f 85 -b2 +b1 20 20 41 @@ -5843,7 +5839,7 @@ 20 40 05 -c6 +c5 68 48 c9 @@ -5883,7 +5879,7 @@ c0 7f 85 -bf +be 20 20 41 @@ -5895,7 +5891,7 @@ 20 40 05 -c6 +c5 68 48 c9 @@ -5931,7 +5927,7 @@ 20 40 05 -ce +cd 20 40 79 @@ -5939,11 +5935,11 @@ 20 40 05 -db +da 20 40 05 -d2 +d1 20 20 46 @@ -5971,11 +5967,11 @@ c2 94 85 -d6 +d5 c2 9b 85 -d6 +d5 20 60 00 @@ -5987,7 +5983,7 @@ c2 83 05 -d9 +d8 20 20 46 @@ -6031,7 +6027,7 @@ 20 40 05 -e4 +e3 20 20 40 @@ -6059,7 +6055,7 @@ c0 7f 85 -eb +ea 20 20 40 @@ -6071,7 +6067,7 @@ 20 40 05 -c6 +c5 68 48 c9 @@ -6103,11 +6099,11 @@ c0 06 86 -02 +01 c0 01 85 -fd +fc 6f e0 c9 @@ -6155,7 +6151,7 @@ 20 20 05 -fa +f9 6f e0 c9 @@ -6175,7 +6171,7 @@ 20 20 05 -fa +f9 6f e1 47 @@ -6208,8 +6204,8 @@ 20 26 f6 -7c -b9 +48 +16 aa 55 40 @@ -7135,10 +7131,10 @@ 49 09 5a -26 +22 +01 +b4 34 -19 -04 09 00 ff @@ -7580,16 +7576,16 @@ 02 40 00 -a9 +a5 1d 55 aa aa 55 -50 +e0 9f -f4 -93 +52 +99 ff ff ff @@ -8188,5 +8184,9 @@ ff ff ff -25 -da +ff +ff +ff +ff +b0 +91 Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/DPI_3mode_3ch_HYC-344/output/program.lis (revision 4422) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/DPI_3mode_3ch_HYC-344/output/program.lis (working copy) @@ -19,16 +19,16 @@ 0010 c0650262 beq patch19_2 ,p_mouse_lpm_before_common 0011 c06600cb beq patch19_4 ,p_mouse_adc_read_start 0012 c0670546 beq patch19_6 ,p_mouse_motion -0013 c06785ef beq patch19_7 ,p_mouse_dpi_process +0013 c06785ee beq patch19_7 ,p_mouse_dpi_process 0014 c068034b beq patch1a_0 ,p_mouse_seting_dpi -0015 c0688591 beq patch1a_1 ,p_mouse_check_key_gpio +0015 c0688590 beq patch1a_1 ,p_mouse_check_key_gpio 0016 c0698383 beq patch1a_3 ,p_mouse_init_sunt -0017 c06a0578 beq patch1a_4 ,p_mouse_sensor_poweron +0017 c06a0577 beq patch1a_4 ,p_mouse_sensor_poweron 0018 c06b0284 beq patch1a_6 ,p_mouse_priority_bb_event 0019 c06c83b3 beq patch1b_1 ,p_mouse_bb_event_timer 001a c06d04d0 beq patch1b_2 ,p_mouse_start_discovery 001b c06d84da beq patch1b_3 ,p_mouse_stop_discovery -001c c06f05c9 beq patch1b_6 ,p_mouse_idle +001c c06f05c8 beq patch1b_6 ,p_mouse_idle 001d c06f8058 beq patch1b_7 ,p_mouse_ready_reconnection_by_button 001e c0708050 beq patch1c_1 ,p_mouse_led_off 001f c071004c beq patch1c_2 ,p_mouse_led_on @@ -50,7 +50,7 @@ 002d c074830a beq patch3d_1 ,p_g24_reconn_dispatch 002e c07501cc beq patch3d_2 ,p_g24_transmit_no_interrupt 002f c076053b beq patch3d_4 ,p_g24_lpm_wait -0030 c0768607 beq patch3d_5 ,p_power_ctrl_start +0030 c0768606 beq patch3d_5 ,p_power_ctrl_start 0031 2020137c branch loop p_lpm_dispatch: @@ -414,7 +414,7 @@ 013b 20403d8a call mouse_usb_check_enable 013c 20404728 call mouse_drawing_optima_init 013d 2040017e call p_mouse_cb_fuction -013e 20400588 call p_mouse_sensor_powerdown +013e 20400587 call p_mouse_sensor_powerdown 013f 20203bc9 branch mouse_init + 8 p_mouse_le_name_load: @@ -593,7 +593,7 @@ 01c8 67e0cba4 store 1 ,mem_mouse_search_dongle_action 01c9 6fe14bbc fetch 2 ,mem_mouse_24g_search_dongle_time_init 01ca 67e14ab2 store 2 ,mem_mouse_no_data_timer -01cb 20200588 branch p_mouse_sensor_powerdown +01cb 20200587 branch p_mouse_sensor_powerdown p_g24_transmit_no_interrupt: 01cc 20402631 call g24_txdata_prep @@ -671,7 +671,7 @@ p_mouse_dpi_check_once: 0203 6fe44bab fetch mouse_flag_len ,mem_mouse_flag 0204 c4140000 rtnbit0 mouse_enable_select_device_by_dpi_button -0205 202005db branch p_mouse_dpi_check +0205 202005da branch p_mouse_dpi_check p_mouse_24g_led_timer_check: 0206 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag @@ -726,8 +726,8 @@ 0229 58000006 setarg pan_reg_config 022a 20405b0d call twspi_read 022b c281be23 bbit1 3 ,mouse_app_enter_hibernate + 3 -022c 20400583 call p_mouse_sensor_reset -022d 20400588 call p_mouse_sensor_powerdown +022c 20400582 call p_mouse_sensor_reset +022d 20400587 call p_mouse_sensor_powerdown 022e 20203e23 branch mouse_app_enter_hibernate + 3 p_mouse_setgpio_hibernate: @@ -741,7 +741,7 @@ 0236 6848c910 fetcht 1 ,mem_matrix_public_gpio 0237 20406042 call gpio_clr_wake 0238 6fe0c920 fetch 1 ,mem_mouse_sensor_sdio_gpio -0239 204005c3 call p_mouse_gpio_config_output_high +0239 204005c2 call p_mouse_gpio_config_output_high 023a d8400003 arg 3 ,temp 023b 20403f56 call mouse_gpio_config_input_pu 023c 20400262 call p_mouse_lpm_before_common @@ -806,7 +806,7 @@ 0265 20406050 call gpio_config_input 0266 20403f88 call mouse_wheel_check 0267 6fe0c91f fetch 1 ,mem_mouse_sensor_sclk_gpio -0268 204005c3 call p_mouse_gpio_config_output_high +0268 204005c2 call p_mouse_gpio_config_output_high 0269 20203e44 branch mouse_lpm_before_common + 4 p_g24_nodata_transmit: @@ -997,8 +997,6 @@ 02f8 20204827 branch mouse_24g_start_pair_mode p_mouse_24g_hibernate_set: - -p_mouse_24g_hibernate_set_next: 02f9 7048a500 jam 0 ,mem_24g_attempt_fail_flag 02fa 20402652 call g24_transmit_next_packet 02fb 5fffffff setarg -1 @@ -1006,7 +1004,7 @@ 02fd 58000000 setarg 0 02fe 67e3c8d0 store 7 ,mem_mouse_key 02ff 704be101 jam 1 ,mem_sensor_shutdown_flag -0300 20400588 call p_mouse_sensor_powerdown +0300 20400587 call p_mouse_sensor_powerdown 0301 2020026f branch p_g24_long_sleep p_g24_pair_dispatch: @@ -1227,7 +1225,7 @@ p_mouse_s203_init_param: 0399 7049270d jam s203 ,mem_config_sensor_type 039a da604cad arg mem_sensor_s203_init ,regc -039b 2020057d branch p_mouse_sensor_end +039b 2020057c branch p_mouse_sensor_end p_mouse_s201x_init_param: 039c 7049270c jam s201x ,mem_config_sensor_type @@ -1651,7 +1649,7 @@ p_mouse_commbination_key_start: 04b4 6048cb9d storet 1 ,mem_mouse_commbination_key -04b5 20400591 call p_mouse_check_key_gpio +04b5 20400590 call p_mouse_check_key_gpio 04b6 1fe17e07 and pdata ,0x07 ,pdata 04b7 6848cb9d fetcht 1 ,mem_mouse_commbination_key 04b8 98467c00 isub temp ,null @@ -1852,283 +1850,280 @@ 0547 58000000 setarg 0 0548 67e348d1 store 6 ,mem_mouse_x 0549 20404240 call mouse_check_sensor_data -054a 2040055a call p_mouse_data_zoom +054a 20400559 call p_mouse_data_zoom 054b 2040034d call p_mouse_seting_sensor_type 054c 20403f7e call mouse_zwheel 054d 20403f83 call mouse_t_zwheel -054e 2040058f call p_mouse_key +054e 2040058e call p_mouse_key 054f 6fe0c8d0 fetch 1 ,mem_mouse_key 0550 1fe17e1f and_into 0x1f ,pdata 0551 67e0c8d0 store 1 ,mem_mouse_key -0552 24340555 nbranch p_mouse_motion_nodata ,user -0553 20400557 call p_mouse_drawing_optima +0552 24344728 nbranch mouse_drawing_optima_init ,user +0553 20400555 call p_mouse_drawing_optima 0554 20204544 branch mouse_no_data_timer_init -p_mouse_motion_nodata: -0555 20404728 call mouse_drawing_optima_init -0556 20600000 rtn - p_mouse_drawing_optima: -0557 6fe0c927 fetch 1 ,mem_config_sensor_type -0558 c1018000 rtneq p3212 -0559 2020471a branch mouse_drawing_optima +0555 6fe0c927 fetch 1 ,mem_config_sensor_type +0556 c1018000 rtneq p3212 +0557 c1068000 rtneq s203 +0558 2020471a branch mouse_drawing_optima p_mouse_data_zoom: -055a 6fe0c927 fetch 1 ,mem_config_sensor_type -055b c1818000 rtnne p3212 -055c 6fe0c992 fetch 1 ,mem_mouse_dpi -055d c1810000 rtnne mouse_dpi_level3 -055e 6fe148d1 fetch 2 ,mem_mouse_x -055f 20400565 call p_mouse_2400_zoom -0560 67e148d1 store 2 ,mem_mouse_x -0561 6fe148d3 fetch 2 ,mem_mouse_y -0562 20400565 call p_mouse_2400_zoom -0563 67e148d3 store 2 ,mem_mouse_y -0564 20600000 rtn +0559 6fe0c927 fetch 1 ,mem_config_sensor_type +055a c1818000 rtnne p3212 +055b 6fe0c992 fetch 1 ,mem_mouse_dpi +055c c1810000 rtnne mouse_dpi_level3 +055d 6fe148d1 fetch 2 ,mem_mouse_x +055e 20400564 call p_mouse_2400_zoom +055f 67e148d1 store 2 ,mem_mouse_x +0560 6fe148d3 fetch 2 ,mem_mouse_y +0561 20400564 call p_mouse_2400_zoom +0562 67e148d3 store 2 ,mem_mouse_y +0563 20600000 rtn p_mouse_2400_zoom: -0565 c2858568 bbit1 11 ,p_mouse_xy_inverse -0566 c305856c bbit0 11 ,p_mouse_xy_zoom -0567 20600000 rtn +0564 c2858567 bbit1 11 ,p_mouse_xy_inverse +0565 c305856b bbit0 11 ,p_mouse_xy_zoom +0566 20600000 rtn p_mouse_xy_inverse: -0568 1fe67e00 sub pdata ,0 ,pdata -0569 2040056c call p_mouse_xy_zoom -056a 1fe67e00 sub pdata ,0 ,pdata -056b 20600000 rtn +0567 1fe67e00 sub pdata ,0 ,pdata +0568 2040056b call p_mouse_xy_zoom +0569 1fe67e00 sub pdata ,0 ,pdata +056a 20600000 rtn p_mouse_xy_zoom: -056c 1fe3fe00 lshift pdata ,pdata -056d 793ffe0e set0 14 ,pdata -056e 793ffe0f set0 15 ,pdata -056f 67e14cb8 store 2 ,mem_mouse_temp_data -0570 6fe0ccb9 fetch 1 ,mem_mouse_temp_data + 1 -0571 1fe67c07 sub pdata ,0x7 ,null -0572 24410575 ncall p_mouse_xy_forward_overflow ,positive -0573 6fe14cb8 fetch 2 ,mem_mouse_temp_data -0574 20600000 rtn +056b 1fe3fe00 lshift pdata ,pdata +056c 793ffe0e set0 14 ,pdata +056d 793ffe0f set0 15 ,pdata +056e 67e14cb8 store 2 ,mem_mouse_temp_data +056f 6fe0ccb9 fetch 1 ,mem_mouse_temp_data + 1 +0570 1fe67c07 sub pdata ,0x7 ,null +0571 24410574 ncall p_mouse_xy_forward_overflow ,positive +0572 6fe14cb8 fetch 2 ,mem_mouse_temp_data +0573 20600000 rtn p_mouse_xy_forward_overflow: -0575 580007ff setarg 0x7ff -0576 67e14cb8 store 2 ,mem_mouse_temp_data -0577 20600000 rtn +0574 580007ff setarg 0x7ff +0575 67e14cb8 store 2 ,mem_mouse_temp_data +0576 20600000 rtn p_mouse_sensor_poweron: -0578 20403f65 call mouse_sensor_spi_init -0579 6fe0c927 fetch 1 ,mem_config_sensor_type -057a c005857f beq ka8g2 ,p_mouse_ka8g2_sensor_init -057b 20404232 call mouse_sensor_reset -057c da604aa3 arg mem_sensor_poweron_init ,regc +0577 20403f65 call mouse_sensor_spi_init +0578 6fe0c927 fetch 1 ,mem_config_sensor_type +0579 c005857e beq ka8g2 ,p_mouse_ka8g2_sensor_init +057a 20404232 call mouse_sensor_reset +057b da604aa3 arg mem_sensor_poweron_init ,regc p_mouse_sensor_end: -057d 2040422b call mouse_sensor_wr_seq -057e 2020034d branch p_mouse_seting_sensor_type +057c 2040422b call mouse_sensor_wr_seq +057d 2020034d branch p_mouse_seting_sensor_type p_mouse_ka8g2_sensor_init: -057f 20400586 call p_mouse_ka8g2_sensor_reset -0580 da604be3 arg mem_ka8g2_sensor_poweron_init ,regc -0581 2040422b call mouse_sensor_wr_seq -0582 2020034d branch p_mouse_seting_sensor_type +057e 20400585 call p_mouse_ka8g2_sensor_reset +057f da604be3 arg mem_ka8g2_sensor_poweron_init ,regc +0580 2040422b call mouse_sensor_wr_seq +0581 2020034d branch p_mouse_seting_sensor_type p_mouse_sensor_reset: -0583 6fe0c927 fetch 1 ,mem_config_sensor_type -0584 c0058586 beq ka8g2 ,p_mouse_ka8g2_sensor_reset -0585 20204232 branch mouse_sensor_reset +0582 6fe0c927 fetch 1 ,mem_config_sensor_type +0583 c0058585 beq ka8g2 ,p_mouse_ka8g2_sensor_reset +0584 20204232 branch mouse_sensor_reset p_mouse_ka8g2_sensor_reset: -0586 58009706 setarg 0x9706 -0587 20204233 branch mouse_sensor_reset_end +0585 58009706 setarg 0x9706 +0586 20204233 branch mouse_sensor_reset_end p_mouse_sensor_powerdown: -0588 204041a7 call mouse_init_sunt -0589 20403f65 call mouse_sensor_spi_init -058a 6fe0c927 fetch 1 ,mem_config_sensor_type -058b c005858d beq ka8g2 ,p_mouse_ka8g2_sensor_powerdown -058c 2020423e branch mouse_sensor_powerdown_end +0587 204041a7 call mouse_init_sunt +0588 20403f65 call mouse_sensor_spi_init +0589 6fe0c927 fetch 1 ,mem_config_sensor_type +058a c005858c beq ka8g2 ,p_mouse_ka8g2_sensor_powerdown +058b 2020423e branch mouse_sensor_powerdown_end p_mouse_ka8g2_sensor_powerdown: -058d 58001f06 setarg 0x1f06 -058e 20205b0c branch twspi_write +058c 58001f06 setarg 0x1f06 +058d 20205b0c branch twspi_write p_mouse_key: -058f 20400591 call p_mouse_check_key_gpio -0590 202040dd branch mouse_key + 1 +058e 20400590 call p_mouse_check_key_gpio +058f 202040dd branch mouse_key + 1 p_mouse_check_key_gpio: -0591 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag -0592 245a4121 ncall mouse_check_key_gpio_once ,blank -0593 da200000 arg 0 ,rega -0594 2040059a call p_mouse_check_lkey_gpio -0595 2040059f call p_mouse_check_rkey_gpio -0596 204005a4 call p_mouse_check_mkey_gpio -0597 204005a9 call p_mouse_check_bkkey_gpio -0598 204005b6 call p_mouse_check_fwkey_gpio -0599 2020411e branch mouse_check_key_gpio_next +0590 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag +0591 245a4121 ncall mouse_check_key_gpio_once ,blank +0592 da200000 arg 0 ,rega +0593 20400599 call p_mouse_check_lkey_gpio +0594 2040059e call p_mouse_check_rkey_gpio +0595 204005a3 call p_mouse_check_mkey_gpio +0596 204005a8 call p_mouse_check_bkkey_gpio +0597 204005b5 call p_mouse_check_fwkey_gpio +0598 2020411e branch mouse_check_key_gpio_next p_mouse_check_lkey_gpio: -059a 6fe0c918 fetch 1 ,mem_lbutton_gpio -059b 204005c3 call p_mouse_gpio_config_output_high -059c 20404124 call mouse_check_lkey_gpio -059d 6848c918 fetcht 1 ,mem_lbutton_gpio -059e 20203f56 branch mouse_gpio_config_input_pu +0599 6fe0c918 fetch 1 ,mem_lbutton_gpio +059a 204005c2 call p_mouse_gpio_config_output_high +059b 20404124 call mouse_check_lkey_gpio +059c 6848c918 fetcht 1 ,mem_lbutton_gpio +059d 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_rkey_gpio: -059f 6fe0c919 fetch 1 ,mem_rbutton_gpio -05a0 204005c3 call p_mouse_gpio_config_output_high -05a1 2040412a call mouse_check_rkey_gpio -05a2 6848c919 fetcht 1 ,mem_rbutton_gpio -05a3 20203f56 branch mouse_gpio_config_input_pu +059e 6fe0c919 fetch 1 ,mem_rbutton_gpio +059f 204005c2 call p_mouse_gpio_config_output_high +05a0 2040412a call mouse_check_rkey_gpio +05a1 6848c919 fetcht 1 ,mem_rbutton_gpio +05a2 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_mkey_gpio: -05a4 6fe0c91a fetch 1 ,mem_mbutton_gpio -05a5 204005c3 call p_mouse_gpio_config_output_high -05a6 20404130 call mouse_check_mkey_gpio -05a7 6848c91a fetcht 1 ,mem_mbutton_gpio -05a8 20203f56 branch mouse_gpio_config_input_pu +05a3 6fe0c91a fetch 1 ,mem_mbutton_gpio +05a4 204005c2 call p_mouse_gpio_config_output_high +05a5 20404130 call mouse_check_mkey_gpio +05a6 6848c91a fetcht 1 ,mem_mbutton_gpio +05a7 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_bkkey_gpio: -05a9 6fe0c90d fetch 1 ,mem_bk_button_gpio -05aa c17f8000 rtneq gpio_disable -05ab 704b9603 jam mouse_bk_key ,mem_mouse_key_temp -05ac 6fe0cb91 fetch 1 ,mem_mouse_bkkey_press_status -05ad 1fe22600 copy pdata ,regc -05ae 6848c90d fetcht 1 ,mem_bk_button_gpio -05af 6fe0c910 fetch 1 ,mem_matrix_public_gpio -05b0 c07f85b2 beq gpio_disable ,p_mouse_3io6key_bk_check -05b1 2020413e branch mouse_check_bkkey_gpio_next +05a8 6fe0c90d fetch 1 ,mem_bk_button_gpio +05a9 c17f8000 rtneq gpio_disable +05aa 704b9603 jam mouse_bk_key ,mem_mouse_key_temp +05ab 6fe0cb91 fetch 1 ,mem_mouse_bkkey_press_status +05ac 1fe22600 copy pdata ,regc +05ad 6848c90d fetcht 1 ,mem_bk_button_gpio +05ae 6fe0c910 fetch 1 ,mem_matrix_public_gpio +05af c07f85b1 beq gpio_disable ,p_mouse_3io6key_bk_check +05b0 2020413e branch mouse_check_bkkey_gpio_next p_mouse_3io6key_bk_check: -05b2 6fe0c90d fetch 1 ,mem_bk_button_gpio -05b3 204005c6 call p_mouse_gpio_config_output_low -05b4 6848c90d fetcht 1 ,mem_bk_button_gpio -05b5 2020414b branch mouse_3io6key_bk_check +05b1 6fe0c90d fetch 1 ,mem_bk_button_gpio +05b2 204005c5 call p_mouse_gpio_config_output_low +05b3 6848c90d fetcht 1 ,mem_bk_button_gpio +05b4 2020414b branch mouse_3io6key_bk_check p_mouse_check_fwkey_gpio: -05b6 6fe0c90e fetch 1 ,mem_fw_button_gpio -05b7 c17f8000 rtneq gpio_disable -05b8 704b9604 jam mouse_fw_key ,mem_mouse_key_temp -05b9 6fe0cb92 fetch 1 ,mem_mouse_fwkey_press_status -05ba 1fe22600 copy pdata ,regc -05bb 6848c90e fetcht 1 ,mem_fw_button_gpio -05bc 6fe0c910 fetch 1 ,mem_matrix_public_gpio -05bd c07f85bf beq gpio_disable ,p_mouse_3io6key_fw_check -05be 20204157 branch mouse_check_fwkey_gpio_next +05b5 6fe0c90e fetch 1 ,mem_fw_button_gpio +05b6 c17f8000 rtneq gpio_disable +05b7 704b9604 jam mouse_fw_key ,mem_mouse_key_temp +05b8 6fe0cb92 fetch 1 ,mem_mouse_fwkey_press_status +05b9 1fe22600 copy pdata ,regc +05ba 6848c90e fetcht 1 ,mem_fw_button_gpio +05bb 6fe0c910 fetch 1 ,mem_matrix_public_gpio +05bc c07f85be beq gpio_disable ,p_mouse_3io6key_fw_check +05bd 20204157 branch mouse_check_fwkey_gpio_next p_mouse_3io6key_fw_check: -05bf 6fe0c90e fetch 1 ,mem_fw_button_gpio -05c0 204005c6 call p_mouse_gpio_config_output_low -05c1 6848c90e fetcht 1 ,mem_fw_button_gpio -05c2 20204164 branch mouse_3io6key_fw_check +05be 6fe0c90e fetch 1 ,mem_fw_button_gpio +05bf 204005c5 call p_mouse_gpio_config_output_low +05c0 6848c90e fetcht 1 ,mem_fw_button_gpio +05c1 20204164 branch mouse_3io6key_fw_check p_mouse_gpio_config_output_high: -05c3 c17f8000 rtneq gpio_disable -05c4 d840003f arg gpcfg_output_high ,temp -05c5 20206093 branch gpio_config_function_int +05c2 c17f8000 rtneq gpio_disable +05c3 d840003f arg gpcfg_output_high ,temp +05c4 20206093 branch gpio_config_function_int p_mouse_gpio_config_output_low: -05c6 c17f8000 rtneq gpio_disable -05c7 d840003e arg gpcfg_output_low ,temp -05c8 20206093 branch gpio_config_function_int +05c5 c17f8000 rtneq gpio_disable +05c6 d840003e arg gpcfg_output_low ,temp +05c7 20206093 branch gpio_config_function_int p_mouse_idle: -05c9 204005ce call p_mouse_low_voltage_led_no_enter_lpm -05ca 20407936 call ui_check_paring_button -05cb 204005db call p_mouse_dpi_check -05cc 204005d2 call p_mouse_select_device_check -05cd 20204650 branch mouse_idle + 5 +05c8 204005cd call p_mouse_low_voltage_led_no_enter_lpm +05c9 20407936 call ui_check_paring_button +05ca 204005da call p_mouse_dpi_check +05cb 204005d1 call p_mouse_select_device_check +05cc 20204650 branch mouse_idle + 5 p_mouse_low_voltage_led_no_enter_lpm: -05ce 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config -05cf c301c990 bbit0 mouse_enable_low_led ,mouse_low_voltage_led_no_enter_lpm +05cd 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config +05ce c301c990 bbit0 mouse_enable_low_led ,mouse_low_voltage_led_no_enter_lpm p_mouse_low_voltage_led_no_enter_lpm_next: -05d0 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -05d1 20204992 branch mouse_low_voltage_led_no_enter_lpm + 2 +05cf 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05d0 20204992 branch mouse_low_voltage_led_no_enter_lpm + 2 p_mouse_select_device_check: -05d2 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -05d3 c29485d6 bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge -05d4 c29b85d6 bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge -05d5 20600000 rtn +05d1 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05d2 c29485d5 bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge +05d3 c29b85d5 bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge +05d4 20600000 rtn p_mouse_select_device_by_pb_button_check_judge: -05d6 6fe1478c fetch 2 ,mem_ui_state_map -05d7 c28305d9 bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once -05d8 2020465a branch mouse_select_device_by_pb_button +05d5 6fe1478c fetch 2 ,mem_ui_state_map +05d6 c28305d8 bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once +05d7 2020465a branch mouse_select_device_by_pb_button p_mouse_select_device_by_pb_button_check_once: -05d9 704b9403 jam 0x03 ,mem_mouse_pbkey_press_status -05da 2020020e branch p_mouse_select_device_by_pb_button +05d8 704b9403 jam 0x03 ,mem_mouse_pbkey_press_status +05d9 2020020e branch p_mouse_select_device_by_pb_button p_mouse_dpi_check: -05db 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -05dc c2974036 bbit1 mouse_enable_dpi_key_connect_adc ,mouse_dpi_check_connect_adc -05dd 6fe0c90f fetch 1 ,mem_dpi_button_gpio -05de c17f8000 rtneq gpio_disable -05df da200000 arg 0 ,rega -05e0 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp -05e1 6848c90f fetcht 1 ,mem_dpi_button_gpio -05e2 204005e4 call p_mouse_dpi_key_check -05e3 2020402f branch mouse_dpi_check_next +05da 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05db c2974036 bbit1 mouse_enable_dpi_key_connect_adc ,mouse_dpi_check_connect_adc +05dc 6fe0c90f fetch 1 ,mem_dpi_button_gpio +05dd c17f8000 rtneq gpio_disable +05de da200000 arg 0 ,rega +05df 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp +05e0 6848c90f fetcht 1 ,mem_dpi_button_gpio +05e1 204005e3 call p_mouse_dpi_key_check +05e2 2020402f branch mouse_dpi_check_next p_mouse_dpi_key_check: -05e4 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -05e5 c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd -05e6 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status -05e7 1fe22600 copy pdata ,regc -05e8 6fe0c910 fetch 1 ,mem_matrix_public_gpio -05e9 c07f85eb beq gpio_disable ,p_mouse_3io6key_dpi_check -05ea 2020403f branch mouse_dpi_key_check_next +05e3 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05e4 c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd +05e5 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status +05e6 1fe22600 copy pdata ,regc +05e7 6fe0c910 fetch 1 ,mem_matrix_public_gpio +05e8 c07f85ea beq gpio_disable ,p_mouse_3io6key_dpi_check +05e9 2020403f branch mouse_dpi_key_check_next p_mouse_3io6key_dpi_check: -05eb 6fe0c90f fetch 1 ,mem_dpi_button_gpio -05ec 204005c6 call p_mouse_gpio_config_output_low -05ed 6848c90f fetcht 1 ,mem_dpi_button_gpio -05ee 20204195 branch mouse_3io6key_check +05ea 6fe0c90f fetch 1 ,mem_dpi_button_gpio +05eb 204005c5 call p_mouse_gpio_config_output_low +05ec 6848c90f fetcht 1 ,mem_dpi_button_gpio +05ed 20204195 branch mouse_3io6key_check p_mouse_dpi_process: -05ef 6fe0cca6 fetch 1 ,mem_mouse_dpi_led_blink_enable -05f0 207a0000 rtn blank -05f1 20404072 call mouse_dpi_ghost_check -05f2 20740000 rtn user +05ee 6fe0cca6 fetch 1 ,mem_mouse_dpi_led_blink_enable +05ef 207a0000 rtn blank +05f0 20404072 call mouse_dpi_ghost_check +05f1 20740000 rtn user p_mouse_dpi_process_next: -05f3 6fe0c927 fetch 1 ,mem_config_sensor_type -05f4 c0068602 beq s203 ,p_mouse_dpi_process_s203 -05f5 c00185fd beq p3212 ,p_mouse_dpi_set_4_level +05f2 6fe0c927 fetch 1 ,mem_config_sensor_type +05f3 c0068601 beq s203 ,p_mouse_dpi_process_s203 +05f4 c00185fc beq p3212 ,p_mouse_dpi_set_4_level +05f5 6fe0c992 fetch 1 ,mem_mouse_dpi 05f6 6fe0c992 fetch 1 ,mem_mouse_dpi -05f7 6fe0c992 fetch 1 ,mem_mouse_dpi -05f8 1fe0fe01 increase 1 ,pdata -05f9 1fe17e03 and pdata ,0x03 ,pdata +05f7 1fe0fe01 increase 1 ,pdata +05f8 1fe17e03 and pdata ,0x03 ,pdata p_mouse_dpi_store: -05fa 67e0c992 store 1 ,mem_mouse_dpi -05fb 2040034b call p_mouse_seting_dpi -05fc 20204643 branch mouse_store_eerpom_dpi +05f9 67e0c992 store 1 ,mem_mouse_dpi +05fa 2040034b call p_mouse_seting_dpi +05fb 20204643 branch mouse_store_eerpom_dpi p_mouse_dpi_set_4_level: -05fd 6fe0c992 fetch 1 ,mem_mouse_dpi -05fe 1fe0fe01 increase 1 ,pdata -05ff 1fe67c04 sub pdata ,4 ,null -0600 2042fe60 call set_pdata_0 ,zero -0601 202005fa branch p_mouse_dpi_store +05fc 6fe0c992 fetch 1 ,mem_mouse_dpi +05fd 1fe0fe01 increase 1 ,pdata +05fe 1fe67c04 sub pdata ,4 ,null +05ff 2042fe60 call set_pdata_0 ,zero +0600 202005f9 branch p_mouse_dpi_store p_mouse_dpi_process_s203: -0602 6fe0c992 fetch 1 ,mem_mouse_dpi -0603 1fe0fe01 increase 1 ,pdata -0604 1fe67c05 sub pdata ,5 ,null -0605 2042fe60 call set_pdata_0 ,zero -0606 202005fa branch p_mouse_dpi_store +0601 6fe0c992 fetch 1 ,mem_mouse_dpi +0602 1fe0fe01 increase 1 ,pdata +0603 1fe67c05 sub pdata ,5 ,null +0604 2042fe60 call set_pdata_0 ,zero +0605 202005f9 branch p_mouse_dpi_store p_power_ctrl_start: -0607 6fe1478c fetch 2 ,mem_ui_state_map -0608 c3858000 rtnbit1 ui_state_ble_adv -0609 c3838000 rtnbit1 ui_state_bt_reconnect -060a c3830000 rtnbit1 ui_state_bt_discovery -060b 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr -060c 204025cb call rssi_average -060d 6048c8c7 storet 1 ,mem_rssi_avg_received -060e 202026f6 branch power_ctrl_rssi_avg_compare +0606 6fe1478c fetch 2 ,mem_ui_state_map +0607 c3858000 rtnbit1 ui_state_ble_adv +0608 c3838000 rtnbit1 ui_state_bt_reconnect +0609 c3830000 rtnbit1 ui_state_bt_discovery +060a 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr +060b 204025cb call rssi_average +060c 6048c8c7 storet 1 ,mem_rssi_avg_received +060d 202026f6 branch power_ctrl_rssi_avg_compare org 0x3bc1 mouse_init: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/DPI_3mode_3ch_HYC-344/program/patch.prog (revision 4422) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/DPI_3mode_3ch_HYC-344/program/patch.prog (working copy) @@ -6,7 +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 @@ -864,19 +863,11 @@ /////////////////////////////////// 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 call p_mouse_sensor_reset call p_mouse_sensor_powerdown -ifdef RGB_LED - branch p_mouse_rgb_led_off -endif branch mouse_app_enter_hibernate+3 p_mouse_setgpio_hibernate: @@ -1182,11 +1173,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 @@ -1262,10 +1248,6 @@ branch g24_pair_init_param 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 @@ -1275,18 +1257,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 @@ -1332,11 +1302,11 @@ p_mouse_seting_S203_dpi: call mouse_sensor_disable_wp fetch 1,mem_mouse_dpi - beq MOUSE_DPI_LEVEL1,p_mouse_set_S203_dpi_0 //1600 + beq MOUSE_DPI_LEVEL1,p_mouse_set_S203_dpi_0 //1600 beq MOUSE_DPI_LEVEL2,p_mouse_set_S203_dpi_1 //2400 beq MOUSE_DPI_LEVEL3,p_mouse_set_S203_dpi_2 //3200 beq MOUSE_DPI_LEVEL4,p_mouse_set_S203_dpi_3 //5000 - beq MOUSE_DPI_LEVEL5,p_mouse_set_S203_dpi_4 //800 + beq MOUSE_DPI_LEVEL5,p_mouse_set_S203_dpi_4 //800 p_mouse_set_S203_dpi_0: fetch 1,mem_sensor_s203_dpi_0 branch p_mouse_p3212_dpi @@ -1357,20 +1327,6 @@ call mouse_p3212_dpi branch mouse_sensor_enable_wp - - //store 1,mem_mouse_cpi_count - // copy pdata,rega - // lshift8 pdata,pdata - // copy pdata,regadisable - // add pdata,MOUSE_P3212_DPI_XADDRESS,pdata - // call twspi_write - // copy rega,pdata - // add pdata,MOUSE_P3212_DPI_YADDRESS,pdata - // call twspi_write - // setarg MOUSE_P3212_DPI_XADDRESS - // call twspi_read - // store 1,mem_temp - // rtn p_mouse_setting_dpi_4_level: fetch 1,mem_config_sensor_type rtneq S203 @@ -1499,11 +1455,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 @@ -1574,88 +1525,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 - call p_mouse_rgb_led_on_continue_1min,zero - rtn - -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===// @@ -2199,31 +2068,14 @@ 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_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 rtneq P3212 + rtneq S203 branch mouse_drawing_optima p_mouse_data_zoom: @@ -2266,27 +2118,6 @@ store 2,mem_mouse_temp_data rtn -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 Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/DPI_3mode_3ch_HYC-344/sched/mouse.dat (revision 4422) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/DPI_3mode_3ch_HYC-344/sched/mouse.dat (working copy) @@ -377,8 +377,8 @@ mem_sensor_3212_init: 09 5a -26 34 -19 04 +22 01 +b4 34 09 00 ff ff