Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_HQ/output/eeprom.dat (revision 427) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_HQ/output/eeprom.dat (working copy) @@ -2,8 +2,8 @@ 02 aa 55 -36 -05 +ea +04 c2 84 00 @@ -35,11 +35,11 @@ c0 68 01 -2e +1b c0 69 81 -39 +26 c0 6b 00 @@ -972,22 +972,22 @@ e0 c9 92 -c0 +1f +e6 +7e 01 +24 +21 00 f5 -c0 -01 -81 -19 20 60 00 00 58 00 -04 -05 +01 +02 67 e1 4c @@ -1123,83 +1123,7 @@ 24 21 01 -2c -20 -60 -00 -00 -58 -00 -02 -03 -67 -e1 -4c -08 -20 -40 -01 -24 -6f -e0 -c8 -d3 -c2 -83 -81 -21 -20 -40 -01 -10 -67 -e0 -c8 -d3 -20 -60 -00 -00 -20 -40 -01 -00 -67 -e0 -c8 -d3 -20 -60 -00 -00 -6f -e0 -c8 -d1 -c2 -83 -81 -29 -20 -40 -01 -10 -67 -e0 -c8 -d1 -20 -60 -00 -00 -20 -40 -01 -00 -67 -e0 -c8 -d1 +19 20 60 00 @@ -1247,11 +1171,11 @@ c0 01 40 -a0 +a6 c0 01 c0 -a0 +a2 20 20 40 @@ -1275,7 +1199,7 @@ c0 18 01 -43 +30 c0 18 c2 @@ -1295,7 +1219,7 @@ 20 20 01 -3c +29 6f e0 c9 @@ -1303,7 +1227,7 @@ c0 2d 01 -46 +33 20 20 41 @@ -1336,8 +1260,8 @@ 20 40 8e -23 -3f +46 +33 aa 55 40 @@ -1587,8 +1511,8 @@ 55 2d 42 -72 -0c +40 +ae ff ff ff @@ -8188,5 +8112,81 @@ ff ff ff -88 -c6 +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 +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 +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +ff +86 +ad Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_HQ/output/program.lis (revision 427) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_HQ/output/program.lis (working copy) @@ -7,8 +7,8 @@ 0004 c06480cd beq patch19_1 ,p_mouse_setgpio_hibernate 0005 c06500d5 beq patch19_2 ,p_mouse_lpm_before_common 0006 c06700e9 beq patch19_6 ,p_mouse_motion -0007 c068012e beq patch1a_0 ,p_mouse_seting_dpi -0008 c0698139 beq patch1a_3 ,p_mouse_init_sunt +0007 c068011b beq patch1a_0 ,p_mouse_seting_dpi +0008 c0698126 beq patch1a_3 ,p_mouse_init_sunt 0009 c06b002e beq patch1a_6 ,p_mouse_priority_bb_event 000a 2020137c branch loop @@ -296,23 +296,23 @@ 00ef 6fe0c927 fetch 1 ,mem_config_sensor_type 00f0 c1018000 rtneq p3212 00f1 6fe0c992 fetch 1 ,mem_mouse_dpi -00f2 c00100f5 beq mouse_dpi_level3 ,p_mouse_sensor_data_set3 -00f3 c0018119 beq mouse_dpi_level4 ,p_mouse_sensor_data_set4 +00f2 1fe67e01 sub pdata ,1 ,pdata +00f3 242100f5 nbranch p_mouse_sensor_data_set ,positive 00f4 20600000 rtn -p_mouse_sensor_data_set3: -00f5 58000405 setarg 0x0405 +p_mouse_sensor_data_set: +00f5 58000102 setarg 0x0102 00f6 67e14c08 store 2 ,mem_mouse_xy_date_times -00f7 20400108 call p_mouse_sensor_data_set_x_3 +00f7 20400108 call p_mouse_sensor_data_set_x -p_mouse_sensor_data_set_y_3: +p_mouse_sensor_data_set_y: 00f8 6fe0c8d3 fetch 1 ,mem_mouse_y -00f9 c28380fd bbit1 7 ,p_mouse_sensor_data_set_y3 +00f9 c28380fd bbit1 7 ,p_mouse_sensor_data_set_y_next 00fa 20400110 call p_mouse_sensor_data_set_next 00fb 67e0c8d3 store 1 ,mem_mouse_y 00fc 20600000 rtn -p_mouse_sensor_data_set_y3: +p_mouse_sensor_data_set_y_next: 00fd 20400100 call p_mouse_sensor_data_set_reverse 00fe 67e0c8d3 store 1 ,mem_mouse_y 00ff 20600000 rtn @@ -327,14 +327,14 @@ 0106 98467e00 isub temp ,pdata 0107 20600000 rtn -p_mouse_sensor_data_set_x_3: +p_mouse_sensor_data_set_x: 0108 6fe0c8d1 fetch 1 ,mem_mouse_x -0109 c283810d bbit1 7 ,p_mouse_sensor_data_set_x3 +0109 c283810d bbit1 7 ,p_mouse_sensor_data_set_x_next 010a 20400110 call p_mouse_sensor_data_set_next 010b 67e0c8d1 store 1 ,mem_mouse_x 010c 20600000 rtn -p_mouse_sensor_data_set_x3: +p_mouse_sensor_data_set_x_next: 010d 20400100 call p_mouse_sensor_data_set_reverse 010e 67e0c8d1 store 1 ,mem_mouse_x 010f 20600000 rtn @@ -347,86 +347,57 @@ 0114 20407def call wait_div_end 0115 1807fe00 quotient pdata 0116 1fe67c7f sub pdata ,0x7f ,null -0117 2421012c nbranch p_mouse_sensor_data_set_next2 ,positive +0117 24210119 nbranch p_mouse_sensor_data_set_next2 ,positive 0118 20600000 rtn -p_mouse_sensor_data_set4: -0119 58000203 setarg 0x0203 -011a 67e14c08 store 2 ,mem_mouse_xy_date_times -011b 20400124 call p_mouse_sensor_data_set_x_4 - -p_mouse_sensor_data_set_y_4: -011c 6fe0c8d3 fetch 1 ,mem_mouse_y -011d c2838121 bbit1 7 ,p_mouse_sensor_data_set_y4 -011e 20400110 call p_mouse_sensor_data_set_next -011f 67e0c8d3 store 1 ,mem_mouse_y -0120 20600000 rtn - -p_mouse_sensor_data_set_y4: -0121 20400100 call p_mouse_sensor_data_set_reverse -0122 67e0c8d3 store 1 ,mem_mouse_y -0123 20600000 rtn - -p_mouse_sensor_data_set_x_4: -0124 6fe0c8d1 fetch 1 ,mem_mouse_x -0125 c2838129 bbit1 7 ,p_mouse_sensor_data_set_x4 -0126 20400110 call p_mouse_sensor_data_set_next -0127 67e0c8d1 store 1 ,mem_mouse_x -0128 20600000 rtn - -p_mouse_sensor_data_set_x4: -0129 20400100 call p_mouse_sensor_data_set_reverse -012a 67e0c8d1 store 1 ,mem_mouse_x -012b 20600000 rtn - p_mouse_sensor_data_set_next2: -012c 5800007f setarg 0x7f -012d 20600000 rtn +0119 5800007f setarg 0x7f +011a 20600000 rtn p_mouse_seting_dpi: -012e 2040408f call mouse_setting_dpi_4_level -012f 204048e1 call mouse_dpi_led_blink_delay +011b 2040408f call mouse_setting_dpi_4_level +011c 204048e1 call mouse_dpi_led_blink_delay p_mouse_seting_sensor_type: -0130 6fe0c927 fetch 1 ,mem_config_sensor_type -0131 c001c0bb beq p3212 ,mouse_seting_3212_dpi -0132 c005c0cf beq ka8g2 ,mouse_seting_ka8g2_dpi -0133 6fe0c992 fetch 1 ,mem_mouse_dpi -0134 c00040a6 beq mouse_dpi_level1 ,mouse_set_cpi3 -0135 c000c0a0 beq mouse_dpi_level2 ,mouse_set_cpi1 -0136 c00140a0 beq mouse_dpi_level3 ,mouse_set_cpi1 -0137 c001c0a0 beq mouse_dpi_level4 ,mouse_set_cpi1 -0138 202040a0 branch mouse_set_cpi1 +011d 6fe0c927 fetch 1 ,mem_config_sensor_type +011e c001c0bb beq p3212 ,mouse_seting_3212_dpi +011f c005c0cf beq ka8g2 ,mouse_seting_ka8g2_dpi +0120 6fe0c992 fetch 1 ,mem_mouse_dpi +0121 c00040a6 beq mouse_dpi_level1 ,mouse_set_cpi3 +0122 c000c0a0 beq mouse_dpi_level2 ,mouse_set_cpi1 +0123 c00140a6 beq mouse_dpi_level3 ,mouse_set_cpi3 +0124 c001c0a2 beq mouse_dpi_level4 ,mouse_set_cpi0 +0125 202040a0 branch mouse_set_cpi1 p_mouse_init_sunt: -0139 20403f65 call mouse_sensor_spi_init -013a 20758000 rtn wake +0126 20403f65 call mouse_sensor_spi_init +0127 20758000 rtn wake p_mouse_init_sensor_wakeup: -013b 20404236 call mouse_sensor_poweron +0128 20404236 call mouse_sensor_poweron p_mouse_init_sensor: -013c 204041b5 call mouse_read_sensor_id -013d c0180143 beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge -013e c018c217 beq p3065_id1 ,mouse_init_p3065 -013f c02c4220 beq pka8g2_id1 ,mouse_ka8g2_id2_judge -0140 204041b2 call mouse_twspi_reset -0141 20001af4 nop 6900 -0142 2020013c branch p_mouse_init_sensor +0129 204041b5 call mouse_read_sensor_id +012a c0180130 beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge +012b c018c217 beq p3065_id1 ,mouse_init_p3065 +012c c02c4220 beq pka8g2_id1 ,mouse_ka8g2_id2_judge +012d 204041b2 call mouse_twspi_reset +012e 20001af4 nop 6900 +012f 20200129 branch p_mouse_init_sensor p_mouse_init_p32xx_id2_judge: -0143 6fe0c9c2 fetch 1 ,mem_sensor_id2 -0144 c02d0146 beq p_mx8650 ,p_mouse_mx8650_init_param -0145 202041be branch mouse_init_p32xx_id2_judge + 2 +0130 6fe0c9c2 fetch 1 ,mem_sensor_id2 +0131 c02d0133 beq p_mx8650 ,p_mouse_mx8650_init_param +0132 202041be branch mouse_init_p32xx_id2_judge + 2 p_mouse_mx8650_init_param: -0146 70492705 jam mx8650 ,mem_config_sensor_type -0147 58008006 setarg 0x8006 -0148 20405b0c call twspi_write -0149 20407d12 call delay_10ms -014a da604be2 arg mem_sensor_8650_init_new ,regc -014b 2040422b call mouse_sensor_wr_seq -014c 2020408e branch mouse_dpi_config +0133 70492705 jam mx8650 ,mem_config_sensor_type +0134 58008006 setarg 0x8006 +0135 20405b0c call twspi_write +0136 20407d12 call delay_10ms +0137 da604be2 arg mem_sensor_8650_init_new ,regc +0138 2040422b call mouse_sensor_wr_seq +0139 2020408e branch mouse_dpi_config org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_HQ/program/patch.prog (revision 427) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_HQ/program/patch.prog (working copy) @@ -319,20 +319,20 @@ fetch 1,mem_config_sensor_type rtneq P3212 fetch 1,mem_mouse_dpi - beq MOUSE_DPI_LEVEL3,p_mouse_sensor_data_set3 - beq MOUSE_DPI_LEVEL4,p_mouse_sensor_data_set4 + sub pdata,1,pdata + nbranch p_mouse_sensor_data_set,positive rtn -p_mouse_sensor_data_set3: - setarg 0x0405 +p_mouse_sensor_data_set: + setarg 0x0102 store 2,mem_mouse_xy_date_times - call p_mouse_sensor_data_set_x_3 -p_mouse_sensor_data_set_y_3: + call p_mouse_sensor_data_set_x +p_mouse_sensor_data_set_y: fetch 1,mem_mouse_y - bbit1 7,p_mouse_sensor_data_set_y3 + bbit1 7,p_mouse_sensor_data_set_y_next call p_mouse_sensor_data_set_next store 1,mem_mouse_y rtn -p_mouse_sensor_data_set_y3: +p_mouse_sensor_data_set_y_next: call p_mouse_sensor_data_set_reverse store 1,mem_mouse_y rtn @@ -346,13 +346,13 @@ isub temp,pdata rtn -p_mouse_sensor_data_set_x_3: +p_mouse_sensor_data_set_x: fetch 1,mem_mouse_x - bbit1 7,p_mouse_sensor_data_set_x3 + bbit1 7,p_mouse_sensor_data_set_x_next call p_mouse_sensor_data_set_next store 1,mem_mouse_x rtn -p_mouse_sensor_data_set_x3: +p_mouse_sensor_data_set_x_next: call p_mouse_sensor_data_set_reverse store 1,mem_mouse_x rtn @@ -367,35 +367,6 @@ sub pdata,0x7f,null nbranch p_mouse_sensor_data_set_next2,positive rtn - -p_mouse_sensor_data_set4: - setarg 0x0203 - store 2,mem_mouse_xy_date_times - call p_mouse_sensor_data_set_x_4 -p_mouse_sensor_data_set_y_4: - fetch 1,mem_mouse_y - bbit1 7,p_mouse_sensor_data_set_y4 - call p_mouse_sensor_data_set_next - store 1,mem_mouse_y - rtn - -p_mouse_sensor_data_set_y4: - call p_mouse_sensor_data_set_reverse - store 1,mem_mouse_y - rtn - - -p_mouse_sensor_data_set_x_4: - fetch 1,mem_mouse_x - bbit1 7,p_mouse_sensor_data_set_x4 - call p_mouse_sensor_data_set_next - store 1,mem_mouse_x - rtn - -p_mouse_sensor_data_set_x4: - call p_mouse_sensor_data_set_reverse - store 1,mem_mouse_x - rtn p_mouse_sensor_data_set_next2: setarg 0x7f rtn @@ -411,8 +382,8 @@ fetch 1,mem_mouse_dpi beq MOUSE_DPI_LEVEL1,mouse_set_cpi3 //1000 beq MOUSE_DPI_LEVEL2,mouse_set_cpi1 //1600 - beq MOUSE_DPI_LEVEL3,mouse_set_cpi1 //1000 - beq MOUSE_DPI_LEVEL4,mouse_set_cpi1 //1200 + beq MOUSE_DPI_LEVEL3,mouse_set_cpi3 //1000 + beq MOUSE_DPI_LEVEL4,mouse_set_cpi0 //1200 branch mouse_set_cpi1 //320x+8009 p_mouse_init_sunt: