Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_FY158/output/eeprom.dat (revision 5138) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_FY158/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -0a +0e 15 c2 84 @@ -67,7 +67,7 @@ c0 67 85 -0d +0e c0 68 02 @@ -4743,11 +4743,15 @@ 20 40 04 -a3 +a4 20 40 04 -aa +cc +20 +40 +04 +ab 20 20 46 @@ -4767,7 +4771,7 @@ 20 40 04 -b7 +b8 d8 e0 00 @@ -4787,11 +4791,11 @@ c2 94 84 -ae +af c2 9b 84 -ae +af 20 60 00 @@ -4803,7 +4807,7 @@ c2 83 04 -b5 +b6 6f e0 c9 @@ -4843,7 +4847,7 @@ 20 40 05 -20 +21 20 74 00 @@ -4863,7 +4867,7 @@ 20 40 04 -c0 +c1 20 20 40 @@ -4891,7 +4895,7 @@ c0 7f 84 -c7 +c8 20 20 40 @@ -4927,7 +4931,7 @@ 24 3a 04 -d4 +d5 6f e0 cc @@ -4939,7 +4943,7 @@ 20 40 04 -e5 +e6 68 48 cc @@ -4983,11 +4987,11 @@ 20 40 04 -fe +ff 20 40 04 -e9 +ea 68 48 cc @@ -5031,7 +5035,7 @@ 20 40 04 -f4 +f5 67 e0 cc @@ -5043,7 +5047,7 @@ 20 3a 04 -f0 +f1 6f e0 cc @@ -5107,11 +5111,11 @@ c0 03 85 -09 +0a c0 00 05 -0b +0c 20 60 00 @@ -5151,11 +5155,11 @@ c0 03 85 -09 +0a c0 00 05 -0b +0c 20 60 00 @@ -5191,7 +5195,7 @@ c2 9e 85 -17 +18 18 42 7e @@ -5223,7 +5227,7 @@ 24 3a 05 -3b +3c 6f e4 4b @@ -5231,7 +5235,7 @@ c2 8e 05 -2f +30 18 42 7e @@ -5243,11 +5247,11 @@ c0 00 05 -2b +2c c0 01 05 -29 +2a 20 60 00 @@ -5287,7 +5291,7 @@ 20 20 05 -14 +15 58 00 00 @@ -5295,7 +5299,7 @@ 20 20 05 -14 +15 58 00 00 @@ -5303,7 +5307,7 @@ 20 20 05 -14 +15 58 00 00 @@ -5311,7 +5315,7 @@ 20 20 05 -14 +15 18 42 7e @@ -5323,15 +5327,15 @@ c0 00 05 -2b +2c c0 01 05 -2d +2e c0 01 85 -29 +2a 20 60 00 @@ -5347,15 +5351,15 @@ c0 00 05 -2d +2e c0 00 85 -29 +2a c0 01 85 -27 +28 20 60 00 @@ -5367,7 +5371,7 @@ c2 8e 05 -35 +36 18 42 7e @@ -5379,17 +5383,17 @@ c0 00 05 -27 +28 c0 00 85 -29 +2a 20 60 00 00 -b7 -2e +03 +ab aa 55 40 @@ -5539,7 +5543,7 @@ 00 22 81 -1b +3b aa 55 0c @@ -5573,14 +5577,14 @@ 00 3b 4c -ff +88 aa 55 14 00 10 49 -08 +ff ff ff 04 @@ -5938,27 +5942,22 @@ 55 aa 55 -11 +0c 00 fc 45 -10 -46 -61 -6e -74 -65 -63 -68 -20 -57 -31 -39 -30 -20 +0b +42 +54 33 2e 30 +20 +4d +6f +75 +73 +65 aa 55 05 @@ -6113,27 +6112,22 @@ 30 aa 55 -11 +0c 00 1e 4c -10 -46 -61 -6e -74 -65 -63 -68 -20 -57 -31 -39 -30 -20 +0b +42 +54 35 2e 30 +20 +4d +6f +75 +73 +65 aa 55 0c @@ -6745,16 +6739,16 @@ 02 40 00 -66 +60 1a 55 aa aa 55 -0b -97 -97 -9c +3b +95 +f1 +e1 ff ff ff @@ -8188,5 +8182,11 @@ ff ff ff -66 -f3 +ff +ff +ff +ff +ff +ff +94 +a2 Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_FY158/output/program.lis (revision 5138) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_FY158/output/program.lis (working copy) @@ -15,7 +15,7 @@ 000c c06501bf beq patch19_2 ,p_mouse_lpm_before_common 000d c066009e beq patch19_4 ,p_mouse_adc_read_start 000e c0670427 beq patch19_6 ,p_mouse_motion -000f c067850d beq patch19_7 ,p_mouse_dpi_process +000f c067850e beq patch19_7 ,p_mouse_dpi_process 0010 c06802c2 beq patch1a_0 ,p_mouse_seting_dpi 0011 c0688468 beq patch1a_1 ,p_mouse_check_key_gpio 0012 c0698418 beq patch1a_3 ,p_mouse_init_sunt @@ -1564,240 +1564,241 @@ p_mouse_idle: 049e 20404990 call mouse_low_voltage_led_no_enter_lpm 049f 20407936 call ui_check_paring_button -04a0 204004a3 call p_mouse_20ms_event_timer -04a1 204004aa call p_mouse_select_device_check -04a2 20204650 branch mouse_idle + 5 +04a0 204004a4 call p_mouse_20ms_event_timer +04a1 204004cc call p_mouse_dpi_another_gpio_check +04a2 204004ab call p_mouse_select_device_check +04a3 20204650 branch mouse_idle + 5 p_mouse_20ms_event_timer: -04a3 d8e0000c arg 12 ,queue -04a4 20407d74 call timer_check -04a5 247a0000 nrtn blank -04a6 204004b7 call p_mouse_dpi_check +04a4 d8e0000c arg 12 ,queue +04a5 20407d74 call timer_check +04a6 247a0000 nrtn blank +04a7 204004b8 call p_mouse_dpi_check p_mouse_g24_retransmit_100ms_timer_init: -04a7 d8e0000c arg 12 ,queue -04a8 58000020 setarg 32 -04a9 20207d66 branch timer_init +04a8 d8e0000c arg 12 ,queue +04a9 58000020 setarg 32 +04aa 20207d66 branch timer_init p_mouse_select_device_check: -04aa 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -04ab c29484ae bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge -04ac c29b84ae bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge -04ad 20600000 rtn +04ab 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +04ac c29484af bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge +04ad c29b84af bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge +04ae 20600000 rtn p_mouse_select_device_by_pb_button_check_judge: -04ae 6fe1478c fetch 2 ,mem_ui_state_map -04af c28304b5 bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once +04af 6fe1478c fetch 2 ,mem_ui_state_map +04b0 c28304b6 bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once p_mouse_idle_select_device_by_pb_button: -04b0 6fe0c91b fetch 1 ,mem_config_select_device_button_gpio -04b1 c17f8000 rtneq gpio_disable -04b2 6fe0c9bf fetch 1 ,mem_store_information_delay_timer -04b3 247a0000 nrtn blank -04b4 2020465c branch mouse_select_device_by_pb_button + 2 +04b1 6fe0c91b fetch 1 ,mem_config_select_device_button_gpio +04b2 c17f8000 rtneq gpio_disable +04b3 6fe0c9bf fetch 1 ,mem_store_information_delay_timer +04b4 247a0000 nrtn blank +04b5 2020465c branch mouse_select_device_by_pb_button + 2 p_mouse_select_device_by_pb_button_check_once: -04b5 704b9403 jam 0x03 ,mem_mouse_pbkey_press_status -04b6 2020016f branch p_mouse_select_device_by_pb_button +04b6 704b9403 jam 0x03 ,mem_mouse_pbkey_press_status +04b7 2020016f branch p_mouse_select_device_by_pb_button p_mouse_dpi_check: -04b7 6fe0c90f fetch 1 ,mem_dpi_button_gpio -04b8 c17f8000 rtneq gpio_disable -04b9 20400520 call p_mouse_dpi_ghost_check -04ba 20740000 rtn user -04bb da200000 arg 0 ,rega -04bc 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp -04bd 6848c90f fetcht 1 ,mem_dpi_button_gpio -04be 204004c0 call p_mouse_dpi_key_check -04bf 2020402f branch mouse_dpi_check_next +04b8 6fe0c90f fetch 1 ,mem_dpi_button_gpio +04b9 c17f8000 rtneq gpio_disable +04ba 20400521 call p_mouse_dpi_ghost_check +04bb 20740000 rtn user +04bc da200000 arg 0 ,rega +04bd 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp +04be 6848c90f fetcht 1 ,mem_dpi_button_gpio +04bf 204004c1 call p_mouse_dpi_key_check +04c0 2020402f branch mouse_dpi_check_next p_mouse_dpi_key_check: -04c0 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -04c1 c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd -04c2 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status -04c3 1fe22600 copy pdata ,regc -04c4 6fe0c910 fetch 1 ,mem_matrix_public_gpio -04c5 c07f84c7 beq gpio_disable ,p_mouse_3io6key_dpi_check -04c6 2020403f branch mouse_dpi_key_check_next +04c1 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +04c2 c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd +04c3 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status +04c4 1fe22600 copy pdata ,regc +04c5 6fe0c910 fetch 1 ,mem_matrix_public_gpio +04c6 c07f84c8 beq gpio_disable ,p_mouse_3io6key_dpi_check +04c7 2020403f branch mouse_dpi_key_check_next p_mouse_3io6key_dpi_check: -04c7 6fe0c90f fetch 1 ,mem_dpi_button_gpio -04c8 2040049c call p_mouse_gpio_config_output_low -04c9 6848c90f fetcht 1 ,mem_dpi_button_gpio -04ca 20204195 branch mouse_3io6key_check +04c8 6fe0c90f fetch 1 ,mem_dpi_button_gpio +04c9 2040049c call p_mouse_gpio_config_output_low +04ca 6848c90f fetcht 1 ,mem_dpi_button_gpio +04cb 20204195 branch mouse_3io6key_check p_mouse_dpi_another_gpio_check: -04cb 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -04cc c41e8000 rtnbit0 mouse_enable_double_dpi_key -04cd 6fe0cc3a fetch 1 ,mem_mouse_another_dpi_connect_vin_flag -04ce 243a04d4 nbranch p_mouse_dpi_another_gpio_connect_vin_check ,blank +04cc 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +04cd c41e8000 rtnbit0 mouse_enable_double_dpi_key +04ce 6fe0cc3a fetch 1 ,mem_mouse_another_dpi_connect_vin_flag +04cf 243a04d5 nbranch p_mouse_dpi_another_gpio_connect_vin_check ,blank p_mouse_dpi_another_gpio_connect_gnd_check: -04cf 6fe0cc3b fetch 1 ,mem_dpi_another_button_gpio -04d0 2040049a call p_mouse_gpio_config_output_high -04d1 204004e5 call p_mouse_dpi_another_check -04d2 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio -04d3 20203f56 branch mouse_gpio_config_input_pu +04d0 6fe0cc3b fetch 1 ,mem_dpi_another_button_gpio +04d1 2040049a call p_mouse_gpio_config_output_high +04d2 204004e6 call p_mouse_dpi_another_check +04d3 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio +04d4 20203f56 branch mouse_gpio_config_input_pu p_mouse_dpi_another_gpio_connect_vin_check: -04d4 6fe0cc3b fetch 1 ,mem_dpi_another_button_gpio -04d5 793ffe07 set0 gpio_active_bit ,pdata -04d6 67e0cc3b store 1 ,mem_dpi_another_button_gpio -04d7 6fe0cc3b fetch 1 ,mem_dpi_another_button_gpio -04d8 2040049c call p_mouse_gpio_config_output_low -04d9 704c3f00 jam mouse_dpi_another_key ,mem_mouse_key_temp_patch -04da 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio -04db 6fe0cc3c fetch 1 ,mem_dpi_another_press_status -04dc 204004fe call p_mouse_check_key_connect_vin_new -04dd 204004e9 call p_mouse_dpi_another_state_check -04de 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio -04df 20203f56 branch mouse_gpio_config_input_pu +04d5 6fe0cc3b fetch 1 ,mem_dpi_another_button_gpio +04d6 793ffe07 set0 gpio_active_bit ,pdata +04d7 67e0cc3b store 1 ,mem_dpi_another_button_gpio +04d8 6fe0cc3b fetch 1 ,mem_dpi_another_button_gpio +04d9 2040049c call p_mouse_gpio_config_output_low +04da 704c3f00 jam mouse_dpi_another_key ,mem_mouse_key_temp_patch +04db 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio +04dc 6fe0cc3c fetch 1 ,mem_dpi_another_press_status +04dd 204004ff call p_mouse_check_key_connect_vin_new +04de 204004ea call p_mouse_dpi_another_state_check +04df 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio +04e0 20203f56 branch mouse_gpio_config_input_pu p_mouse_dpi_another_down_new: -04e0 20403f56 call mouse_gpio_config_input_pu -04e1 6fe0cc3d fetch 1 ,mem_dpi_another_button_state -04e2 c1008000 rtneq dpi_button_state_down -04e3 704c3d01 jam dpi_button_state_down ,mem_dpi_another_button_state -04e4 20204069 branch mouse_dpi_process +04e1 20403f56 call mouse_gpio_config_input_pu +04e2 6fe0cc3d fetch 1 ,mem_dpi_another_button_state +04e3 c1008000 rtneq dpi_button_state_down +04e4 704c3d01 jam dpi_button_state_down ,mem_dpi_another_button_state +04e5 20204069 branch mouse_dpi_process p_mouse_dpi_another_check: -04e5 704c3f00 jam mouse_dpi_another_key ,mem_mouse_key_temp_patch -04e6 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio -04e7 6fe0cc3c fetch 1 ,mem_dpi_another_press_status -04e8 204004f4 call p_mouse_check_key_connect_gnd_new +04e6 704c3f00 jam mouse_dpi_another_key ,mem_mouse_key_temp_patch +04e7 6848cc3b fetcht 1 ,mem_dpi_another_button_gpio +04e8 6fe0cc3c fetch 1 ,mem_dpi_another_press_status +04e9 204004f5 call p_mouse_check_key_connect_gnd_new p_mouse_dpi_another_state_check: -04e9 67e0cc3c store 1 ,mem_dpi_another_press_status -04ea 6fe0cc3e fetch 1 ,mem_dpi_another_button_down_enable -04eb 203a04f0 branch p_mouse_dpi_another_up ,blank +04ea 67e0cc3c store 1 ,mem_dpi_another_press_status +04eb 6fe0cc3e fetch 1 ,mem_dpi_another_button_down_enable +04ec 203a04f1 branch p_mouse_dpi_another_up ,blank p_mouse_dpi_another_down: -04ec 6fe0cc3d fetch 1 ,mem_dpi_another_button_state -04ed c1008000 rtneq dpi_button_state_down -04ee 704c3d01 jam dpi_button_state_down ,mem_dpi_another_button_state -04ef 20204069 branch mouse_dpi_process +04ed 6fe0cc3d fetch 1 ,mem_dpi_another_button_state +04ee c1008000 rtneq dpi_button_state_down +04ef 704c3d01 jam dpi_button_state_down ,mem_dpi_another_button_state +04f0 20204069 branch mouse_dpi_process p_mouse_dpi_another_up: -04f0 6fe0cc3d fetch 1 ,mem_dpi_another_button_state -04f1 c1000000 rtneq dpi_button_state_up -04f2 704c3d00 jam dpi_button_state_up ,mem_dpi_another_button_state -04f3 20600000 rtn +04f1 6fe0cc3d fetch 1 ,mem_dpi_another_button_state +04f2 c1000000 rtneq dpi_button_state_up +04f3 704c3d00 jam dpi_button_state_up ,mem_dpi_another_button_state +04f4 20600000 rtn p_mouse_check_key_connect_gnd_new: -04f4 1fe3fe00 lshift pdata ,pdata -04f5 1fe22400 copy pdata ,regb -04f6 20406059 call gpio_get_bit -04f7 7920a400 setflag true ,0 ,regb -04f8 1a417e07 and regb ,0x07 ,pdata -04f9 6848cc3f fetcht 1 ,mem_mouse_key_temp_patch -04fa 18420e00 copy temp ,queue -04fb c0038509 beq 0x07 ,p_mouse_key_press -04fc c000050b beq 0x00 ,p_mouse_key_release -04fd 20600000 rtn +04f5 1fe3fe00 lshift pdata ,pdata +04f6 1fe22400 copy pdata ,regb +04f7 20406059 call gpio_get_bit +04f8 7920a400 setflag true ,0 ,regb +04f9 1a417e07 and regb ,0x07 ,pdata +04fa 6848cc3f fetcht 1 ,mem_mouse_key_temp_patch +04fb 18420e00 copy temp ,queue +04fc c003850a beq 0x07 ,p_mouse_key_press +04fd c000050c beq 0x00 ,p_mouse_key_release +04fe 20600000 rtn p_mouse_check_key_connect_vin_new: -04fe 1fe3fe00 lshift pdata ,pdata -04ff 1fe22400 copy pdata ,regb -0500 20403f54 call mouse_gpio_config_input_pd -0501 20406059 call gpio_get_bit -0502 7920a400 setflag true ,0 ,regb -0503 1a417e07 and regb ,0x07 ,pdata -0504 6848cc3f fetcht 1 ,mem_mouse_key_temp_patch -0505 18420e00 copy temp ,queue -0506 c0038509 beq 0x07 ,p_mouse_key_press -0507 c000050b beq 0x00 ,p_mouse_key_release -0508 20600000 rtn +04ff 1fe3fe00 lshift pdata ,pdata +0500 1fe22400 copy pdata ,regb +0501 20403f54 call mouse_gpio_config_input_pd +0502 20406059 call gpio_get_bit +0503 7920a400 setflag true ,0 ,regb +0504 1a417e07 and regb ,0x07 ,pdata +0505 6848cc3f fetcht 1 ,mem_mouse_key_temp_patch +0506 18420e00 copy temp ,queue +0507 c003850a beq 0x07 ,p_mouse_key_press +0508 c000050c beq 0x00 ,p_mouse_key_release +0509 20600000 rtn p_mouse_key_press: -0509 704c3e01 jam 1 ,mem_dpi_another_button_down_enable -050a 20600000 rtn +050a 704c3e01 jam 1 ,mem_dpi_another_button_down_enable +050b 20600000 rtn p_mouse_key_release: -050b 704c3e00 jam 0 ,mem_dpi_another_button_down_enable -050c 20600000 rtn +050c 704c3e00 jam 0 ,mem_dpi_another_button_down_enable +050d 20600000 rtn p_mouse_dpi_process: -050d 6fe0c992 fetch 1 ,mem_mouse_dpi -050e 1fe20400 copy pdata ,temp -050f 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0510 c29e8517 bbit1 mouse_enable_double_dpi_key ,p_mouse_double_dpi_check -0511 18427e00 copy temp ,pdata -0512 1fe0fe01 increase 1 ,pdata -0513 1fe17e03 and pdata ,0x03 ,pdata +050e 6fe0c992 fetch 1 ,mem_mouse_dpi +050f 1fe20400 copy pdata ,temp +0510 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0511 c29e8518 bbit1 mouse_enable_double_dpi_key ,p_mouse_double_dpi_check +0512 18427e00 copy temp ,pdata +0513 1fe0fe01 increase 1 ,pdata +0514 1fe17e03 and pdata ,0x03 ,pdata p_mouse_dpi_store: -0514 67e0c992 store 1 ,mem_mouse_dpi -0515 20404095 call mouse_seting_dpi -0516 20204643 branch mouse_store_eerpom_dpi +0515 67e0c992 store 1 ,mem_mouse_dpi +0516 20404095 call mouse_seting_dpi +0517 20204643 branch mouse_store_eerpom_dpi p_mouse_double_dpi_check: -0517 6fe0cc3e fetch 1 ,mem_dpi_another_button_down_enable -0518 243a053b nbranch p_mouse_another_dpi_button_down ,blank +0518 6fe0cc3e fetch 1 ,mem_dpi_another_button_down_enable +0519 243a053c nbranch p_mouse_another_dpi_button_down ,blank p_mouse_dpi_increase: -0519 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -051a c28e052f bbit1 mouse_enable_dpi_level_4 ,p_mouse_dpi_increase_level_4 -051b 18427e00 copy temp ,pdata -051c c1008000 rtneq mouse_dpi_level2 +051a 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +051b c28e0530 bbit1 mouse_enable_dpi_level_4 ,p_mouse_dpi_increase_level_4 +051c 18427e00 copy temp ,pdata +051d c1008000 rtneq mouse_dpi_level2 p_mouse_dpi_increase_level: -051d c000052b beq mouse_dpi_level1 ,p_mouse_dpi_level_3 -051e c0010529 beq mouse_dpi_level3 ,p_mouse_dpi_level_2 -051f 20600000 rtn +051e c000052c beq mouse_dpi_level1 ,p_mouse_dpi_level_3 +051f c001052a beq mouse_dpi_level3 ,p_mouse_dpi_level_2 +0520 20600000 rtn p_mouse_dpi_ghost_check: -0520 78547c00 disable user -0521 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0522 c3960000 rtnbit1 mouse_enable_dpi_key_connect_gnd -0523 6fe1cb8e fetch 3 ,mem_mouse_lkey_press_status -0524 207a0000 rtn blank -0525 704b9300 jam 0 ,mem_mouse_dpikey_press_status -0526 20207e54 branch enable_user +0521 78547c00 disable user +0522 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0523 c3960000 rtnbit1 mouse_enable_dpi_key_connect_gnd +0524 6fe1cb8e fetch 3 ,mem_mouse_lkey_press_status +0525 207a0000 rtn blank +0526 704b9300 jam 0 ,mem_mouse_dpikey_press_status +0527 20207e54 branch enable_user p_mouse_dpi_level_1: -0527 58000002 setarg 2 -0528 20200514 branch p_mouse_dpi_store +0528 58000002 setarg 2 +0529 20200515 branch p_mouse_dpi_store p_mouse_dpi_level_2: -0529 58000000 setarg 0 -052a 20200514 branch p_mouse_dpi_store +052a 58000000 setarg 0 +052b 20200515 branch p_mouse_dpi_store p_mouse_dpi_level_3: -052b 58000001 setarg 1 -052c 20200514 branch p_mouse_dpi_store +052c 58000001 setarg 1 +052d 20200515 branch p_mouse_dpi_store p_mouse_dpi_level_4: -052d 58000003 setarg 3 -052e 20200514 branch p_mouse_dpi_store +052e 58000003 setarg 3 +052f 20200515 branch p_mouse_dpi_store p_mouse_dpi_increase_level_4: -052f 18427e00 copy temp ,pdata -0530 c1008000 rtneq mouse_dpi_level2 -0531 c000052b beq mouse_dpi_level1 ,p_mouse_dpi_level_3 -0532 c001052d beq mouse_dpi_level3 ,p_mouse_dpi_level_4 -0533 c0018529 beq mouse_dpi_level4 ,p_mouse_dpi_level_2 -0534 20600000 rtn +0530 18427e00 copy temp ,pdata +0531 c1008000 rtneq mouse_dpi_level2 +0532 c000052c beq mouse_dpi_level1 ,p_mouse_dpi_level_3 +0533 c001052e beq mouse_dpi_level3 ,p_mouse_dpi_level_4 +0534 c001852a beq mouse_dpi_level4 ,p_mouse_dpi_level_2 +0535 20600000 rtn p_mouse_dpi_decrease_level_4: -0535 18427e00 copy temp ,pdata -0536 c1010000 rtneq mouse_dpi_level3 -0537 c000052d beq mouse_dpi_level1 ,p_mouse_dpi_level_4 -0538 c0008529 beq mouse_dpi_level2 ,p_mouse_dpi_level_2 -0539 c0018527 beq mouse_dpi_level4 ,p_mouse_dpi_level_1 -053a 20600000 rtn +0536 18427e00 copy temp ,pdata +0537 c1010000 rtneq mouse_dpi_level3 +0538 c000052e beq mouse_dpi_level1 ,p_mouse_dpi_level_4 +0539 c000852a beq mouse_dpi_level2 ,p_mouse_dpi_level_2 +053a c0018528 beq mouse_dpi_level4 ,p_mouse_dpi_level_1 +053b 20600000 rtn p_mouse_another_dpi_button_down: p_mouse_dpi_decrease: -053b 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -053c c28e0535 bbit1 mouse_enable_dpi_level_4 ,p_mouse_dpi_decrease_level_4 -053d 18427e00 copy temp ,pdata -053e c1010000 rtneq mouse_dpi_level3 +053c 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +053d c28e0536 bbit1 mouse_enable_dpi_level_4 ,p_mouse_dpi_decrease_level_4 +053e 18427e00 copy temp ,pdata +053f c1010000 rtneq mouse_dpi_level3 p_mouse_dpi_decrease_level: -053f c0000527 beq mouse_dpi_level1 ,p_mouse_dpi_level_1 -0540 c0008529 beq mouse_dpi_level2 ,p_mouse_dpi_level_2 -0541 20600000 rtn +0540 c0000528 beq mouse_dpi_level1 ,p_mouse_dpi_level_1 +0541 c000852a beq mouse_dpi_level2 ,p_mouse_dpi_level_2 +0542 20600000 rtn org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_FY158/program/patch.prog (revision 5138) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_FY158/program/patch.prog (working copy) @@ -1778,7 +1778,7 @@ call ui_check_paring_button call p_mouse_20ms_event_timer // call p_mouse_dpi_check - // call p_mouse_dpi_another_gpio_check + call p_mouse_dpi_another_gpio_check call p_mouse_select_device_check branch mouse_idle+5 p_mouse_20ms_event_timer: Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_FY158/sched/mouse.dat (revision 5138) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_FY158/sched/mouse.dat (working copy) @@ -94,7 +94,7 @@ #bit3 MOUSE_ENABLE_LE_BATTERY_SERVICE_CANCEL #bit4 MOUSE_ENABLE_WHEEL_WAKE_UP_CANCEL #bit5 MOUSE_ENABLE_DOUBLE_DPI_KEY -1b +3b mem_mouse_discovery_timeout:b0 04 #2min @@ -112,8 +112,8 @@ mem_bk_button_gpio:0d mem_fw_button_gpio:0c mem_dpi_button_gpio:0b -mem_dpi_another_button_gpio:ff -mem_matrix_public_gpio:08 +mem_dpi_another_button_gpio:88 +mem_matrix_public_gpio:ff mem_sensor_motion_gpio:ff mem_customer_key_gpio:ff mem_whee_a_data_gpio:04 @@ -240,7 +240,7 @@ mem_lap:15 a0 c8 12 23 51 mem_lap_new:15 a0 c8 12 23 55 #3.0addr of bt2 mem_local_name_length: -'Fantech W190 3.0 +'BT3.0 Mouse mem_sniff_param_interval: 0e 00 01 00 ##mem_sniff_param_attempt:01 00 @@ -288,7 +288,7 @@ 'Fantech W190 5.0 mem_le_name_patch_len: #max 18bytes -'Fantech W190 5.0 +'BT5.0 Mouse mem_le_name_patch_len_new: 'BT5.0 Mouse