Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/ZhongXinSheng/CQ22_3mode_3ch_LMPair/output/eeprom.dat (revision 834) +++ /YC1308AC/branch/mouse_project/ZhongXinSheng/CQ22_3mode_3ch_LMPair/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -46 +5a 0d c2 84 @@ -91,7 +91,7 @@ c0 6f 03 -39 +3e c0 74 02 @@ -3103,11 +3103,11 @@ 20 40 03 -18 +1d 20 40 03 -25 +2a 20 20 41 @@ -3119,7 +3119,7 @@ 20 40 03 -35 +3a 20 40 41 @@ -3139,7 +3139,7 @@ 20 40 03 -35 +3a 20 40 41 @@ -3152,6 +3152,18 @@ 20 3f 56 +70 +4b +96 +02 +6f +e0 +cb +90 +1f +e2 +26 +00 6f e0 c9 @@ -3159,11 +3171,19 @@ 20 40 03 -35 +3c +68 +48 +c9 +1a 20 40 41 -30 +95 +67 +e0 +cb +90 68 48 c9 @@ -3203,7 +3223,7 @@ c0 7f 83 -21 +26 20 20 41 @@ -3215,7 +3235,7 @@ 20 40 03 -37 +3c 68 48 c9 @@ -3231,7 +3251,7 @@ 20 3a 03 -2e +33 6f e0 cb @@ -3315,7 +3335,7 @@ 20 40 03 -3d +42 20 20 46 @@ -3351,7 +3371,7 @@ 20 40 03 -46 +4b 20 20 40 @@ -3379,7 +3399,7 @@ c0 7f 83 -4d +52 20 20 40 @@ -3391,7 +3411,7 @@ 20 40 03 -37 +3c 68 48 c9 @@ -3400,8 +3420,8 @@ 20 41 95 -a0 -79 +97 +dd aa 55 40 @@ -3551,7 +3571,7 @@ 01 22 86 -03 +1b aa 55 0c @@ -3715,7 +3735,7 @@ 0a 60 06 -05 +0a 00 64 00 @@ -3725,8 +3745,8 @@ 0a 90 01 -e8 -03 +f4 +01 90 01 aa @@ -4404,14 +4424,14 @@ 00 65 48 -02 +01 aa 55 01 00 64 48 -02 +01 aa 55 01 @@ -4593,28 +4613,8 @@ e8 41 01 -55 -aa -aa -55 -8c -64 -69 -84 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +71 +b9 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -c0 -06 +38 +45 Index: output/flash.dat =================================================================== --- /YC1308AC/branch/mouse_project/ZhongXinSheng/CQ22_3mode_3ch_LMPair/output/flash.dat (revision 834) +++ /YC1308AC/branch/mouse_project/ZhongXinSheng/CQ22_3mode_3ch_LMPair/output/flash.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -46 +5a 0d c2 84 @@ -91,7 +91,7 @@ c0 6f 03 -39 +3e c0 74 02 @@ -3103,11 +3103,11 @@ 20 40 03 -18 +1d 20 40 03 -25 +2a 20 20 41 @@ -3119,7 +3119,7 @@ 20 40 03 -35 +3a 20 40 41 @@ -3139,7 +3139,7 @@ 20 40 03 -35 +3a 20 40 41 @@ -3152,6 +3152,18 @@ 20 3f 56 +70 +4b +96 +02 +6f +e0 +cb +90 +1f +e2 +26 +00 6f e0 c9 @@ -3159,11 +3171,19 @@ 20 40 03 -35 +3c +68 +48 +c9 +1a 20 40 41 -30 +95 +67 +e0 +cb +90 68 48 c9 @@ -3203,7 +3223,7 @@ c0 7f 83 -21 +26 20 20 41 @@ -3215,7 +3235,7 @@ 20 40 03 -37 +3c 68 48 c9 @@ -3231,7 +3251,7 @@ 20 3a 03 -2e +33 6f e0 cb @@ -3315,7 +3335,7 @@ 20 40 03 -3d +42 20 20 46 @@ -3351,7 +3371,7 @@ 20 40 03 -46 +4b 20 20 40 @@ -3379,7 +3399,7 @@ c0 7f 83 -4d +52 20 20 40 @@ -3391,7 +3411,7 @@ 20 40 03 -37 +3c 68 48 c9 @@ -3400,8 +3420,8 @@ 20 41 95 -a0 -79 +97 +dd aa 55 40 @@ -3551,7 +3571,7 @@ 01 22 86 -03 +1b aa 55 0c @@ -3715,7 +3735,7 @@ 0a 60 06 -05 +0a 00 64 00 @@ -3725,8 +3745,8 @@ 0a 90 01 -e8 -03 +f4 +01 90 01 aa @@ -4404,14 +4424,14 @@ 00 65 48 -02 +01 aa 55 01 00 64 48 -02 +01 aa 55 01 @@ -4593,28 +4613,8 @@ e8 41 01 -55 -aa -aa -55 -8c -64 -69 -84 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +71 +b9 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -c0 -06 +38 +45 Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/ZhongXinSheng/CQ22_3mode_3ch_LMPair/output/program.lis (revision 834) +++ /YC1308AC/branch/mouse_project/ZhongXinSheng/CQ22_3mode_3ch_LMPair/output/program.lis (working copy) @@ -21,7 +21,7 @@ 0012 c06b0193 beq patch1a_6 ,p_mouse_priority_bb_event 0013 c06c8237 beq patch1b_1 ,p_mouse_bb_event_timer 0014 c06d0285 beq patch1b_2 ,p_mouse_start_discovery -0015 c06f0339 beq patch1b_6 ,p_mouse_idle +0015 c06f033e beq patch1b_6 ,p_mouse_idle 0016 c0740292 beq patch1d_0 ,p_hid_rx_process 0017 2020137c branch loop @@ -996,109 +996,116 @@ 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 +0306 2040031d call p_mouse_check_bkkey_gpio +0307 2040032a call p_mouse_check_fwkey_gpio 0308 2020411e branch mouse_check_key_gpio_next p_mouse_check_lkey_gpio: 0309 6fe0c918 fetch 1 ,mem_lbutton_gpio -030a 20400335 call p_mouse_gpio_config_output_high +030a 2040033a 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 p_mouse_check_rkey_gpio: 030e 6fe0c919 fetch 1 ,mem_rbutton_gpio -030f 20400335 call p_mouse_gpio_config_output_high +030f 2040033a 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 p_mouse_check_mkey_gpio: -0313 6fe0c91a fetch 1 ,mem_mbutton_gpio -0314 20400335 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 +0313 704b9602 jam mouse_m_key ,mem_mouse_key_temp +0314 6fe0cb90 fetch 1 ,mem_mouse_mkey_press_status +0315 1fe22600 copy pdata ,regc + +p_mouse_3io6key_mkey_check: +0316 6fe0c91a fetch 1 ,mem_mbutton_gpio +0317 2040033c call p_mouse_gpio_config_output_low +0318 6848c91a fetcht 1 ,mem_mbutton_gpio +0319 20404195 call mouse_3io6key_check +031a 67e0cb90 store 1 ,mem_mouse_mkey_press_status +031b 6848c91a fetcht 1 ,mem_mbutton_gpio +031c 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 +031d 6fe0c90d fetch 1 ,mem_bk_button_gpio +031e c17f8000 rtneq gpio_disable +031f 704b9603 jam mouse_bk_key ,mem_mouse_key_temp +0320 6fe0cb91 fetch 1 ,mem_mouse_bkkey_press_status +0321 1fe22600 copy pdata ,regc +0322 6848c90d fetcht 1 ,mem_bk_button_gpio +0323 6fe0c910 fetch 1 ,mem_matrix_public_gpio +0324 c07f8326 beq gpio_disable ,p_mouse_3io6key_bk_check +0325 2020413e branch mouse_check_bkkey_gpio_next p_mouse_3io6key_bk_check: -0321 6fe0c90d fetch 1 ,mem_bk_button_gpio -0322 20400337 call p_mouse_gpio_config_output_low -0323 6848c90d fetcht 1 ,mem_bk_button_gpio -0324 2020414b branch mouse_3io6key_bk_check +0326 6fe0c90d fetch 1 ,mem_bk_button_gpio +0327 2040033c call p_mouse_gpio_config_output_low +0328 6848c90d fetcht 1 ,mem_bk_button_gpio +0329 2020414b branch mouse_3io6key_bk_check p_mouse_check_fwkey_gpio: -0325 6fe0cbed fetch 1 ,mem_mouse_k5_connect_adc_button_press_flag -0326 203a032e branch p_mouse_k5_button_up ,blank +032a 6fe0cbed fetch 1 ,mem_mouse_k5_connect_adc_button_press_flag +032b 203a0333 branch p_mouse_k5_button_up ,blank p_mouse_k5_button_down: -0327 6fe0cbee fetch 1 ,mem_mouse_k5_button_state -0328 c1008000 rtneq k5_button_state_down -0329 704bee01 jam k5_button_state_down ,mem_mouse_k5_button_state -032a 704b9604 jam 0x04 ,mem_mouse_key_temp -032b 6848cb96 fetcht 1 ,mem_mouse_key_temp -032c 18420e00 copy temp ,queue -032d 20204193 branch mouse_key_press +032c 6fe0cbee fetch 1 ,mem_mouse_k5_button_state +032d c1008000 rtneq k5_button_state_down +032e 704bee01 jam k5_button_state_down ,mem_mouse_k5_button_state +032f 704b9604 jam 0x04 ,mem_mouse_key_temp +0330 6848cb96 fetcht 1 ,mem_mouse_key_temp +0331 18420e00 copy temp ,queue +0332 20204193 branch mouse_key_press p_mouse_k5_button_up: -032e 6fe0cbee fetch 1 ,mem_mouse_k5_button_state -032f c1000000 rtneq k5_button_state_up -0330 704bee00 jam k5_button_state_up ,mem_mouse_k5_button_state -0331 704b9604 jam 0x04 ,mem_mouse_key_temp -0332 6848cb96 fetcht 1 ,mem_mouse_key_temp -0333 18420e00 copy temp ,queue -0334 20204191 branch mouse_key_release +0333 6fe0cbee fetch 1 ,mem_mouse_k5_button_state +0334 c1000000 rtneq k5_button_state_up +0335 704bee00 jam k5_button_state_up ,mem_mouse_k5_button_state +0336 704b9604 jam 0x04 ,mem_mouse_key_temp +0337 6848cb96 fetcht 1 ,mem_mouse_key_temp +0338 18420e00 copy temp ,queue +0339 20204191 branch mouse_key_release p_mouse_gpio_config_output_high: -0335 d840003f arg gpcfg_output_high ,temp -0336 20206093 branch gpio_config_function_int +033a d840003f arg gpcfg_output_high ,temp +033b 20206093 branch gpio_config_function_int p_mouse_gpio_config_output_low: -0337 d840003e arg gpcfg_output_low ,temp -0338 20206093 branch gpio_config_function_int +033c d840003e arg gpcfg_output_low ,temp +033d 20206093 branch gpio_config_function_int p_mouse_idle: -0339 20404990 call mouse_low_voltage_led_no_enter_lpm -033a 20407936 call ui_check_paring_button -033b 2040033d call p_mouse_dpi_check -033c 2020464f branch mouse_idle + 4 +033e 20404990 call mouse_low_voltage_led_no_enter_lpm +033f 20407936 call ui_check_paring_button +0340 20400342 call p_mouse_dpi_check +0341 2020464f branch mouse_idle + 4 p_mouse_dpi_check: -033d 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -033e c2974036 bbit1 mouse_enable_dpi_key_connect_adc ,mouse_dpi_check_connect_adc -033f 6fe0c90f fetch 1 ,mem_dpi_button_gpio -0340 c17f8000 rtneq gpio_disable -0341 da200000 arg 0 ,rega -0342 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp -0343 6848c90f fetcht 1 ,mem_dpi_button_gpio -0344 20400346 call p_mouse_dpi_key_check -0345 2020402f branch mouse_dpi_check_next +0342 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0343 c2974036 bbit1 mouse_enable_dpi_key_connect_adc ,mouse_dpi_check_connect_adc +0344 6fe0c90f fetch 1 ,mem_dpi_button_gpio +0345 c17f8000 rtneq gpio_disable +0346 da200000 arg 0 ,rega +0347 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp +0348 6848c90f fetcht 1 ,mem_dpi_button_gpio +0349 2040034b call p_mouse_dpi_key_check +034a 2020402f branch mouse_dpi_check_next p_mouse_dpi_key_check: -0346 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -0347 c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd -0348 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status -0349 1fe22600 copy pdata ,regc -034a 6fe0c910 fetch 1 ,mem_matrix_public_gpio -034b c07f834d beq gpio_disable ,p_mouse_3io6key_dpi_check -034c 2020403f branch mouse_dpi_key_check_next +034b 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +034c c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd +034d 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status +034e 1fe22600 copy pdata ,regc +034f 6fe0c910 fetch 1 ,mem_matrix_public_gpio +0350 c07f8352 beq gpio_disable ,p_mouse_3io6key_dpi_check +0351 2020403f branch mouse_dpi_key_check_next p_mouse_3io6key_dpi_check: -034d 6fe0c90f fetch 1 ,mem_dpi_button_gpio -034e 20400337 call p_mouse_gpio_config_output_low -034f 6848c90f fetcht 1 ,mem_dpi_button_gpio -0350 20204195 branch mouse_3io6key_check +0352 6fe0c90f fetch 1 ,mem_dpi_button_gpio +0353 2040033c call p_mouse_gpio_config_output_low +0354 6848c90f fetcht 1 ,mem_dpi_button_gpio +0355 20204195 branch mouse_3io6key_check org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/ZhongXinSheng/CQ22_3mode_3ch_LMPair/program/patch.prog (revision 834) +++ /YC1308AC/branch/mouse_project/ZhongXinSheng/CQ22_3mode_3ch_LMPair/program/patch.prog (working copy) @@ -1043,11 +1043,17 @@ fetcht 1,mem_rbutton_gpio branch mouse_gpio_config_input_pu p_mouse_check_mkey_gpio: + jam MOUSE_M_KEY,mem_mouse_key_temp + fetch 1,mem_mouse_mkey_press_status + copy pdata,regc +p_mouse_3io6key_mkey_check: fetch 1,mem_mbutton_gpio - call p_mouse_gpio_config_output_high - call mouse_check_mkey_gpio + call p_mouse_gpio_config_output_low fetcht 1,mem_mbutton_gpio - branch mouse_gpio_config_input_pu + call mouse_3io6key_check + store 1,mem_mouse_mkey_press_status + fetcht 1,mem_mbutton_gpio + branch mouse_gpio_config_input_pu p_mouse_check_bkkey_gpio: fetch 1,mem_bk_button_gpio Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/ZhongXinSheng/CQ22_3mode_3ch_LMPair/sched/mouse.dat (revision 834) +++ /YC1308AC/branch/mouse_project/ZhongXinSheng/CQ22_3mode_3ch_LMPair/sched/mouse.dat (working copy) @@ -13,7 +13,7 @@ mem_gain_fix:ff mem_gain_second_agc_en:00 - +mem_mouse_flag: #mouse flag byte1 #bit0 MOUSE_SELECT_DEVICE_FLAG #bit1 MOUSE_24G_PAIRING_FLAG @@ -22,7 +22,7 @@ #bit4 MOUSE_LOW_VOLTAGE_FLAG #bit5 MOUSE_BT_DISCOVERY_BUTTON_DOWN_FLAG #bit6 MOUSE_BT_DISCOVERY_BUTTON_LONG_DOWN_FLAG - +04 #mouse flag byte2 #bit0 MOUSE_ENABLE_BLE_RANDOM_ADDRE @@ -31,6 +31,7 @@ #bit3 MOUSE_ENABLE_WAKEUP_FROM_POWER #bit4 MOUSE_ENABLE_16M #bit5 MOUSE_ENABLE_USB +09 #mouse flag byte3 #bit0 MOUSE_ENABLE_SPI2 @@ -40,6 +41,7 @@ #bit4 MOUSE_ENABLE_ADC #bit5 MOUSE_ENABLE_KEYBOARD #bit6 MOUSE_ENABLE_24G_SEARCH_DONGLE +5a #mouse flag byte4 #bit0 MOUSE_ENABLE_24G_250Hz @@ -50,6 +52,7 @@ #bit5 MOUSE_ENABLE_USB_250 #bit6 MOUSE_ENABLE_USB_500 #bit7 MOUSE_ENABLE_USB_1000 +00 #mouse flag byte5 #bit0 MOUSE_ENABLE_POWER_ON_LED @@ -60,6 +63,7 @@ #bit5 MOUSE_ENABLE_DPI_FOR_4_LED #bit6 MOUSE_ENABLE_BT2_FOR_4_LED #bit7 MOUSE_ENABLE_LOW_V_FOR_4_LED +01 #mouse flag byte6 #bit0 MOUSE_ENABLE_SELECT_DEVICE_BY_DPI_BUTTON @@ -70,6 +74,7 @@ #bit5 MOUSE_ENABLE_PB_BUTTON_CONNECT_GND #bit6 MOUSE_ENABLE_DPI_KEY_CONNECT_ADC #bit7 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING +22 #mouse flag byte7 #bit0 MOUSE_ENABLE_AUTO_24G_PARING @@ -80,6 +85,7 @@ #bit5 MOUSE_ENABLE_COMMBINATION_KEY_BY_BT_DISCOVERY #bit6 MOUSE_ENABLE_DPI_KEY_LONG_PRESS_DISCONVERY #bit7 MOUSE_ENABLE_PB_BUTTON_LONG_PRESS_DISCONVERY +86 #mouse flag byte8 #bit0 MOUSE_ENABLE_SMOOTHER @@ -87,29 +93,9 @@ #bit2 MOUSE_ENABLE_24G_AUTO_PAIR_NERVER_BEEN_PAIRED #bit3 MOUSE_ENABLE_LE_BATTERY_SERVICE_CANCEL #bit4 MOUSE_ENABLE_WHEEL_WAKE_UP_CANCEL +1b -mem_mouse_flag: -04 - -#clk selsect/usb 1byte -09 #24M - -#2.4g+ee/flash+adc+customize key select 1byte -5a #2.4g+eeprom - -#sensor select 1byte -00 #3level dpi+(2.4g:125+bt/ble:115)Hz - -#led select 1byte -01 #poweron - -#mode switch+pair/discovery 2byte -22 86 #dip(matrix)+pb discovery - -#updata 1byte -03 - mem_mouse_discovery_timeout:08 07 #3min mem_mouse_24g_pair_timeout_init:2c 01 #30s 24g reconn timer&pair timer mem_mouse_direct_timeout:64 #05s @@ -188,14 +174,14 @@ mem_mouse_page_to:00 40 # 16384*0.625ms=10s mem_mouse_fast_direct_timeout:0a #1s mem_mouse_fast_page_to:60 06 # 1600*0.625ms = 1s -mem_mouse_24g_power_on_fast_conn_timer:05 00 #500ms +mem_mouse_24g_power_on_fast_conn_timer:0a 00 #1s mem_mouse_24g_search_dongle_time_init: 64 00 mem_mouse_no_data_timeout:70 17 #10min mem_mouse_device_poweron_timer_count_init:14 #2s mem_mouse_dpi_led_delay_count_init:0a #1s mem_mouse_dpi_led_blink_time: 90 01 #200ms on,200ms off -mem_mouse_disconvey_led_blink_time: e8 03 #500ms on,500ms off +mem_mouse_disconvey_led_blink_time:f4 01 #500ms on,500ms off mem_mouse_low_v_led_blink_time:90 01 #200ms on,200ms off @@ -456,8 +442,8 @@ #24g init -mem_24g_tx_phy:02#0x01:1M/0x02:2M/0x04:S2/0x84:S8 -mem_24g_rx_phy:02#0x01:1M/0x02:2M/0x04:S2/0x84:S8 +mem_24g_tx_phy:01#0x01:1M/0x02:2M/0x04:S2/0x84:S8 +mem_24g_rx_phy:01#0x01:1M/0x02:2M/0x04:S2/0x84:S8 mem_24g_data_type:01 #mouse 1,kb 2 mem_24g_max_retry:06#max tx retry mem_24g_rx_window:c0 12 #400us ## e0 2e#1ms #transmitter long range min:520us