Index: output/eeprom.dat =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_550_24_bt/output/eeprom.dat (revision 2023) +++ /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_550_24_bt/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -d6 +da 19 c2 84 @@ -67,7 +67,7 @@ c0 68 06 -3f +40 c0 69 03 @@ -3819,7 +3819,7 @@ 20 40 06 -6f +70 d8 40 00 @@ -4091,7 +4091,7 @@ 20 40 06 -72 +73 68 48 c9 @@ -6259,7 +6259,7 @@ 20 40 06 -3d +3e 6f e0 c8 @@ -6388,6 +6388,10 @@ 01 80 00 +c1 +02 +00 +00 20 20 47 @@ -6395,7 +6399,7 @@ 20 40 06 -3f +40 20 20 41 @@ -6415,15 +6419,15 @@ 20 40 06 -46 +47 20 40 06 -55 +56 20 40 06 -62 +63 20 20 41 @@ -6435,7 +6439,7 @@ 20 40 06 -6f +70 20 40 41 @@ -6455,7 +6459,7 @@ 20 40 06 -6f +70 20 40 41 @@ -6475,7 +6479,7 @@ 20 40 06 -6f +70 20 40 41 @@ -6519,7 +6523,7 @@ c0 7f 86 -5e +5f 20 20 41 @@ -6531,7 +6535,7 @@ 20 40 06 -72 +73 68 48 c9 @@ -6571,7 +6575,7 @@ c0 7f 86 -6b +6c 20 20 41 @@ -6583,7 +6587,7 @@ 20 40 06 -72 +73 68 48 c9 @@ -6616,8 +6620,8 @@ 20 61 2c -aa -21 +b6 +59 aa 55 40 @@ -7541,8 +7545,8 @@ 15 14 1b -11 0e +11 aa 55 05 @@ -8014,14 +8018,8 @@ 46 4c 10 -55 -aa -aa -55 -9d -9d -fb -83 +2c +58 ff ff ff @@ -8188,5 +8186,7 @@ ff ff ff -84 -c9 +ff +ff +82 +36 Index: output/program.lis =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_550_24_bt/output/program.lis (revision 2023) +++ /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_550_24_bt/output/program.lis (working copy) @@ -15,7 +15,7 @@ 000c c0668613 beq patch19_5 ,p_mouse_motion 000d c0670407 beq patch19_6 ,p_mouse_dpi_process 000e c0678428 beq patch19_7 ,p_mouse_seting_dpi -000f c068063f beq patch1a_0 ,p_mouse_check_key_gpio +000f c0680640 beq patch1a_0 ,p_mouse_check_key_gpio 0010 c0690382 beq patch1a_2 ,p_mouse_init_sunt 0011 c0698394 beq patch1a_3 ,p_mouse_sensor_poweron 0012 c06a84c7 beq patch1a_5 ,p_mouse_priority_bb_event @@ -1287,7 +1287,7 @@ 03b6 6848c914 fetcht 1 ,mem_matrix_public_gpio 03b7 204060e6 call gpio_clr_wake 03b8 6fe0c924 fetch 1 ,mem_mouse_sensor_sdio_gpio -03b9 2040066f call p_mouse_gpio_config_output_high +03b9 20400670 call p_mouse_gpio_config_output_high 03ba d8400003 arg 3 ,temp 03bb 20403f96 call mouse_gpio_config_input_pu 03bc 20403e80 call mouse_lpm_before_common @@ -1379,7 +1379,7 @@ p_mouse_3io6key_dpi_check: 03fc 6fe0c913 fetch 1 ,mem_dpi_button_gpio -03fd 20400672 call p_mouse_gpio_config_output_low +03fd 20400673 call p_mouse_gpio_config_output_low 03fe 6848c913 fetcht 1 ,mem_dpi_button_gpio 03ff 202041d5 branch mouse_3io6key_check @@ -2115,7 +2115,7 @@ 0618 20405d5e call twspi_write 0619 2040039a call p_mouse_dpi_config 061a 20403fbe call mouse_zwheel -061b 2040063d call p_mouse_key +061b 2040063e call p_mouse_key 061c 6fe0c8d4 fetch 1 ,mem_mouse_key 061d 1fe17e1f and_into 0x1f ,pdata 061e 67e0c8d4 store 1 ,mem_mouse_key @@ -2160,85 +2160,86 @@ p_mouse_drawing_optima: 063a 6fe0c92c fetch 1 ,mem_config_sensor_type 063b c1018000 rtneq p3212 -063c 20204758 branch mouse_drawing_optima +063c c1020000 rtneq p3065_xy +063d 20204758 branch mouse_drawing_optima p_mouse_key: -063d 2040063f call p_mouse_check_key_gpio -063e 2020411d branch mouse_key + 1 +063e 20400640 call p_mouse_check_key_gpio +063f 2020411d branch mouse_key + 1 p_mouse_check_key_gpio: -063f 6fe0cbf2 fetch 1 ,mem_sensor_shutdown_flag -0640 245a4161 ncall mouse_check_key_gpio_once ,blank -0641 da200000 arg 0 ,rega -0642 20400646 call p_mouse_check_lkey_gpio -0643 20400655 call p_mouse_check_bkkey_gpio -0644 20400662 call p_mouse_check_fwkey_gpio -0645 2020415e branch mouse_check_key_gpio_next +0640 6fe0cbf2 fetch 1 ,mem_sensor_shutdown_flag +0641 245a4161 ncall mouse_check_key_gpio_once ,blank +0642 da200000 arg 0 ,rega +0643 20400647 call p_mouse_check_lkey_gpio +0644 20400656 call p_mouse_check_bkkey_gpio +0645 20400663 call p_mouse_check_fwkey_gpio +0646 2020415e branch mouse_check_key_gpio_next p_mouse_check_lkey_gpio: -0646 6fe0c91c fetch 1 ,mem_lbutton_gpio -0647 2040066f call p_mouse_gpio_config_output_high -0648 20404164 call mouse_check_lkey_gpio -0649 6848c91c fetcht 1 ,mem_lbutton_gpio -064a 20403f96 call mouse_gpio_config_input_pu +0647 6fe0c91c fetch 1 ,mem_lbutton_gpio +0648 20400670 call p_mouse_gpio_config_output_high +0649 20404164 call mouse_check_lkey_gpio +064a 6848c91c fetcht 1 ,mem_lbutton_gpio +064b 20403f96 call mouse_gpio_config_input_pu p_mouse_check_rkey_gpio: -064b 6fe0c91d fetch 1 ,mem_rbutton_gpio -064c 2040066f call p_mouse_gpio_config_output_high -064d 2040416a call mouse_check_rkey_gpio -064e 6848c91d fetcht 1 ,mem_rbutton_gpio -064f 20403f96 call mouse_gpio_config_input_pu +064c 6fe0c91d fetch 1 ,mem_rbutton_gpio +064d 20400670 call p_mouse_gpio_config_output_high +064e 2040416a call mouse_check_rkey_gpio +064f 6848c91d fetcht 1 ,mem_rbutton_gpio +0650 20403f96 call mouse_gpio_config_input_pu p_mouse_check_mkey_gpio: -0650 6fe0c91e fetch 1 ,mem_mbutton_gpio -0651 2040066f call p_mouse_gpio_config_output_high -0652 20404170 call mouse_check_mkey_gpio -0653 6848c91e fetcht 1 ,mem_mbutton_gpio -0654 20203f96 branch mouse_gpio_config_input_pu +0651 6fe0c91e fetch 1 ,mem_mbutton_gpio +0652 20400670 call p_mouse_gpio_config_output_high +0653 20404170 call mouse_check_mkey_gpio +0654 6848c91e fetcht 1 ,mem_mbutton_gpio +0655 20203f96 branch mouse_gpio_config_input_pu p_mouse_check_bkkey_gpio: -0655 6fe0c911 fetch 1 ,mem_bk_button_gpio -0656 c17f8000 rtneq gpio_disable -0657 704ba703 jam mouse_bk_key ,mem_mouse_key_temp -0658 6fe0cba2 fetch 1 ,mem_mouse_bkkey_press_status -0659 1fe22600 copy pdata ,regc -065a 6848c911 fetcht 1 ,mem_bk_button_gpio -065b 6fe0c914 fetch 1 ,mem_matrix_public_gpio -065c c07f865e beq gpio_disable ,p_mouse_3io6key_bk_check -065d 2020417e branch mouse_check_bkkey_gpio_next +0656 6fe0c911 fetch 1 ,mem_bk_button_gpio +0657 c17f8000 rtneq gpio_disable +0658 704ba703 jam mouse_bk_key ,mem_mouse_key_temp +0659 6fe0cba2 fetch 1 ,mem_mouse_bkkey_press_status +065a 1fe22600 copy pdata ,regc +065b 6848c911 fetcht 1 ,mem_bk_button_gpio +065c 6fe0c914 fetch 1 ,mem_matrix_public_gpio +065d c07f865f beq gpio_disable ,p_mouse_3io6key_bk_check +065e 2020417e branch mouse_check_bkkey_gpio_next p_mouse_3io6key_bk_check: -065e 6fe0c911 fetch 1 ,mem_bk_button_gpio -065f 20400672 call p_mouse_gpio_config_output_low -0660 6848c911 fetcht 1 ,mem_bk_button_gpio -0661 2020418b branch mouse_3io6key_bk_check +065f 6fe0c911 fetch 1 ,mem_bk_button_gpio +0660 20400673 call p_mouse_gpio_config_output_low +0661 6848c911 fetcht 1 ,mem_bk_button_gpio +0662 2020418b branch mouse_3io6key_bk_check p_mouse_check_fwkey_gpio: -0662 6fe0c912 fetch 1 ,mem_fw_button_gpio -0663 c17f8000 rtneq gpio_disable -0664 704ba704 jam mouse_fw_key ,mem_mouse_key_temp -0665 6fe0cba3 fetch 1 ,mem_mouse_fwkey_press_status -0666 1fe22600 copy pdata ,regc -0667 6848c912 fetcht 1 ,mem_fw_button_gpio -0668 6fe0c914 fetch 1 ,mem_matrix_public_gpio -0669 c07f866b beq gpio_disable ,p_mouse_3io6key_fw_check -066a 20204197 branch mouse_check_fwkey_gpio_next +0663 6fe0c912 fetch 1 ,mem_fw_button_gpio +0664 c17f8000 rtneq gpio_disable +0665 704ba704 jam mouse_fw_key ,mem_mouse_key_temp +0666 6fe0cba3 fetch 1 ,mem_mouse_fwkey_press_status +0667 1fe22600 copy pdata ,regc +0668 6848c912 fetcht 1 ,mem_fw_button_gpio +0669 6fe0c914 fetch 1 ,mem_matrix_public_gpio +066a c07f866c beq gpio_disable ,p_mouse_3io6key_fw_check +066b 20204197 branch mouse_check_fwkey_gpio_next p_mouse_3io6key_fw_check: -066b 6fe0c912 fetch 1 ,mem_fw_button_gpio -066c 20400672 call p_mouse_gpio_config_output_low -066d 6848c912 fetcht 1 ,mem_fw_button_gpio -066e 202041a4 branch mouse_3io6key_fw_check +066c 6fe0c912 fetch 1 ,mem_fw_button_gpio +066d 20400673 call p_mouse_gpio_config_output_low +066e 6848c912 fetcht 1 ,mem_fw_button_gpio +066f 202041a4 branch mouse_3io6key_fw_check p_mouse_gpio_config_output_high: -066f c17f8000 rtneq gpio_disable -0670 d840003f arg gpcfg_output_high ,temp -0671 2020612c branch gpio_config_function_int +0670 c17f8000 rtneq gpio_disable +0671 d840003f arg gpcfg_output_high ,temp +0672 2020612c branch gpio_config_function_int p_mouse_gpio_config_output_low: -0672 c17f8000 rtneq gpio_disable -0673 d840003e arg gpcfg_output_low ,temp -0674 2020612c branch gpio_config_function_int +0673 c17f8000 rtneq gpio_disable +0674 d840003e arg gpcfg_output_low ,temp +0675 2020612c branch gpio_config_function_int org 0x800 start: Index: program/app_mouse.prog =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_550_24_bt/program/app_mouse.prog (revision 2023) +++ /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_550_24_bt/program/app_mouse.prog (working copy) @@ -1569,10 +1569,10 @@ mouse_seting_ka8g2_dpi: fetch 1,mem_mouse_dpi - beq MOUSE_DPI_LEVEL1,mouse_set_pka8g2_cpi0 //1600 - beq MOUSE_DPI_LEVEL2,mouse_set_pka8g2_cpi1 //2400 - beq MOUSE_DPI_LEVEL3,mouse_set_pka8g2_cpi2 //3200 - beq MOUSE_DPI_LEVEL4,mouse_set_pka8g2_cpi3 //800 + beq MOUSE_DPI_LEVEL1,mouse_set_pka8g2_cpi0 //1200 + beq MOUSE_DPI_LEVEL2,mouse_set_pka8g2_cpi1 //1600 + beq MOUSE_DPI_LEVEL3,mouse_set_pka8g2_cpi2 //800 + beq MOUSE_DPI_LEVEL4,mouse_set_pka8g2_cpi3 //1000 mouse_set_pka8g2_cpi1: fetch 1,mem_ka8g2_dpi_1 branch mouse_p3212_dpi Index: program/patch.prog =================================================================== --- /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_550_24_bt/program/patch.prog (revision 2023) +++ /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_550_24_bt/program/patch.prog (working copy) @@ -2743,6 +2743,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_550_24_bt/sched/mouse.dat (revision 2023) +++ /YC1308AF/branch/mouse/YDN_Project/SlideSwitch_3mode_550_24_bt/sched/mouse.dat (working copy) @@ -333,8 +333,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