Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/HC108_Only2.4G_AotuPair_Li/output/eeprom.dat (revision 829) +++ /YC1308AC/branch/mouse_project/XZR/HC108_Only2.4G_AotuPair_Li/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -3a +7e 0d c2 84 @@ -87,7 +87,7 @@ c0 6f 03 -36 +47 c0 74 02 @@ -2251,7 +2251,7 @@ 20 40 60 -65 +69 da 60 4b @@ -2279,7 +2279,7 @@ 20 20 60 -69 +65 da 60 4b @@ -3091,27 +3091,95 @@ 20 40 03 -09 +1a 20 40 03 -0e +1f 20 40 03 -13 +24 20 40 03 -18 +29 20 40 03 -25 +36 +70 +4b +8b +00 +6f +e4 +4b +ab +c4 +0a +80 +00 +6f +e0 +c9 +12 +c1 +7f +80 +00 +70 +4b +96 +07 +6f +e0 +cb +95 +1f +e2 +26 +00 +6f +e0 +c9 +12 20 +40 +03 +45 +68 +48 +c9 +12 20 +40 41 -1e +95 +67 +e0 +cb +95 +68 +48 +c9 +12 +20 +40 +3f +56 +20 +40 +41 +74 +1a +22 +7e +00 +20 +60 +00 +00 6f e0 c9 @@ -3119,7 +3187,7 @@ 20 40 03 -32 +43 20 40 41 @@ -3139,7 +3207,7 @@ 20 40 03 -32 +43 20 40 41 @@ -3159,7 +3227,7 @@ 20 40 03 -32 +43 20 40 41 @@ -3203,7 +3271,7 @@ c0 7f 83 -21 +32 20 20 41 @@ -3215,7 +3283,7 @@ 20 40 03 -34 +45 68 48 c9 @@ -3255,7 +3323,7 @@ c0 7f 83 -2e +3f 20 20 41 @@ -3267,7 +3335,7 @@ 20 40 03 -34 +45 68 48 c9 @@ -3303,7 +3371,7 @@ 20 40 03 -3a +4b 20 20 46 @@ -3339,7 +3407,7 @@ 20 40 03 -43 +54 20 20 40 @@ -3367,7 +3435,7 @@ c0 7f 83 -4a +5b 20 20 40 @@ -3379,7 +3447,7 @@ 20 40 03 -34 +45 68 48 c9 @@ -3388,8 +3456,8 @@ 20 41 95 -80 -97 +eb +22 aa 55 40 @@ -3572,7 +3640,7 @@ 0a 05 04 -ff +03 ff ff 0b @@ -3752,7 +3820,7 @@ 00 a1 44 -05 +ff aa 55 06 @@ -4599,78 +4667,10 @@ aa aa 55 -05 +03 6f -04 -c3 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +1a +f0 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -4c -a2 +cc +28 Index: output/flash.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/HC108_Only2.4G_AotuPair_Li/output/flash.dat (revision 829) +++ /YC1308AC/branch/mouse_project/XZR/HC108_Only2.4G_AotuPair_Li/output/flash.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -3a +7e 0d c2 84 @@ -87,7 +87,7 @@ c0 6f 03 -36 +47 c0 74 02 @@ -2251,7 +2251,7 @@ 20 40 60 -65 +69 da 60 4b @@ -2279,7 +2279,7 @@ 20 20 60 -69 +65 da 60 4b @@ -3091,27 +3091,95 @@ 20 40 03 -09 +1a 20 40 03 -0e +1f 20 40 03 -13 +24 20 40 03 -18 +29 20 40 03 -25 +36 +70 +4b +8b +00 +6f +e4 +4b +ab +c4 +0a +80 +00 +6f +e0 +c9 +12 +c1 +7f +80 +00 +70 +4b +96 +07 +6f +e0 +cb +95 +1f +e2 +26 +00 +6f +e0 +c9 +12 20 +40 +03 +45 +68 +48 +c9 +12 20 +40 41 -1e +95 +67 +e0 +cb +95 +68 +48 +c9 +12 +20 +40 +3f +56 +20 +40 +41 +74 +1a +22 +7e +00 +20 +60 +00 +00 6f e0 c9 @@ -3119,7 +3187,7 @@ 20 40 03 -32 +43 20 40 41 @@ -3139,7 +3207,7 @@ 20 40 03 -32 +43 20 40 41 @@ -3159,7 +3227,7 @@ 20 40 03 -32 +43 20 40 41 @@ -3203,7 +3271,7 @@ c0 7f 83 -21 +32 20 20 41 @@ -3215,7 +3283,7 @@ 20 40 03 -34 +45 68 48 c9 @@ -3255,7 +3323,7 @@ c0 7f 83 -2e +3f 20 20 41 @@ -3267,7 +3335,7 @@ 20 40 03 -34 +45 68 48 c9 @@ -3303,7 +3371,7 @@ 20 40 03 -3a +4b 20 20 46 @@ -3339,7 +3407,7 @@ 20 40 03 -43 +54 20 20 40 @@ -3367,7 +3435,7 @@ c0 7f 83 -4a +5b 20 20 40 @@ -3379,7 +3447,7 @@ 20 40 03 -34 +45 68 48 c9 @@ -3388,8 +3456,8 @@ 20 41 95 -80 -97 +eb +22 aa 55 40 @@ -3572,7 +3640,7 @@ 0a 05 04 -ff +03 ff ff 0b @@ -3752,7 +3820,7 @@ 00 a1 44 -05 +ff aa 55 06 @@ -4599,78 +4667,10 @@ aa aa 55 -05 +03 6f -04 -c3 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +1a +f0 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -4c -a2 +cc +28 Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/HC108_Only2.4G_AotuPair_Li/output/program.lis (revision 829) +++ /YC1308AC/branch/mouse_project/XZR/HC108_Only2.4G_AotuPair_Li/output/program.lis (working copy) @@ -20,7 +20,7 @@ 0011 c06b0171 beq patch1a_6 ,p_mouse_priority_bb_event 0012 c06c8215 beq patch1b_1 ,p_mouse_bb_event_timer 0013 c06d0271 beq patch1b_2 ,p_mouse_start_discovery -0014 c06f0336 beq patch1b_6 ,p_mouse_idle +0014 c06f0347 beq patch1b_6 ,p_mouse_idle 0015 c074027e beq patch1d_0 ,p_hid_rx_process 0016 2020137c branch loop @@ -711,7 +711,7 @@ 022e 6fe14bee fetch 2 ,mem_mouse_logo_led_on_timer 022f 207a0000 rtn blank 0230 6848cbed fetcht 1 ,mem_mouse_logo_led_gpio -0231 20406065 call gpio_out_inactive +0231 20406069 call gpio_out_active 0232 da604bee arg mem_mouse_logo_led_on_timer ,regc 0233 da400235 arg p_mouse_logo_led_on_timeout ,regb 0234 20203191 branch timer_single_step_2b @@ -720,7 +720,7 @@ 0235 58000000 setarg 0 0236 67e14bee store 2 ,mem_mouse_logo_led_on_timer 0237 6848cbed fetcht 1 ,mem_mouse_logo_led_gpio -0238 20206069 branch gpio_out_active +0238 20206065 branch gpio_out_inactive p_mouse_dpi_led_blink_delay_timer: 0239 da604ba8 arg mem_mouse_dpi_led_delay_count ,regc @@ -991,107 +991,126 @@ 0300 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag 0301 245a4121 ncall mouse_check_key_gpio_once ,blank 0302 da200000 arg 0 ,rega -0303 20400309 call p_mouse_check_lkey_gpio -0304 2040030e call p_mouse_check_rkey_gpio -0305 20400313 call p_mouse_check_mkey_gpio -0306 20400318 call p_mouse_check_bkkey_gpio -0307 20400325 call p_mouse_check_fwkey_gpio -0308 2020411e branch mouse_check_key_gpio_next +0303 2040031a call p_mouse_check_lkey_gpio +0304 2040031f call p_mouse_check_rkey_gpio +0305 20400324 call p_mouse_check_mkey_gpio +0306 20400329 call p_mouse_check_bkkey_gpio +0307 20400336 call p_mouse_check_fwkey_gpio + +p_mouse_check_customerkey_gpio: +0308 704b8b00 jam 0 ,mem_customer_key +0309 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +030a c40a8000 rtnbit0 mouse_enable_keyboard +030b 6fe0c912 fetch 1 ,mem_customer_key_gpio +030c c17f8000 rtneq gpio_disable +030d 704b9607 jam mouse_customer_key ,mem_mouse_key_temp +030e 6fe0cb95 fetch 1 ,mem_mouse_customerkey_press_status +030f 1fe22600 copy pdata ,regc +0310 6fe0c912 fetch 1 ,mem_customer_key_gpio +0311 20400345 call p_mouse_gpio_config_output_low +0312 6848c912 fetcht 1 ,mem_customer_key_gpio +0313 20404195 call mouse_3io6key_check +0314 67e0cb95 store 1 ,mem_mouse_customerkey_press_status +0315 6848c912 fetcht 1 ,mem_customer_key_gpio +0316 20403f56 call mouse_gpio_config_input_pu +0317 20404174 call mouse_check_customerkey_gpio + 10 +0318 1a227e00 copy rega ,pdata +0319 20600000 rtn p_mouse_check_lkey_gpio: -0309 6fe0c918 fetch 1 ,mem_lbutton_gpio -030a 20400332 call p_mouse_gpio_config_output_high -030b 20404124 call mouse_check_lkey_gpio -030c 6848c918 fetcht 1 ,mem_lbutton_gpio -030d 20203f56 branch mouse_gpio_config_input_pu +031a 6fe0c918 fetch 1 ,mem_lbutton_gpio +031b 20400343 call p_mouse_gpio_config_output_high +031c 20404124 call mouse_check_lkey_gpio +031d 6848c918 fetcht 1 ,mem_lbutton_gpio +031e 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_rkey_gpio: -030e 6fe0c919 fetch 1 ,mem_rbutton_gpio -030f 20400332 call p_mouse_gpio_config_output_high -0310 2040412a call mouse_check_rkey_gpio -0311 6848c919 fetcht 1 ,mem_rbutton_gpio -0312 20203f56 branch mouse_gpio_config_input_pu +031f 6fe0c919 fetch 1 ,mem_rbutton_gpio +0320 20400343 call p_mouse_gpio_config_output_high +0321 2040412a call mouse_check_rkey_gpio +0322 6848c919 fetcht 1 ,mem_rbutton_gpio +0323 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_mkey_gpio: -0313 6fe0c91a fetch 1 ,mem_mbutton_gpio -0314 20400332 call p_mouse_gpio_config_output_high -0315 20404130 call mouse_check_mkey_gpio -0316 6848c91a fetcht 1 ,mem_mbutton_gpio -0317 20203f56 branch mouse_gpio_config_input_pu +0324 6fe0c91a fetch 1 ,mem_mbutton_gpio +0325 20400343 call p_mouse_gpio_config_output_high +0326 20404130 call mouse_check_mkey_gpio +0327 6848c91a fetcht 1 ,mem_mbutton_gpio +0328 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_bkkey_gpio: -0318 6fe0c90d fetch 1 ,mem_bk_button_gpio -0319 c17f8000 rtneq gpio_disable -031a 704b9603 jam mouse_bk_key ,mem_mouse_key_temp -031b 6fe0cb91 fetch 1 ,mem_mouse_bkkey_press_status -031c 1fe22600 copy pdata ,regc -031d 6848c90d fetcht 1 ,mem_bk_button_gpio -031e 6fe0c910 fetch 1 ,mem_matrix_public_gpio -031f c07f8321 beq gpio_disable ,p_mouse_3io6key_bk_check -0320 2020413e branch mouse_check_bkkey_gpio_next +0329 6fe0c90d fetch 1 ,mem_bk_button_gpio +032a c17f8000 rtneq gpio_disable +032b 704b9603 jam mouse_bk_key ,mem_mouse_key_temp +032c 6fe0cb91 fetch 1 ,mem_mouse_bkkey_press_status +032d 1fe22600 copy pdata ,regc +032e 6848c90d fetcht 1 ,mem_bk_button_gpio +032f 6fe0c910 fetch 1 ,mem_matrix_public_gpio +0330 c07f8332 beq gpio_disable ,p_mouse_3io6key_bk_check +0331 2020413e branch mouse_check_bkkey_gpio_next p_mouse_3io6key_bk_check: -0321 6fe0c90d fetch 1 ,mem_bk_button_gpio -0322 20400334 call p_mouse_gpio_config_output_low -0323 6848c90d fetcht 1 ,mem_bk_button_gpio -0324 2020414b branch mouse_3io6key_bk_check +0332 6fe0c90d fetch 1 ,mem_bk_button_gpio +0333 20400345 call p_mouse_gpio_config_output_low +0334 6848c90d fetcht 1 ,mem_bk_button_gpio +0335 2020414b branch mouse_3io6key_bk_check p_mouse_check_fwkey_gpio: -0325 6fe0c90e fetch 1 ,mem_fw_button_gpio -0326 c17f8000 rtneq gpio_disable -0327 704b9604 jam mouse_fw_key ,mem_mouse_key_temp -0328 6fe0cb92 fetch 1 ,mem_mouse_fwkey_press_status -0329 1fe22600 copy pdata ,regc -032a 6848c90e fetcht 1 ,mem_fw_button_gpio -032b 6fe0c910 fetch 1 ,mem_matrix_public_gpio -032c c07f832e beq gpio_disable ,p_mouse_3io6key_fw_check -032d 20204157 branch mouse_check_fwkey_gpio_next +0336 6fe0c90e fetch 1 ,mem_fw_button_gpio +0337 c17f8000 rtneq gpio_disable +0338 704b9604 jam mouse_fw_key ,mem_mouse_key_temp +0339 6fe0cb92 fetch 1 ,mem_mouse_fwkey_press_status +033a 1fe22600 copy pdata ,regc +033b 6848c90e fetcht 1 ,mem_fw_button_gpio +033c 6fe0c910 fetch 1 ,mem_matrix_public_gpio +033d c07f833f beq gpio_disable ,p_mouse_3io6key_fw_check +033e 20204157 branch mouse_check_fwkey_gpio_next p_mouse_3io6key_fw_check: -032e 6fe0c90e fetch 1 ,mem_fw_button_gpio -032f 20400334 call p_mouse_gpio_config_output_low -0330 6848c90e fetcht 1 ,mem_fw_button_gpio -0331 20204164 branch mouse_3io6key_fw_check +033f 6fe0c90e fetch 1 ,mem_fw_button_gpio +0340 20400345 call p_mouse_gpio_config_output_low +0341 6848c90e fetcht 1 ,mem_fw_button_gpio +0342 20204164 branch mouse_3io6key_fw_check p_mouse_gpio_config_output_high: -0332 d840003f arg gpcfg_output_high ,temp -0333 20206093 branch gpio_config_function_int +0343 d840003f arg gpcfg_output_high ,temp +0344 20206093 branch gpio_config_function_int p_mouse_gpio_config_output_low: -0334 d840003e arg gpcfg_output_low ,temp -0335 20206093 branch gpio_config_function_int +0345 d840003e arg gpcfg_output_low ,temp +0346 20206093 branch gpio_config_function_int p_mouse_idle: -0336 20404990 call mouse_low_voltage_led_no_enter_lpm -0337 20407936 call ui_check_paring_button -0338 2040033a call p_mouse_dpi_check -0339 2020464f branch mouse_idle + 4 +0347 20404990 call mouse_low_voltage_led_no_enter_lpm +0348 20407936 call ui_check_paring_button +0349 2040034b call p_mouse_dpi_check +034a 2020464f branch mouse_idle + 4 p_mouse_dpi_check: -033a 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -033b c2974036 bbit1 mouse_enable_dpi_key_connect_adc ,mouse_dpi_check_connect_adc -033c 6fe0c90f fetch 1 ,mem_dpi_button_gpio -033d c17f8000 rtneq gpio_disable -033e da200000 arg 0 ,rega -033f 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp -0340 6848c90f fetcht 1 ,mem_dpi_button_gpio -0341 20400343 call p_mouse_dpi_key_check -0342 2020402f branch mouse_dpi_check_next +034b 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +034c c2974036 bbit1 mouse_enable_dpi_key_connect_adc ,mouse_dpi_check_connect_adc +034d 6fe0c90f fetch 1 ,mem_dpi_button_gpio +034e c17f8000 rtneq gpio_disable +034f da200000 arg 0 ,rega +0350 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp +0351 6848c90f fetcht 1 ,mem_dpi_button_gpio +0352 20400354 call p_mouse_dpi_key_check +0353 2020402f branch mouse_dpi_check_next p_mouse_dpi_key_check: -0343 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0344 c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd -0345 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status -0346 1fe22600 copy pdata ,regc -0347 6fe0c910 fetch 1 ,mem_matrix_public_gpio -0348 c07f834a beq gpio_disable ,p_mouse_3io6key_dpi_check -0349 2020403f branch mouse_dpi_key_check_next +0354 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0355 c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd +0356 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status +0357 1fe22600 copy pdata ,regc +0358 6fe0c910 fetch 1 ,mem_matrix_public_gpio +0359 c07f835b beq gpio_disable ,p_mouse_3io6key_dpi_check +035a 2020403f branch mouse_dpi_key_check_next p_mouse_3io6key_dpi_check: -034a 6fe0c90f fetch 1 ,mem_dpi_button_gpio -034b 20400334 call p_mouse_gpio_config_output_low -034c 6848c90f fetcht 1 ,mem_dpi_button_gpio -034d 20204195 branch mouse_3io6key_check +035b 6fe0c90f fetch 1 ,mem_dpi_button_gpio +035c 20400345 call p_mouse_gpio_config_output_low +035d 6848c90f fetcht 1 ,mem_dpi_button_gpio +035e 20204195 branch mouse_3io6key_check org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/HC108_Only2.4G_AotuPair_Li/program/patch.prog (revision 829) +++ /YC1308AC/branch/mouse_project/XZR/HC108_Only2.4G_AotuPair_Li/program/patch.prog (working copy) @@ -736,7 +736,7 @@ fetch 2,mem_mouse_logo_led_on_timer rtn blank fetcht 1,mem_mouse_logo_led_gpio - call gpio_out_inactive + call gpio_out_active arg mem_mouse_logo_led_on_timer,regc arg p_mouse_logo_led_on_timeout,regb branch timer_single_step_2B @@ -744,7 +744,7 @@ setarg 0 store 2,mem_mouse_logo_led_on_timer fetcht 1,mem_mouse_logo_led_gpio - branch gpio_out_active + branch gpio_out_inactive p_mouse_dpi_led_blink_delay_timer: arg mem_mouse_dpi_led_delay_count,regc @@ -1023,8 +1023,28 @@ call p_mouse_check_mkey_gpio call p_mouse_check_bkkey_gpio call p_mouse_check_fwkey_gpio - branch mouse_check_key_gpio_next +// branch mouse_check_key_gpio_next +p_mouse_check_customerkey_gpio: + jam 0,mem_customer_key + fetch MOUSE_FLAG_LEN,mem_mouse_flag + rtnbit0 MOUSE_ENABLE_KEYBOARD + fetch 1,mem_customer_key_gpio + rtneq GPIO_DISABLE + jam MOUSE_CUSTOMER_KEY,mem_mouse_key_temp + fetch 1,mem_mouse_customerkey_press_status + copy pdata,regc + fetch 1,mem_customer_key_gpio + call p_mouse_gpio_config_output_low + fetcht 1,mem_customer_key_gpio + call mouse_3io6key_check + store 1,mem_mouse_customerkey_press_status + fetcht 1,mem_customer_key_gpio + call mouse_gpio_config_input_pu + call mouse_check_customerkey_gpio+10 + copy rega,pdata + rtn + p_mouse_check_lkey_gpio: fetch 1,mem_lbutton_gpio call p_mouse_gpio_config_output_high Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/HC108_Only2.4G_AotuPair_Li/sched/mouse.dat (revision 829) +++ /YC1308AC/branch/mouse_project/XZR/HC108_Only2.4G_AotuPair_Li/sched/mouse.dat (working copy) @@ -130,7 +130,7 @@ mem_customer_key_gpio:0a #0a mem_whee_a_data_gpio:05 mem_whee_b_data_gpio:04 -mem_config_device_24g_led_gpio:ff +mem_config_device_24g_led_gpio:03 mem_config_device_bt1_led_gpio:ff mem_select_sensor_angle_gpio:ff @@ -210,7 +210,7 @@ #adc start mem_adc_config_flag_init:00 #00-vinlpm 01-hvin 02-gpio -mem_adc_channel:05 #00-gpio4 01-gpio5 02-gpio6 03-gpio7 04-gpio9 05-gpio10 06-gpio11 07-gpio12 +mem_adc_channel:ff #00-gpio4 01-gpio5 02-gpio6 03-gpio7 04-gpio9 05-gpio10 06-gpio11 07-gpio12 #mem_mouse_vdd_full_vol:#05 01 #1.5V #9f 00#mem_mouse_vdd_empty_vol :0.9V #b1 00#mem_mouse_vdd_low_vol :1.0V