Index: output/eeprom.dat =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_226_24_bt/output/eeprom.dat (revision 2023) +++ /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_226_24_bt/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -8a +8e 19 c2 84 @@ -71,7 +71,7 @@ c0 68 06 -2c +2d c0 69 03 @@ -3755,7 +3755,7 @@ 20 40 06 -5c +5d d8 40 00 @@ -4043,7 +4043,7 @@ 20 40 06 -5f +60 68 48 c9 @@ -6183,7 +6183,7 @@ 20 40 06 -2a +2b 6f e0 c8 @@ -6312,6 +6312,10 @@ 01 80 00 +c1 +02 +00 +00 20 20 47 @@ -6319,7 +6323,7 @@ 20 40 06 -2c +2d 20 20 41 @@ -6339,15 +6343,15 @@ 20 40 06 -33 +34 20 40 06 -42 +43 20 40 06 -4f +50 20 20 41 @@ -6359,7 +6363,7 @@ 20 40 06 -5c +5d 20 40 41 @@ -6379,7 +6383,7 @@ 20 40 06 -5c +5d 20 40 41 @@ -6399,7 +6403,7 @@ 20 40 06 -5c +5d 20 40 41 @@ -6443,7 +6447,7 @@ c0 7f 86 -4b +4c 20 20 41 @@ -6455,7 +6459,7 @@ 20 40 06 -5f +60 68 48 c9 @@ -6495,7 +6499,7 @@ c0 7f 86 -58 +59 20 20 41 @@ -6507,7 +6511,7 @@ 20 40 06 -5f +60 68 48 c9 @@ -6540,8 +6544,8 @@ 20 61 2c -22 -b6 +b0 +36 aa 55 40 @@ -7443,8 +7447,8 @@ 15 14 1b -11 0e +11 aa 55 05 @@ -7916,14 +7920,8 @@ 46 4c 10 -55 -aa -aa -55 -8c -98 -9c -dd +76 +59 ff ff ff @@ -8188,5 +8186,7 @@ ff ff ff -65 -78 +ff +ff +16 +4f Index: output/program.lis =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_226_24_bt/output/program.lis (revision 2023) +++ /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_226_24_bt/output/program.lis (working copy) @@ -16,7 +16,7 @@ 000d c0668600 beq patch19_5 ,p_mouse_motion 000e c06703fb beq patch19_6 ,p_mouse_dpi_process 000f c067841c beq patch19_7 ,p_mouse_seting_dpi -0010 c068062c beq patch1a_0 ,p_mouse_check_key_gpio +0010 c068062d beq patch1a_0 ,p_mouse_check_key_gpio 0011 c0690373 beq patch1a_2 ,p_mouse_init_sunt 0012 c0698385 beq patch1a_3 ,p_mouse_sensor_poweron 0013 c06a84b4 beq patch1a_5 ,p_mouse_priority_bb_event @@ -1265,7 +1265,7 @@ 03a6 6848c914 fetcht 1 ,mem_matrix_public_gpio 03a7 204060e6 call gpio_clr_wake 03a8 6fe0c924 fetch 1 ,mem_mouse_sensor_sdio_gpio -03a9 2040065c call p_mouse_gpio_config_output_high +03a9 2040065d call p_mouse_gpio_config_output_high 03aa d8400003 arg 3 ,temp 03ab 20403f96 call mouse_gpio_config_input_pu 03ac 20403e80 call mouse_lpm_before_common @@ -1363,7 +1363,7 @@ p_mouse_3io6key_dpi_check: 03f0 6fe0c913 fetch 1 ,mem_dpi_button_gpio -03f1 2040065f call p_mouse_gpio_config_output_low +03f1 20400660 call p_mouse_gpio_config_output_low 03f2 6848c913 fetcht 1 ,mem_dpi_button_gpio 03f3 202041d5 branch mouse_3io6key_check @@ -2090,7 +2090,7 @@ 0605 20405d5e call twspi_write 0606 2040038b call p_mouse_dpi_config 0607 20403fbe call mouse_zwheel -0608 2040062a call p_mouse_key +0608 2040062b call p_mouse_key 0609 6fe0c8d4 fetch 1 ,mem_mouse_key 060a 1fe17e1f and_into 0x1f ,pdata 060b 67e0c8d4 store 1 ,mem_mouse_key @@ -2135,85 +2135,86 @@ p_mouse_drawing_optima: 0627 6fe0c92c fetch 1 ,mem_config_sensor_type 0628 c1018000 rtneq p3212 -0629 20204758 branch mouse_drawing_optima +0629 c1020000 rtneq p3065_xy +062a 20204758 branch mouse_drawing_optima p_mouse_key: -062a 2040062c call p_mouse_check_key_gpio -062b 2020411d branch mouse_key + 1 +062b 2040062d call p_mouse_check_key_gpio +062c 2020411d branch mouse_key + 1 p_mouse_check_key_gpio: -062c 6fe0cbf2 fetch 1 ,mem_sensor_shutdown_flag -062d 245a4161 ncall mouse_check_key_gpio_once ,blank -062e da200000 arg 0 ,rega -062f 20400633 call p_mouse_check_lkey_gpio -0630 20400642 call p_mouse_check_bkkey_gpio -0631 2040064f call p_mouse_check_fwkey_gpio -0632 2020415e branch mouse_check_key_gpio_next +062d 6fe0cbf2 fetch 1 ,mem_sensor_shutdown_flag +062e 245a4161 ncall mouse_check_key_gpio_once ,blank +062f da200000 arg 0 ,rega +0630 20400634 call p_mouse_check_lkey_gpio +0631 20400643 call p_mouse_check_bkkey_gpio +0632 20400650 call p_mouse_check_fwkey_gpio +0633 2020415e branch mouse_check_key_gpio_next p_mouse_check_lkey_gpio: -0633 6fe0c91c fetch 1 ,mem_lbutton_gpio -0634 2040065c call p_mouse_gpio_config_output_high -0635 20404164 call mouse_check_lkey_gpio -0636 6848c91c fetcht 1 ,mem_lbutton_gpio -0637 20403f96 call mouse_gpio_config_input_pu +0634 6fe0c91c fetch 1 ,mem_lbutton_gpio +0635 2040065d call p_mouse_gpio_config_output_high +0636 20404164 call mouse_check_lkey_gpio +0637 6848c91c fetcht 1 ,mem_lbutton_gpio +0638 20403f96 call mouse_gpio_config_input_pu p_mouse_check_rkey_gpio: -0638 6fe0c91d fetch 1 ,mem_rbutton_gpio -0639 2040065c call p_mouse_gpio_config_output_high -063a 2040416a call mouse_check_rkey_gpio -063b 6848c91d fetcht 1 ,mem_rbutton_gpio -063c 20403f96 call mouse_gpio_config_input_pu +0639 6fe0c91d fetch 1 ,mem_rbutton_gpio +063a 2040065d call p_mouse_gpio_config_output_high +063b 2040416a call mouse_check_rkey_gpio +063c 6848c91d fetcht 1 ,mem_rbutton_gpio +063d 20403f96 call mouse_gpio_config_input_pu p_mouse_check_mkey_gpio: -063d 6fe0c91e fetch 1 ,mem_mbutton_gpio -063e 2040065c call p_mouse_gpio_config_output_high -063f 20404170 call mouse_check_mkey_gpio -0640 6848c91e fetcht 1 ,mem_mbutton_gpio -0641 20203f96 branch mouse_gpio_config_input_pu +063e 6fe0c91e fetch 1 ,mem_mbutton_gpio +063f 2040065d call p_mouse_gpio_config_output_high +0640 20404170 call mouse_check_mkey_gpio +0641 6848c91e fetcht 1 ,mem_mbutton_gpio +0642 20203f96 branch mouse_gpio_config_input_pu p_mouse_check_bkkey_gpio: -0642 6fe0c911 fetch 1 ,mem_bk_button_gpio -0643 c17f8000 rtneq gpio_disable -0644 704ba703 jam mouse_bk_key ,mem_mouse_key_temp -0645 6fe0cba2 fetch 1 ,mem_mouse_bkkey_press_status -0646 1fe22600 copy pdata ,regc -0647 6848c911 fetcht 1 ,mem_bk_button_gpio -0648 6fe0c914 fetch 1 ,mem_matrix_public_gpio -0649 c07f864b beq gpio_disable ,p_mouse_3io6key_bk_check -064a 2020417e branch mouse_check_bkkey_gpio_next +0643 6fe0c911 fetch 1 ,mem_bk_button_gpio +0644 c17f8000 rtneq gpio_disable +0645 704ba703 jam mouse_bk_key ,mem_mouse_key_temp +0646 6fe0cba2 fetch 1 ,mem_mouse_bkkey_press_status +0647 1fe22600 copy pdata ,regc +0648 6848c911 fetcht 1 ,mem_bk_button_gpio +0649 6fe0c914 fetch 1 ,mem_matrix_public_gpio +064a c07f864c beq gpio_disable ,p_mouse_3io6key_bk_check +064b 2020417e branch mouse_check_bkkey_gpio_next p_mouse_3io6key_bk_check: -064b 6fe0c911 fetch 1 ,mem_bk_button_gpio -064c 2040065f call p_mouse_gpio_config_output_low -064d 6848c911 fetcht 1 ,mem_bk_button_gpio -064e 2020418b branch mouse_3io6key_bk_check +064c 6fe0c911 fetch 1 ,mem_bk_button_gpio +064d 20400660 call p_mouse_gpio_config_output_low +064e 6848c911 fetcht 1 ,mem_bk_button_gpio +064f 2020418b branch mouse_3io6key_bk_check p_mouse_check_fwkey_gpio: -064f 6fe0c912 fetch 1 ,mem_fw_button_gpio -0650 c17f8000 rtneq gpio_disable -0651 704ba704 jam mouse_fw_key ,mem_mouse_key_temp -0652 6fe0cba3 fetch 1 ,mem_mouse_fwkey_press_status -0653 1fe22600 copy pdata ,regc -0654 6848c912 fetcht 1 ,mem_fw_button_gpio -0655 6fe0c914 fetch 1 ,mem_matrix_public_gpio -0656 c07f8658 beq gpio_disable ,p_mouse_3io6key_fw_check -0657 20204197 branch mouse_check_fwkey_gpio_next +0650 6fe0c912 fetch 1 ,mem_fw_button_gpio +0651 c17f8000 rtneq gpio_disable +0652 704ba704 jam mouse_fw_key ,mem_mouse_key_temp +0653 6fe0cba3 fetch 1 ,mem_mouse_fwkey_press_status +0654 1fe22600 copy pdata ,regc +0655 6848c912 fetcht 1 ,mem_fw_button_gpio +0656 6fe0c914 fetch 1 ,mem_matrix_public_gpio +0657 c07f8659 beq gpio_disable ,p_mouse_3io6key_fw_check +0658 20204197 branch mouse_check_fwkey_gpio_next p_mouse_3io6key_fw_check: -0658 6fe0c912 fetch 1 ,mem_fw_button_gpio -0659 2040065f call p_mouse_gpio_config_output_low -065a 6848c912 fetcht 1 ,mem_fw_button_gpio -065b 202041a4 branch mouse_3io6key_fw_check +0659 6fe0c912 fetch 1 ,mem_fw_button_gpio +065a 20400660 call p_mouse_gpio_config_output_low +065b 6848c912 fetcht 1 ,mem_fw_button_gpio +065c 202041a4 branch mouse_3io6key_fw_check p_mouse_gpio_config_output_high: -065c c17f8000 rtneq gpio_disable -065d d840003f arg gpcfg_output_high ,temp -065e 2020612c branch gpio_config_function_int +065d c17f8000 rtneq gpio_disable +065e d840003f arg gpcfg_output_high ,temp +065f 2020612c branch gpio_config_function_int p_mouse_gpio_config_output_low: -065f c17f8000 rtneq gpio_disable -0660 d840003e arg gpcfg_output_low ,temp -0661 2020612c branch gpio_config_function_int +0660 c17f8000 rtneq gpio_disable +0661 d840003e arg gpcfg_output_low ,temp +0662 2020612c branch gpio_config_function_int org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_226_24_bt/program/patch.prog (revision 2023) +++ /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_226_24_bt/program/patch.prog (working copy) @@ -2733,6 +2733,7 @@ p_mouse_drawing_optima: fetch 1,mem_config_sensor_type rtneq P3212 + rtneq P3065_XY branch mouse_drawing_optima Index: sched/mouse.dat =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_226_24_bt/sched/mouse.dat (revision 2023) +++ /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_226_24_bt/sched/mouse.dat (working copy) @@ -330,8 +330,8 @@ 14##mem_ka8g2_dpi_0 1200 1b##mem_ka8g2_dpi_1 1600 -11##mem_ka8g2_dpi_2 1000 -0e##mem_ka8g2_dpi_3 800 +0e##mem_ka8g2_dpi_2 800 +11##mem_ka8g2_dpi_3 1000 mem_3212_dpi_new: 2a##mem_3212_dpi_0_new 1600