Index: program/patch.prog =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_M5DM_S2828/program/patch.prog (revision 5675) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_M5DM_S2828/program/patch.prog (working copy) @@ -273,6 +273,8 @@ p_g24_long_sleep_shorter_param_update: + fetch 1,mem_config_function_enable + rtnbit1 ENABLE_SENSOR_MOTION_PIN setarg G24_LONG_SLEEP_STEP1 store 3,mem_24g_enter_hibernate jam 30,mem_24g_long_sleep_param_update_timer @@ -1497,15 +1499,15 @@ rtn p_mouse_le_current_mult_update: -// fetch 1,mem_config_function_enable -// rtnbit1 ENABLE_SENSOR_MOTION_PIN + fetch 1,mem_config_function_enable + rtnbit1 ENABLE_SENSOR_MOTION_PIN jam 0,mem_lpm_mult jam 30,mem_mouse_le_current_mult_timer rtn p_mouse_data_xy_release: -// fetch 1,mem_config_function_enable -// rtnbit1 ENABLE_SENSOR_MOTION_PIN + fetch 1,mem_config_function_enable + rtnbit1 ENABLE_SENSOR_MOTION_PIN fetch 1,mem_mouse_long_mult_flag rtnne 1 setarg 0 @@ -2087,7 +2089,7 @@ sub pdata,MOUSE_DPI_LEVEL2,null call p_mouse_3205_dpi_recount,zero fetch 1,mem_config_sensor_type - beq P3212,p_mouse_seting_3212_dpi +// beq P3212,p_mouse_seting_3212_dpi beq P3065_XY,p_mouse_seting_3065XY_dpi beq MA8650,p_mouse_seting_3065XY_dpi beq KA8,p_mouse_seting_ka8_dpi @@ -2120,11 +2122,11 @@ fetch 1,mem_3065xy_dpi_4 branch p_mouse_dpi_store -p_mouse_seting_3212_dpi: - fetch 1,mem_mouse_dpi - beq MOUSE_DPI_LEVEL1,mouse_set_p3212_cpi2 //1200 - beq MOUSE_DPI_LEVEL4,mouse_set_p3212_cpi4 //2400 - branch mouse_set_p3212_cpi3 //1600 +//p_mouse_seting_3212_dpi: +// fetch 1,mem_mouse_dpi +// beq MOUSE_DPI_LEVEL1,mouse_set_p3212_cpi2 //1000 +// beq MOUSE_DPI_LEVEL4,mouse_set_p3212_cpi4 //2400 +// branch mouse_set_p3212_cpi3 //1600 p_mouse_seting_ka8_dpi: @@ -2235,13 +2237,11 @@ p_mouse_p32xx_sensor_motion: call mouse_clear_sensor_data disable user -// fetch 1,mem_config_function_enable -// bbit0 ENABLE_SENSOR_MOTION_PIN,mouse_p32xx_sensor_motion_2 -// fetcht 1,mem_sensor_data_gpio -// call gpio_get_bit -// nrtn true - fetch 1,mem_config_sensor_type - beq P3212,mouse_p3212_sensor_motion_4 + fetch 1,mem_config_function_enable + bbit0 ENABLE_SENSOR_MOTION_PIN,mouse_p32xx_sensor_motion_2 + fetcht 1,mem_sensor_data_gpio + call gpio_get_bit + nrtn true branch mouse_p32xx_sensor_motion_2 p_mouse_bb_event_discovery_btn: @@ -3455,11 +3455,6 @@ p_drawing_optima: fetch 4,mem_mouse_x rtn blank - - fetch 1,mem_config_sensor_type - sub pdata,P3212,null - rtn zero - call p_data_abs_check setarg 0x06 //asm_flag enable condition call p_data_greater_than_check Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_M5DM_S2828/sched/mouse.dat (revision 5675) +++ /branch/mouse_project/ZhongXinSheng/ZXS_1066/PBSwitch_3mode_3ch_M5DM_S2828/sched/mouse.dat (working copy) @@ -48,7 +48,7 @@ #bit5 MOUSE_ENABLE_STATUE_UP_THREE_LED #bit6 MOUSE_ENABLE_STATUE_UP #bit7 MOUSE_ENABLE_DPI_LED_BLINK -08 +0a #bit0 MOUSE_ENABLE_BLE_RANDOM_ADDRE #bit1 MOUSE_ENABLE_2K_EEPROM #bit2 MOUSE_ENABLE_ADC @@ -62,7 +62,7 @@ mem_app_connection_options:06 mem_lap:26 10 19 20 18 10 mem_local_name_length: -'BT3.0 Mouse BX04 +'M5DM Mouse mem_sniff_param_interval: 0e 00 ##mem_sniff_param_interval:0e 00 report 115hz,0c 00 report 125hz 01 00 ##mem_sniff_param_attempt:01 00 @@ -95,17 +95,17 @@ #appearance 03 19 c2 03 -'\09BT5.0 Mouse BX04 +'\09M5DM Mouse mem_le_scan_data_len:1f mem_le_scan_data: #name -'\09BT5.0 Mouse BX04 +'\09M5DM Mouse #max 20bytes, att list data rom limits mem_le_name_len: -'BT5.0 Mouse BX04 +'M5DM Mouse mem_le_interval_min: @@ -139,7 +139,7 @@ mem_bt_ui_button_timeout:01 mem_device_number:03#max device number -mem_24g_device_number:00 #devie 2 :24g mode +mem_24g_device_number:01 #devie 2 :24g mode mem_adc_config_flag:02 #0 vinlpm 1 hvin 2 gpio mem_adc_channel:32 #gpio5 mem_mouse_vdd_full_vol:8b 00#1.5v @@ -152,8 +152,8 @@ 17 #mem_lbutton_gpio:16 02 #mem_rbutton_gpio:14 18 #mem_mbutton_gpio:15 -17 #mem_bk_button_gpio:ff -02 #mem_fw_button_gpio:ff +02 #mem_bk_button_gpio:ff +17 #mem_fw_button_gpio:ff 18 #mem_dpi_button_gpio:05 06 #mem_whee_a_data_gpio:0b 07 #mem_whee_b_data_gpio:07 @@ -163,12 +163,12 @@ 04 #mem_config_select_device_button_gpio:ff ff #mem_config_paraing_led_gpio:ff 88 #mem_config_low_voltage_alarm_gpio:01 -9c #mem_config_device1_led_gpio:01 +83 #mem_config_device1_led_gpio:01 9b #mem_config_device2_led_gpio:ff -83 #mem_config_device3_led_gpio:ff -ff #mem_sensor_data_gpio:0c +9c #mem_config_device3_led_gpio:ff +1f #mem_sensor_data_gpio:0c ff #mem_dpi_led_gpio:01 -30 #mem_config_function_enable +b0 #mem_config_function_enable 02 #mem_config_sensor_angle ff #mem_select_sensor_angle_gpio ff #mem_select_adc_gpio @@ -291,7 +291,7 @@ mem_24g_paring_addr:20 15 10 05 mem_24g_allpowerful_addr:0f 0f 0f 0f 0f 0f mem_24g_common_temp:00 00 00 00 00 00 00 00 00 00 -mem_24g_enter_hibernate:80 4f 12 # 240ms dpi B4 B5 check easy +mem_24g_enter_hibernate:00 a2 aa 44 # 240ms dpi B4 B5 check easy mem_firmware_version:05 00 mem_device_flag:01