Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_2ch_Close_Ice_Desktop_YJX_D19/output/eeprom.dat (revision 5014) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_2ch_Close_Ice_Desktop_YJX_D19/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -9e +92 17 c2 84 @@ -79,7 +79,7 @@ c0 67 85 -a7 +ae c0 68 03 @@ -203,7 +203,7 @@ c0 76 85 -b9 +b6 20 20 13 @@ -2015,7 +2015,7 @@ 20 40 05 -de +db 20 40 27 @@ -2067,7 +2067,7 @@ 20 20 05 -95 +9c 70 4b 94 @@ -5659,7 +5659,7 @@ 20 40 05 -8a +91 20 40 79 @@ -5667,15 +5667,43 @@ 20 40 05 -95 +8a 20 40 05 -8e +95 20 20 46 50 +d8 +e0 +00 +0d +20 +40 +7d +74 +24 +7a +00 +00 +20 +40 +05 +9c +d8 +e0 +00 +0d +58 +00 +00 +1e +20 +20 +7d +66 6f e0 cc @@ -5699,11 +5727,11 @@ c2 94 85 -92 +99 c2 9b 85 -92 +99 20 60 00 @@ -5743,7 +5771,7 @@ 20 40 05 -9c +a3 20 20 40 @@ -5771,7 +5799,7 @@ c0 7f 85 -a3 +aa 20 20 40 @@ -5804,14 +5832,6 @@ e0 c9 92 -6f -e0 -c9 -27 -c0 -06 -05 -b1 1f e0 fe @@ -5833,38 +5853,6 @@ 46 43 6f -e0 -c9 -92 -1f -e0 -fe -01 -1f -e6 -7c -04 -20 -22 -85 -b6 -20 -20 -05 -ae -70 -49 -92 -00 -20 -40 -03 -26 -20 -20 -46 -43 -6f e1 47 8c @@ -5899,7 +5887,7 @@ c5 13 05 -c3 +c0 6f e0 c8 @@ -5911,7 +5899,7 @@ 24 21 05 -dd +da 6f e0 c8 @@ -5923,7 +5911,7 @@ 24 21 05 -cb +c8 6f e0 c8 @@ -5931,7 +5919,7 @@ c0 00 05 -de +db 20 60 00 @@ -5967,7 +5955,7 @@ c5 13 05 -d4 +d1 6f e0 c8 @@ -5999,7 +5987,7 @@ c0 01 05 -e5 +e2 c0 00 a7 @@ -6019,7 +6007,7 @@ c0 01 85 -e4 +e1 1f e0 fe @@ -6035,11 +6023,11 @@ c0 01 05 -e5 +e2 20 20 05 -e5 +e2 70 41 e8 @@ -6048,8 +6036,8 @@ 60 00 00 -3b -2d +cb +72 aa 55 40 @@ -6195,7 +6183,7 @@ 00 00 04 -21 +29 1b aa 55 @@ -6247,8 +6235,8 @@ ff ff 03 -05 04 +05 ff ff ff @@ -7427,10 +7415,10 @@ aa aa 55 -23 +2b a4 -8d -2d +07 +fb ff ff ff @@ -8188,5 +8176,17 @@ ff ff ff -0c -60 +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +3b +f2 Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_2ch_Close_Ice_Desktop_YJX_D19/output/program.lis (revision 5014) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_2ch_Close_Ice_Desktop_YJX_D19/output/program.lis (working copy) @@ -18,7 +18,7 @@ 000f c065025a beq patch19_2 ,p_mouse_lpm_before_common 0010 c06600c2 beq patch19_4 ,p_mouse_adc_read_start 0011 c06704fc beq patch19_6 ,p_mouse_motion -0012 c06785a7 beq patch19_7 ,p_mouse_dpi_process +0012 c06785ae beq patch19_7 ,p_mouse_dpi_process 0013 c0680326 beq patch1a_0 ,p_mouse_seting_dpi 0014 c0688539 beq patch1a_1 ,p_mouse_check_key_gpio 0015 c0698343 beq patch1a_3 ,p_mouse_init_sunt @@ -51,7 +51,7 @@ 002e c07501bf beq patch3d_2 ,p_g24_transmit_no_interrupt 002f c07581ed beq patch3d_3 ,p_g24_transmit_hop_process 0030 c07604f1 beq patch3d_4 ,p_g24_lpm_wait -0031 c07685b9 beq patch3d_5 ,p_power_ctrl_start +0031 c07685b6 beq patch3d_5 ,p_power_ctrl_start 0032 2020137c branch loop p_soft_reset: @@ -650,7 +650,7 @@ 01f3 684a488d fetcht 4 ,mem_24g_fast_conn_addr 01f4 98467c00 isub temp ,null 01f5 2022a2cb branch g24_ch ,zero -01f6 204005de call p_power_ctrl_txpower_incrs +01f6 204005db call p_power_ctrl_txpower_incrs 01f7 20402724 call power_ctrl_pac_succ_decrs 01f8 202022cb branch g24_ch @@ -669,7 +669,7 @@ p_mouse_dpi_check_once: 0201 6fe44bab fetch mouse_flag_len ,mem_mouse_flag 0202 c4140000 rtnbit0 mouse_enable_select_device_by_dpi_button -0203 20200595 branch p_mouse_dpi_check +0203 2020059c branch p_mouse_dpi_check p_mouse_select_device_by_pb_button_check_once: 0204 704b9403 jam 0x03 ,mem_mouse_pbkey_press_status @@ -1945,148 +1945,145 @@ 0584 20203f56 branch mouse_gpio_config_input_pu p_mouse_idle: -0585 2040058a call p_mouse_low_voltage_led_no_enter_lpm +0585 20400591 call p_mouse_low_voltage_led_no_enter_lpm 0586 20407936 call ui_check_paring_button -0587 20400595 call p_mouse_dpi_check -0588 2040058e call p_mouse_select_device_check +0587 2040058a call p_mouse_30ms_event_timer +0588 20400595 call p_mouse_select_device_check 0589 20204650 branch mouse_idle + 5 +p_mouse_30ms_event_timer: +058a d8e0000d arg 13 ,queue +058b 20407d74 call timer_check +058c 247a0000 nrtn blank +058d 2040059c call p_mouse_dpi_check + +p_mouse_30ms_event_timer_init: +058e d8e0000d arg 13 ,queue +058f 5800001e setarg 30 +0590 20207d66 branch timer_init + p_mouse_low_voltage_led_no_enter_lpm: -058a 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config -058b c301c990 bbit0 mouse_enable_low_led ,mouse_low_voltage_led_no_enter_lpm +0591 6fe0cc40 fetch 1 ,mem_mouse_led_new_interface_config +0592 c301c990 bbit0 mouse_enable_low_led ,mouse_low_voltage_led_no_enter_lpm p_mouse_low_voltage_led_no_enter_lpm_next: -058c 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -058d 20204992 branch mouse_low_voltage_led_no_enter_lpm + 2 +0593 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0594 20204992 branch mouse_low_voltage_led_no_enter_lpm + 2 p_mouse_select_device_check: -058e 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -058f c2948592 bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge -0590 c29b8592 bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge -0591 20600000 rtn +0595 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +0596 c2948599 bbit1 mouse_enable_select_device_by_pb_button ,p_mouse_select_device_by_pb_button_check_judge +0597 c29b8599 bbit1 mouse_enable_pb_button_long_press_disconvery ,p_mouse_select_device_by_pb_button_check_judge +0598 20600000 rtn p_mouse_select_device_by_pb_button_check_judge: -0592 6fe1478c fetch 2 ,mem_ui_state_map -0593 c2830204 bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once -0594 2020465a branch mouse_select_device_by_pb_button +0599 6fe1478c fetch 2 ,mem_ui_state_map +059a c2830204 bbit1 ui_state_bt_discovery ,p_mouse_select_device_by_pb_button_check_once +059b 2020465a branch mouse_select_device_by_pb_button p_mouse_dpi_check: -0595 6fe0c90f fetch 1 ,mem_dpi_button_gpio -0596 c17f8000 rtneq gpio_disable -0597 da200000 arg 0 ,rega -0598 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp -0599 6848c90f fetcht 1 ,mem_dpi_button_gpio -059a 2040059c call p_mouse_dpi_key_check -059b 2020402f branch mouse_dpi_check_next +059c 6fe0c90f fetch 1 ,mem_dpi_button_gpio +059d c17f8000 rtneq gpio_disable +059e da200000 arg 0 ,rega +059f 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp +05a0 6848c90f fetcht 1 ,mem_dpi_button_gpio +05a1 204005a3 call p_mouse_dpi_key_check +05a2 2020402f branch mouse_dpi_check_next p_mouse_dpi_key_check: -059c 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -059d c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd -059e 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status -059f 1fe22600 copy pdata ,regc -05a0 6fe0c910 fetch 1 ,mem_matrix_public_gpio -05a1 c07f85a3 beq gpio_disable ,p_mouse_3io6key_dpi_check -05a2 2020403f branch mouse_dpi_key_check_next +05a3 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +05a4 c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd +05a5 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status +05a6 1fe22600 copy pdata ,regc +05a7 6fe0c910 fetch 1 ,mem_matrix_public_gpio +05a8 c07f85aa beq gpio_disable ,p_mouse_3io6key_dpi_check +05a9 2020403f branch mouse_dpi_key_check_next p_mouse_3io6key_dpi_check: -05a3 6fe0c90f fetch 1 ,mem_dpi_button_gpio -05a4 2040056f call p_mouse_gpio_config_output_low -05a5 6848c90f fetcht 1 ,mem_dpi_button_gpio -05a6 20204195 branch mouse_3io6key_check +05aa 6fe0c90f fetch 1 ,mem_dpi_button_gpio +05ab 2040056f call p_mouse_gpio_config_output_low +05ac 6848c90f fetcht 1 ,mem_dpi_button_gpio +05ad 20204195 branch mouse_3io6key_check p_mouse_dpi_process: -05a7 20404072 call mouse_dpi_ghost_check -05a8 20740000 rtn user +05ae 20404072 call mouse_dpi_ghost_check +05af 20740000 rtn user p_mouse_dpi_process_next: -05a9 6fe0c992 fetch 1 ,mem_mouse_dpi -05aa 6fe0c927 fetch 1 ,mem_config_sensor_type -05ab c00605b1 beq s201x ,p_mouse_dpi_process_s201 -05ac 1fe0fe01 increase 1 ,pdata -05ad 1fe17e03 and pdata ,0x03 ,pdata +05b0 6fe0c992 fetch 1 ,mem_mouse_dpi +05b1 1fe0fe01 increase 1 ,pdata +05b2 1fe17e03 and pdata ,0x03 ,pdata p_mouse_dpi_store: -05ae 67e0c992 store 1 ,mem_mouse_dpi -05af 20400326 call p_mouse_seting_dpi -05b0 20204643 branch mouse_store_eerpom_dpi - -p_mouse_dpi_process_s201: -05b1 6fe0c992 fetch 1 ,mem_mouse_dpi -05b2 1fe0fe01 increase 1 ,pdata -05b3 1fe67c04 sub pdata ,4 ,null -05b4 202285b6 branch p_mouse_dpi_s201_clean ,zero -05b5 202005ae branch p_mouse_dpi_store - -p_mouse_dpi_s201_clean: -05b6 70499200 jam mouse_dpi_level1 ,mem_mouse_dpi -05b7 20400326 call p_mouse_seting_dpi -05b8 20204643 branch mouse_store_eerpom_dpi +05b3 67e0c992 store 1 ,mem_mouse_dpi +05b4 20400326 call p_mouse_seting_dpi +05b5 20204643 branch mouse_store_eerpom_dpi p_power_ctrl_start: -05b9 6fe1478c fetch 2 ,mem_ui_state_map -05ba c3858000 rtnbit1 ui_state_ble_adv -05bb c3838000 rtnbit1 ui_state_bt_reconnect -05bc c3830000 rtnbit1 ui_state_bt_discovery -05bd 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr -05be 204025cb call rssi_average -05bf 6048c8c7 storet 1 ,mem_rssi_avg_received -05c0 6fe0c8cc fetch 1 ,mem_rssi_dis_max_24g -05c1 c51305c3 bmark1 mark_24g ,p_power_ctrl_start_next -05c2 6fe0c8cf fetch 1 ,mem_rssi_dis_max_ble +05b6 6fe1478c fetch 2 ,mem_ui_state_map +05b7 c3858000 rtnbit1 ui_state_ble_adv +05b8 c3838000 rtnbit1 ui_state_bt_reconnect +05b9 c3830000 rtnbit1 ui_state_bt_discovery +05ba 6a214899 fetchr rega ,2 ,mem_rssi_signal_buf_ptr +05bb 204025cb call rssi_average +05bc 6048c8c7 storet 1 ,mem_rssi_avg_received +05bd 6fe0c8cc fetch 1 ,mem_rssi_dis_max_24g +05be c51305c0 bmark1 mark_24g ,p_power_ctrl_start_next +05bf 6fe0c8cf fetch 1 ,mem_rssi_dis_max_ble p_power_ctrl_start_next: -05c3 98467c00 isub temp ,null -05c4 242105dd nbranch p_power_ctrl_txpower_incrs_force ,positive +05c0 98467c00 isub temp ,null +05c1 242105da nbranch p_power_ctrl_txpower_incrs_force ,positive +05c2 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +05c3 1fe67c02 sub pdata ,2 ,null +05c4 242105c8 nbranch p_power_ctrl_txpower_decrs_check ,positive 05c5 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -05c6 1fe67c02 sub pdata ,2 ,null -05c7 242105cb nbranch p_power_ctrl_txpower_decrs_check ,positive -05c8 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -05c9 c00005de beq 0 ,p_power_ctrl_txpower_incrs -05ca 20600000 rtn +05c6 c00005db beq 0 ,p_power_ctrl_txpower_incrs +05c7 20600000 rtn p_power_ctrl_txpower_decrs_check: -05cb 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt -05cc 6848c8ca fetcht 1 ,mem_power_ctrl_pac_succ_cnt_init -05cd 98467c00 isub temp ,null -05ce 24628000 nrtn zero -05cf 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt +05c8 6fe0c8c9 fetch 1 ,mem_power_ctrl_pac_succ_cnt +05c9 6848c8ca fetcht 1 ,mem_power_ctrl_pac_succ_cnt_init +05ca 98467c00 isub temp ,null +05cb 24628000 nrtn zero +05cc 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt p_power_ctrl_txpower_decrs: -05d0 6848c8c7 fetcht 1 ,mem_rssi_avg_received -05d1 6fe0c8cb fetch 1 ,mem_rssi_dis_min_24g -05d2 c51305d4 bmark1 mark_24g ,p_power_ctrl_txpower_decrs_next -05d3 6fe0c8ce fetch 1 ,mem_rssi_dis_min_ble +05cd 6848c8c7 fetcht 1 ,mem_rssi_avg_received +05ce 6fe0c8cb fetch 1 ,mem_rssi_dis_min_24g +05cf c51305d1 bmark1 mark_24g ,p_power_ctrl_txpower_decrs_next +05d0 6fe0c8ce fetch 1 ,mem_rssi_dis_min_ble p_power_ctrl_txpower_decrs_next: -05d4 98467c00 isub temp ,null -05d5 24610000 nrtn positive -05d6 6fe0c8c8 fetch 1 ,mem_power_ctrl_level -05d7 c000271b beq 0 ,power_ctrl_decrs_level0 -05d8 1fe0ffff increase -1 ,pdata -05d9 67e0c8c8 store 1 ,mem_power_ctrl_level -05da c00105e5 beq 2 ,p_power_ctrl_decrs_level2 -05db c000a711 beq 1 ,power_ctrl_decrs_level1 -05dc 2020271b branch power_ctrl_decrs_level0 +05d1 98467c00 isub temp ,null +05d2 24610000 nrtn positive +05d3 6fe0c8c8 fetch 1 ,mem_power_ctrl_level +05d4 c000271b beq 0 ,power_ctrl_decrs_level0 +05d5 1fe0ffff increase -1 ,pdata +05d6 67e0c8c8 store 1 ,mem_power_ctrl_level +05d7 c00105e2 beq 2 ,p_power_ctrl_decrs_level2 +05d8 c000a711 beq 1 ,power_ctrl_decrs_level1 +05d9 2020271b branch power_ctrl_decrs_level0 p_power_ctrl_txpower_incrs_force: -05dd 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt +05da 7048c900 jam 0 ,mem_power_ctrl_pac_succ_cnt p_power_ctrl_txpower_incrs: -05de 6fe0c8c8 fetch 1 ,mem_power_ctrl_level -05df c00185e4 beq 3 ,p_power_ctrl_incrs_level3 -05e0 1fe0fe01 increase 1 ,pdata -05e1 67e0c8c8 store 1 ,mem_power_ctrl_level -05e2 c000a711 beq 1 ,power_ctrl_incrs_level1 -05e3 c00105e5 beq 2 ,p_power_ctrl_incrs_level2 +05db 6fe0c8c8 fetch 1 ,mem_power_ctrl_level +05dc c00185e1 beq 3 ,p_power_ctrl_incrs_level3 +05dd 1fe0fe01 increase 1 ,pdata +05de 67e0c8c8 store 1 ,mem_power_ctrl_level +05df c000a711 beq 1 ,power_ctrl_incrs_level1 +05e0 c00105e2 beq 2 ,p_power_ctrl_incrs_level2 p_power_ctrl_incrs_level3: -05e4 202005e5 branch p_power_ctrl_incrs_level2 +05e1 202005e2 branch p_power_ctrl_incrs_level2 p_power_ctrl_decrs_level2: p_power_ctrl_incrs_level2: -05e5 7041e803 jam tx_power_3db ,mem_tx_power -05e6 20600000 rtn +05e2 7041e803 jam tx_power_3db ,mem_tx_power +05e3 20600000 rtn org 0x3bc1 mouse_init: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_2ch_Close_Ice_Desktop_YJX_D19/program/patch.prog (revision 5014) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_2ch_Close_Ice_Desktop_YJX_D19/program/patch.prog (working copy) @@ -2422,13 +2422,24 @@ p_mouse_idle: call p_mouse_low_voltage_led_no_enter_lpm call ui_check_paring_button - call p_mouse_dpi_check + call p_mouse_30ms_event_timer + // call p_mouse_dpi_check ifdef DOUBLE_DPI_KEY call p_mouse_dpi_another_gpio_check endif call p_mouse_select_device_check branch mouse_idle+5 +p_mouse_30ms_event_timer: + arg 13,queue + call timer_check + nrtn blank + call p_mouse_dpi_check +p_mouse_30ms_event_timer_init: + arg 13,queue + setarg 30 + branch timer_init + p_mouse_low_voltage_led_no_enter_lpm: fetch 1,mem_mouse_led_new_interface_config bbit0 MOUSE_ENABLE_LOW_LED,mouse_low_voltage_led_no_enter_lpm @@ -2560,10 +2571,6 @@ bbit1 MOUSE_ENABLE_DOUBLE_DPI_KEY,p_mouse_double_dpi_check copy temp,pdata endif -ifdef S201X_SENSOR - fetch 1,mem_config_sensor_type - beq S201X,p_mouse_dpi_process_S201 -endif increase 1,pdata and pdata,0x03,pdata p_mouse_dpi_store: @@ -2571,17 +2578,6 @@ call p_mouse_seting_dpi branch mouse_store_eerpom_dpi -p_mouse_dpi_process_S201: - fetch 1,mem_mouse_dpi - increase 1,pdata - sub pdata,4,null - branch p_mouse_dpi_s201_clean,zero - branch p_mouse_dpi_store -p_mouse_dpi_s201_clean: - jam MOUSE_DPI_LEVEL1,mem_mouse_dpi - call p_mouse_seting_dpi - branch mouse_store_eerpom_dpi - ifdef DOUBLE_DPI_KEY p_mouse_double_dpi_check: fetch 1,mem_dpi_another_button_down_enable Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_2ch_Close_Ice_Desktop_YJX_D19/sched/mouse.dat (revision 5014) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/SlideSwitch_3m_2ch_Close_Ice_Desktop_YJX_D19/sched/mouse.dat (working copy) @@ -85,7 +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 -21 +29 #mouse flag byte8 #bit0 MOUSE_ENABLE_SMOOTHER @@ -123,8 +123,8 @@ mem_matrix_public_gpio:ff mem_sensor_motion_gpio:ff mem_customer_key_gpio:03 -mem_whee_a_data_gpio:05 -mem_whee_b_data_gpio:04 +mem_whee_a_data_gpio:04 +mem_whee_b_data_gpio:05 mem_config_device_24g_led_gpio:ff mem_config_device_bt1_led_gpio:ff mem_select_sensor_angle_gpio:ff