Index: format/app_mouse.format =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/format/app_mouse.format (revision 1344) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/format/app_mouse.format (working copy) @@ -330,7 +330,7 @@ 2 mem_mouse_logo_led_on_timer 1 mem_power_on_flag -88 mem_sensor_3220_init +88 mem_sensor_p3220_ds_init ) @@ -485,7 +485,7 @@ 0x30 P32XX_ID1 0x31 P3065_ID1 0x02 P3212_ID2 -0x02 P3220_ID2 +0x02 P3220_TJDS_ID2 0xD1 P3205_TJ3T_ID2 0XD2 P3204_TJ3L_ID2 0x54 PKA8_ID2 @@ -511,7 +511,7 @@ 0X09 KA8_UL 0X0a KA8_HD 0X0b KA8G2 -0X0c P3220 +0X0c P3220_DS //SENSOR REG Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/output/eeprom.dat (revision 1344) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -9e +ba 06 c2 84 @@ -1684,6 +1684,30 @@ 20 41 bc +58 +00 +00 +5f +20 +40 +5b +0d +1f +e1 +7e +03 +c0 +01 +01 +aa +c0 +01 +c1 +ea +20 +60 +00 +00 70 49 27 @@ -1693,11 +1717,15 @@ 4b e8 20 -20 +40 42 2b -b6 -4c +20 +20 +00 +f1 +dd +e5 aa 55 40 @@ -2960,36 +2988,8 @@ e8 41 01 -67 -2d -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 +58 +a0 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -78 -66 +f7 +62 Index: output/memmap.format =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/output/memmap.format (revision 1344) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/output/memmap.format (working copy) @@ -2208,7 +2208,7 @@ 0x4be4 mem_mouse_logo_led_on_check_count 0x4be5 mem_mouse_logo_led_on_timer 0x4be7 mem_power_on_flag -0x4be8 mem_sensor_3220_init +0x4be8 mem_sensor_p3220_ds_init 0x48d0 mem_remote_car_hard_soft_switch 0x48d1 mem_remote_car_queue_each_size 0x48d2 mem_remote_car_queue_length Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/output/program.lis (revision 1344) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/output/program.lis (working copy) @@ -309,7 +309,7 @@ 00ec 6fe0c4ac fetch 1 ,mem_spi_write_flash_sm 00ed c1800000 rtnne flash_sm_no_buys 00ee 6fe0c927 fetch 1 ,mem_config_sensor_type -00ef c0064270 beq p3220 ,mouse_p3212_sensor_motion +00ef c0064270 beq p3220_ds ,mouse_p3212_sensor_motion 00f0 20204243 branch mouse_check_sensor_data + 3 p_mouse_seting_dpi: @@ -319,19 +319,19 @@ p_mouse_seting_sensor_type: 00f4 6fe0c927 fetch 1 ,mem_config_sensor_type -00f5 c00600f7 beq p3220 ,p_mouse_seting_p3220_dpi +00f5 c00600f7 beq p3220_ds ,p_mouse_seting_p3220_ds_dpi 00f6 20204098 branch mouse_seting_sensor_type -p_mouse_seting_p3220_dpi: +p_mouse_seting_p3220_ds_dpi: 00f7 6fe0c992 fetch 1 ,mem_mouse_dpi -00f8 c0008104 beq mouse_dpi_level2 ,p_mouse_set_p3220_cpi1 -00f9 c0010107 beq mouse_dpi_level3 ,p_mouse_set_p3220_cpi2 +00f8 c0008104 beq mouse_dpi_level2 ,p_mouse_set_p3220_ds_cpi1 +00f9 c0010107 beq mouse_dpi_level3 ,p_mouse_set_p3220_ds_cpi2 -p_mouse_set_p3220_cpi0: +p_mouse_set_p3220_ds_cpi0: 00fa da20001f arg 0x1f ,rega 00fb da400020 arg 0x20 ,regb -p_mouse_p3220_store_dpi: +p_mouse_p3220_ds_store_dpi: 00fc 1a227e00 copy rega ,pdata 00fd 1fed7e00 lshift8 pdata ,pdata 00fe 1fe0fe0d add pdata ,mouse_p3212_dpi_xaddress ,pdata @@ -341,15 +341,15 @@ 0102 1fe0fe0e add pdata ,mouse_p3212_dpi_yaddress ,pdata 0103 20205b0c branch twspi_write -p_mouse_set_p3220_cpi1: +p_mouse_set_p3220_ds_cpi1: 0104 da20002a arg 0x2a ,rega 0105 da40002b arg 0x2b ,regb -0106 202000fc branch p_mouse_p3220_store_dpi +0106 202000fc branch p_mouse_p3220_ds_store_dpi -p_mouse_set_p3220_cpi2: +p_mouse_set_p3220_ds_cpi2: 0107 da200015 arg 0x15 ,rega 0108 da400016 arg 0x16 ,regb -0109 202000fc branch p_mouse_p3220_store_dpi +0109 202000fc branch p_mouse_p3220_ds_store_dpi p_mouse_dpi_led_blink_delay: 010a 6fe0c923 fetch 1 ,mem_dpi_led_gpio @@ -550,13 +550,22 @@ p_mouse_init_p32xx_id2_judge: 01a1 6fe0c9c2 fetch 1 ,mem_sensor_id2 -01a2 c00101a4 beq p3220_id2 ,p_mouse_3220_init_param +01a2 c00101a4 beq p3212_id2 ,p_mouse_p32xx_id2_judge 01a3 202041bc branch mouse_init_p32xx_id2_judge -p_mouse_3220_init_param: -01a4 7049270c jam p3220 ,mem_config_sensor_type -01a5 da604be8 arg mem_sensor_3220_init ,regc -01a6 2020422b branch mouse_sensor_wr_seq +p_mouse_p32xx_id2_judge: +01a4 5800005f setarg 0x5f +01a5 20405b0d call twspi_read +01a6 1fe17e03 and pdata ,0x03 ,pdata +01a7 c00101aa beq 2 ,p_mouse_p3220_ds_init_param +01a8 c001c1ea beq 3 ,mouse_3212_init_param +01a9 20600000 rtn + +p_mouse_p3220_ds_init_param: +01aa 7049270c jam p3220_ds ,mem_config_sensor_type +01ab da604be8 arg mem_sensor_p3220_ds_init ,regc +01ac 2040422b call mouse_sensor_wr_seq +01ad 202000f1 branch p_mouse_seting_dpi org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/program/patch.prog (revision 1344) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/program/patch.prog (working copy) @@ -362,7 +362,7 @@ fetch 1,mem_spi_write_flash_sm rtnne FLASH_SM_NO_BUYS fetch 1,mem_config_sensor_type - beq P3220,mouse_p3212_sensor_motion + beq P3220_DS,mouse_p3212_sensor_motion branch mouse_check_sensor_data+3 ///////////////////dpi led adjust//////////////////////////////////////////////////////////////////// @@ -373,18 +373,18 @@ p_mouse_seting_sensor_type: fetch 1,mem_config_sensor_type - beq P3220,p_mouse_seting_p3220_dpi + beq P3220_DS,p_mouse_seting_p3220_ds_dpi branch mouse_seting_sensor_type -p_mouse_seting_p3220_dpi: +p_mouse_seting_p3220_ds_dpi: fetch 1,mem_mouse_dpi - beq MOUSE_DPI_LEVEL2,p_mouse_set_p3220_cpi1 //1600 - beq MOUSE_DPI_LEVEL3,p_mouse_set_p3220_cpi2 //800 -p_mouse_set_p3220_cpi0: //1200 + beq MOUSE_DPI_LEVEL2,p_mouse_set_p3220_ds_cpi1 //1600 + beq MOUSE_DPI_LEVEL3,p_mouse_set_p3220_ds_cpi2 //800 +p_mouse_set_p3220_ds_cpi0: //1200 arg 0x1f,rega arg 0x20,regb //input:rega CPI_X, regb CPI_Y -p_mouse_p3220_store_dpi: +p_mouse_p3220_ds_store_dpi: copy rega,pdata lshift8 pdata,pdata add pdata,MOUSE_P3212_DPI_XADDRESS,pdata @@ -394,15 +394,15 @@ add pdata,MOUSE_P3212_DPI_YADDRESS,pdata branch twspi_write -p_mouse_set_p3220_cpi1: //1600 +p_mouse_set_p3220_ds_cpi1: //1600 arg 0x2a,rega arg 0x2b,regb - branch p_mouse_p3220_store_dpi + branch p_mouse_p3220_ds_store_dpi -p_mouse_set_p3220_cpi2: //800 +p_mouse_set_p3220_ds_cpi2: //800 arg 0x15,rega arg 0x16,regb - branch p_mouse_p3220_store_dpi + branch p_mouse_p3220_ds_store_dpi p_mouse_dpi_led_blink_delay: fetch 1,mem_dpi_led_gpio @@ -608,13 +608,22 @@ p_mouse_init_p32xx_id2_judge: fetch 1,mem_sensor_id2 - beq P3220_ID2,p_mouse_3220_init_param + beq P3212_ID2,p_mouse_p32xx_id2_judge branch mouse_init_p32xx_id2_judge -p_mouse_3220_init_param: - jam P3220,mem_config_sensor_type - arg mem_sensor_3220_init,regc - branch mouse_sensor_wr_seq +p_mouse_p32xx_id2_judge: + setarg 0x5f + call twspi_read + and pdata,0x03,pdata + beq 2,p_mouse_p3220_ds_init_param + beq 3,mouse_3212_init_param + rtn + +p_mouse_p3220_ds_init_param: + jam P3220_DS,mem_config_sensor_type + arg mem_sensor_p3220_ds_init,regc + call mouse_sensor_wr_seq + branch p_mouse_seting_dpi Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/sched/mouse.dat (revision 1344) +++ /YC1308AC/branch/mouse_project/YJX_Project/1011-T_Project/Only2.4G/MingAo_Only2.4G_LRpair_12CLK/sched/mouse.dat (working copy) @@ -425,7 +425,7 @@ 09 00 ff ff -mem_sensor_3220_init: +mem_sensor_p3220_ds_init: 09 5a 26 34 0a 87