Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_907_connect_vin_five_six_level/program/patch.prog (revision 5461) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_907_connect_vin_five_six_level/program/patch.prog (working copy) @@ -8,7 +8,7 @@ define G24_RETRANSMIT_KEY_SCAN define SEARCH_DONGLE define S201X_SENSOR -// define P3212_SIX_LEVEL +define P3212_SIX_LEVEL // define SELECT_ANGLE //define PAIR_POWER_CTRL_20_50cm define PAIR_POWER_CTRL_50_110cm @@ -362,21 +362,13 @@ fetch 1,mem_adc_power_flag // bbit1 2,mouse_adc_button_press bbit1 1,p_mouse_power_down - jam 0,mem_mouse_low_power_off_timer bbit0 0,p_mouse_adc_no_low_voltage branch mouse_adc_data_process_next p_mouse_power_down: - fetch 1,mem_mouse_low_power_off_timer - nrtn blank - jam 0x1e,mem_mouse_low_power_off_timer - jam 0,mem_mouse_low_led_blink_timer - rtn - // fetch 1,mem_mouse_adc_down_flag - // rtn blank - // fetch 1,mem_mouse_led_new_interface_config //can be remove? - // bbit0 MOUSE_ENABLE_1IO2LED,mouse_power_down - // branch p_mouse_app_enter_hibernate + fetch 1,mem_mouse_led_new_interface_config //can be remove? + bbit0 MOUSE_ENABLE_LED_NEW_INTERFACE,mouse_power_down + branch p_mouse_app_enter_hibernate p_mouse_adc_no_low_voltage: fetch 1,mem_mouse_led_new_interface_config @@ -405,8 +397,6 @@ rtnbit0 MOUSE_ENABLE_LOW_LED fetch 1,mem_mouse_pair_flag rtn blank - fetch 1,mem_mouse_low_power_off_timer - nrtn blank fetch MOUSE_FLAG_LEN,mem_mouse_flag rtnbit0 MOUSE_LOW_VOLTAGE_FLAG call p_mouse_check_dpi_blink //need judge blink led=dpi? if led=dpi led->rtn @@ -440,7 +430,7 @@ beq MOUSE_ENABLE_DPI_LOW_FOR_LED,p_mouse_device_multi_led_off+1 p_mouse_low_voltage_led_off: fetcht 1,mem_mouse_low_gpio - branch p_mouse_gpio_set_analog + branch p_mouse_multi_led_off p_mouse_low_led_blink_decrease: fetch 1,mem_mouse_multi_low_led_blink_count @@ -499,12 +489,6 @@ ncall p_mouse_le_name_load,wake call mouse_init_sunt rtn wake - call adc_init_data - call p_mouse_adc_read_start - fetch 2,mem_mouse_vdd_empty_vol - fetcht 2,mem_mouse_vdd_now_vol - isub temp,null - branch mouse_app_enter_hibernate,positive jam 0,mem_mouse_pair_flag call p_mouse_seting_sensor_type call mouse_usb_check_enable @@ -1421,6 +1405,7 @@ fetch 1,mem_config_sensor_type rtneq S201X rtneq P3212 + rtneq KA8G2 branch mouse_setting_dpi_4_level ifdef S201X_SENSOR @@ -1543,8 +1528,6 @@ p_mouse_bb_event_timer: call mouse_adc_read - call p_mouse_adc_blank_init_timer - call p_mouse_low_power_off_timer call p_mouse_low_voltage_led_timer //24g call g24_pair_timeout_timer @@ -1583,51 +1566,6 @@ call mouse_store_information_delay_timer branch p_mouse_check_no_data_timeout_timer -p_mouse_adc_blank_init_timer: - fetch MOUSE_FLAG_LEN,mem_mouse_flag - bbit0 MOUSE_LOW_VOLTAGE_FLAG,p_mouse_adc_blank_init_next - fetch 2,mem_adc_bliank_init_timer - branch p_mouse_adc_blank_init,blank - pincrease -1,pdata - store 2,mem_adc_bliank_init_timer - rtn -p_mouse_adc_blank_init: - call p_mouse_adc_led_blink_count_reinit_check -p_mouse_adc_blank_init_next: - fetch 2,mem_adc_bliank_init_timer_init - store 2,mem_adc_bliank_init_timer - rtn - -p_mouse_adc_led_blink_count_reinit_check: - fetch 1,mem_mouse_led_new_interface_config - rtnbit0 MOUSE_ENABLE_LOW_LED - rtnbit0 MOUSE_ENABLE_LOW_LED_BLINK_LIMIT - branch p_mouse_multi_low_led_blink_count_init - -p_mouse_low_power_off_timer: - fetch 1,mem_mouse_low_power_off_timer - rtn blank - - call p_mouse_low_powerdown_blank - arg mem_mouse_low_power_off_timer,regc - arg p_mouse_low_power_off_timeout,regb - branch timer_single_step -p_mouse_low_power_off_timeout: - branch mouse_app_enter_hibernate -p_mouse_low_powerdown_off: - call p_mouse_low_voltage_led_off - fetch 1,mem_mouse_low_led_blink_timer - rtnne 0x0a - jam 0,mem_mouse_low_led_blink_timer - rtn -p_mouse_low_powerdown_blank: - fetch 1,mem_mouse_low_led_blink_timer - increase 1,pdata - store 1,mem_mouse_low_led_blink_timer - sub pdata, 0x05,null - nbranch p_mouse_low_powerdown_off,positive - branch p_mouse_low_voltage_led_on - p_mouse_check_direct_timeout_timer: arg mem_mouse_direct_timer,regc arg mouse_check_direct_timeout,regb @@ -2322,8 +2260,7 @@ store 1,mem_mouse_key nbranch mouse_drawing_optima_init,user call p_mouse_drawing_optima - call mouse_no_data_timer_init - branch p_mouse_multi_low_led_blink_count_init + branch mouse_no_data_timer_init ifdef P3212_SIX_LEVEL p_mouse_data_zoom: @@ -2347,7 +2284,7 @@ rtn p_mouse_xy_inverse: sub pdata,0,pdata - call p_mouse_xy_zoom + call p_mouse_xy_zoom sub pdata,0,pdata rtn Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_907_connect_vin_five_six_level/sched/mouse.dat (revision 5461) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Multimode/PB_3mode_3ch_1IO2LED_907_connect_vin_five_six_level/sched/mouse.dat (working copy) @@ -41,7 +41,7 @@ #bit4 MOUSE_ENABLE_ADC #bit5 MOUSE_ENABLE_KEYBOARD #bit6 MOUSE_ENABLE_24G_SEARCH_DONGLE -5a +4a #mouse flag byte4 #bit0 MOUSE_ENABLE_24G_250Hz @@ -103,7 +103,7 @@ #bit3 MOUSE_ENABLE_LOW_LED #bit4 MOUSE_ENABLE_LOW_LED_BLINK_LIMIT #bit5 MOUSE_ENABLE_1IO2LED -3b +23 mem_mouse_discovery_timeout:b0 04 #2min mem_mouse_24g_pair_timeout_init:58 02 #1min 24g reconn timer&pair timer @@ -117,15 +117,15 @@ mem_rssi_dis_min_ble_init:75 mem_rssi_dis_max_ble_init:80 -mem_bk_button_gpio:0b -mem_fw_button_gpio:0c -mem_dpi_button_gpio:0d +mem_bk_button_gpio:0c +mem_fw_button_gpio:0d +mem_dpi_button_gpio:0b mem_dpi_another_button_gpio:ff mem_matrix_public_gpio:ff mem_sensor_motion_gpio:ff mem_customer_key_gpio:ff -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 @@ -133,7 +133,7 @@ mem_lbutton_gpio:0b mem_rbutton_gpio:0d mem_mbutton_gpio:0c -mem_config_select_device_button_gpio:03 +mem_config_select_device_button_gpio:08 mem_whee_ta_data_gpio:ff mem_whee_tb_data_gpio:ff mem_device_switch_gpio:ff @@ -144,14 +144,14 @@ mem_dpi_led_gpio:ff #03 mem_firebutton_gpio:ff -mem_sensor_angle_default:00 #00--6CLK 01--9CLK 02--12CLK 03--3CLK -mem_sensor_angle_switch:00 #00--6CLK 01--9CLK 02--12CLK 03--3CLK +mem_sensor_angle_default:02 #00--6CLK 01--9CLK 02--12CLK 03--3CLK +mem_sensor_angle_switch:02 #00--6CLK 01--9CLK 02--12CLK 03--3CLK mem_config_sensor_dpi:00 #00--1200 01--1600 mem_mouse_logo_led_gpio:ff mem_mouse_logo_led_on_time_init:58 02 #1min mem_mouse_logo_ctrl_type:00 #00 disable bit0=1:memory bit1=1:commbation ctrl bit2=1:dpi ctrl -mem_adc_bliank_init_timer_init:6c 07 #10s+3min + mem_mouse_d_l_l_led_multi_type:00 #00 mo multi 01:dpi+logo 02:low+logo 03:dpi+low+logo mem_mouse_select_sensor_angle_type:00 #00:default 01:ice select 02:mz select @@ -169,10 +169,10 @@ mem_mouse_multi_le_reconn_blink_count_init:05 #le reconn count mem_mouse_multi_lowled_blink_count_init:0a #low count=count #io config -mem_mouse_1io2led_multi_24gled:8a -mem_mouse_1io2led_multi_bt1led:0a -mem_mouse_1io2led_multi_bt2led:88 -mem_mouse_low_gpio:8a +mem_mouse_1io2led_multi_24gled:0a +mem_mouse_1io2led_multi_bt1led:8a +mem_mouse_1io2led_multi_bt2led:03 +mem_mouse_low_gpio:ff mem_mouse_dpi_gpio:ff #1io2led multi end @@ -236,14 +236,14 @@ mem_store_information_delay_timer_init:01 #adc start -mem_adc_config_flag_init:01 #00-vinlpm 01-hvin 02-gpio +mem_adc_config_flag_init:02 #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_mouse_vdd_full_vol:0f 01 #1.5V -# a2 00#mem_mouse_vdd_empty_vol :0.9V -# b4 00#mem_mouse_vdd_low_vol :1.0V -mem_mouse_vdd_full_vol:4a 01 #3.3V -2c 01#mem_mouse_vdd_empty_vol :3.0V -40 01#mem_mouse_vdd_low_vol :3.2V +mem_mouse_vdd_full_vol:0f 01 #1.5V +a2 00#mem_mouse_vdd_empty_vol :0.9V +b4 00#mem_mouse_vdd_low_vol :1.0V +#mem_mouse_vdd_full_vol:4a 01 #3.3V +#2c 01#mem_mouse_vdd_empty_vol :3.0V +#40 01#mem_mouse_vdd_low_vol :3.2V mem_mouse_vdd_button_press_vol:10 00 mem_mouse_vdd_switch_gnd_24g_vol:52 00 mem_mouse_vdd_switch_gnd_full_vol:35 00 @@ -264,7 +264,7 @@ mem_app_connection_options:06 mem_lap:10 a3 c8 12 23 51 mem_local_name_length: -'ACER EMR213 +'W500 mem_sniff_param_interval: 0e 00 01 00 ##mem_sniff_param_attempt:01 00 @@ -300,27 +300,27 @@ #microsoft swift pair 06 ff 06 00 03 00 80 #name -'\09ACER EMR213 +'\09W500 mem_le_scan_data_len:1f mem_le_scan_data: #name -'\09ACER EMR213 +'\09W500 mem_le_name_len: -'ACER EMR213 +'W500 mem_le_name_patch_len: #max 18bytes -'ACER EMR213 +'W500 mem_mouse_le_name_modify_enable:01 #00 disable 01 enable mem_ble_device2_name: #max 18bytes -'ACER EMR213 +'W500 mem_bt_device2_name: -'ACER EMR213 +'W500 mem_le_interval_min: 06 00 #min interval @@ -369,7 +369,7 @@ 14##mem_ka8g2_dpi_0 1200 1b##mem_ka8g2_dpi_1 1600 -36##mem_ka8g2_dpi_2 3200 +28##mem_ka8g2_dpi_2 3200 0e##mem_ka8g2_dpi_3 800 mem_p3212_sensor_set: @@ -465,32 +465,32 @@ 09 00 ff ff -# mem_sensor_ka8ul_init: -# 09 5a -# 0d 10 -# 0e c5 -# 5b 9a -# 10 38 -# 11 42 -# 28 28 -# 41 23 -# 49 39 -# 4a b0 -# 4b a0 -# 4c 90 -# 4d 70 -# 09 00 -# ff ff - -# mem_sensor_8009_init: -# 09 5a -# 06 02 -# 09 69 -# 0d 48 -# 0e 9f -# 0f ba -# 09 00 -# ff ff +mem_sensor_ka8ul_init: +09 5a +0d 10 +0e c5 +5b 9a +10 38 +11 42 +28 28 +41 23 +49 39 +4a b0 +4b a0 +4c 90 +4d 70 +09 00 +ff ff + +mem_sensor_8009_init: +09 5a +06 02 +09 69 +0d 48 +0e 9f +0f ba +09 00 +ff ff mem_sensor_ka8g2_init: 09 a5