Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/output/eeprom.dat (revision 486) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -ee +ea 03 c2 84 @@ -35,15 +35,15 @@ c0 68 00 -bc +bb c0 69 80 -dc +db c0 6a 00 -e6 +e5 c0 6b 00 @@ -139,7 +139,7 @@ 20 40 00 -be +bd 20 40 3d @@ -592,22 +592,18 @@ e0 c9 92 -1f -e6 -7e -03 -24 -21 +c0 00 -96 +80 +95 20 60 00 00 58 00 -05 -06 +02 +04 67 e1 4c @@ -615,7 +611,7 @@ 20 40 00 -a9 +a8 6f e0 c8 @@ -623,11 +619,11 @@ c2 83 80 -9e +9d 20 40 00 -b1 +b0 67 e0 c8 @@ -639,7 +635,7 @@ 20 40 00 -a1 +a0 67 e0 c8 @@ -663,7 +659,7 @@ 20 40 00 -b1 +b0 1f e2 04 @@ -687,11 +683,11 @@ c2 83 80 -ae +ad 20 40 00 -b1 +b0 67 e0 c8 @@ -703,7 +699,7 @@ 20 40 00 -a1 +a0 67 e0 c8 @@ -743,7 +739,7 @@ 24 21 00 -ba +b9 20 60 00 @@ -771,11 +767,11 @@ c0 06 00 -cf +ce c0 01 80 -c2 +c1 20 20 40 @@ -787,19 +783,19 @@ c0 00 00 -c9 +c8 c0 00 80 -c7 +c6 c0 01 00 -cb +ca c0 01 80 -cd +cc 6f e0 c9 @@ -839,19 +835,19 @@ c0 00 00 -d6 +d5 c0 00 80 -d4 +d3 c0 01 00 -d8 +d7 c0 01 80 -da +d9 68 48 cc @@ -903,7 +899,7 @@ c0 18 00 -eb +ea c0 18 c2 @@ -923,7 +919,7 @@ 20 20 00 -df +de 20 40 3f @@ -943,7 +939,7 @@ 20 20 00 -be +bd 6f e0 c9 @@ -951,15 +947,15 @@ c0 2d 00 -f4 +f3 c0 29 00 -f0 +ef c0 01 00 -f2 +f1 20 20 41 @@ -1007,9 +1003,9 @@ 20 20 00 -be -41 -cc +bd +55 +3d aa 55 40 @@ -1793,7 +1789,7 @@ 09 4c 07 -07 +05 04 06 aa @@ -2216,10 +2212,10 @@ aa aa 55 -a0 +9e 67 -75 -26 +b4 +31 ff ff ff @@ -8188,5 +8184,9 @@ ff ff ff -60 -ca +ff +ff +ff +ff +21 +2b Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/output/program.lis (revision 486) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/output/program.lis (working copy) @@ -7,9 +7,9 @@ 0004 c064805b beq patch19_1 ,p_mouse_setgpio_hibernate 0005 c0650063 beq patch19_2 ,p_mouse_lpm_before_common 0006 c067008a beq patch19_6 ,p_mouse_motion -0007 c06800bc beq patch1a_0 ,p_mouse_seting_dpi -0008 c06980dc beq patch1a_3 ,p_mouse_init_sunt -0009 c06a00e6 beq patch1a_4 ,p_mouse_sensor_poweron +0007 c06800bb beq patch1a_0 ,p_mouse_seting_dpi +0008 c06980db beq patch1a_3 ,p_mouse_init_sunt +0009 c06a00e5 beq patch1a_4 ,p_mouse_sensor_poweron 000a c06b0068 beq patch1a_6 ,p_mouse_priority_bb_event 000b 2020137c branch loop @@ -43,7 +43,7 @@ 001e 20403bf0 call mouse_setting_config 001f 204041a7 call mouse_init_sunt 0020 20758000 rtn wake -0021 204000be call p_mouse_seting_sensor_type +0021 204000bd call p_mouse_seting_sensor_type 0022 20403d8a call mouse_usb_check_enable 0023 20404728 call mouse_drawing_optima_init 0024 2040002d call p_mouse_cb_fuction @@ -197,166 +197,165 @@ 0090 6fe0c927 fetch 1 ,mem_config_sensor_type 0091 c1860000 rtnne om16 0092 6fe0c992 fetch 1 ,mem_mouse_dpi -0093 1fe67e03 sub pdata ,3 ,pdata -0094 24210096 nbranch p_mouse_sensor_data_set ,positive -0095 20600000 rtn +0093 c0008095 beq mouse_dpi_level2 ,p_mouse_sensor_data_set +0094 20600000 rtn p_mouse_sensor_data_set: -0096 58000506 setarg 0x0506 -0097 67e14c0d store 2 ,mem_mouse_xy_date_times -0098 204000a9 call p_mouse_sensor_data_set_x +0095 58000204 setarg 0x0204 +0096 67e14c0d store 2 ,mem_mouse_xy_date_times +0097 204000a8 call p_mouse_sensor_data_set_x p_mouse_sensor_data_set_y: -0099 6fe0c8d3 fetch 1 ,mem_mouse_y -009a c283809e bbit1 7 ,p_mouse_sensor_data_set_y_next -009b 204000b1 call p_mouse_sensor_data_set_next -009c 67e0c8d3 store 1 ,mem_mouse_y -009d 20600000 rtn +0098 6fe0c8d3 fetch 1 ,mem_mouse_y +0099 c283809d bbit1 7 ,p_mouse_sensor_data_set_y_next +009a 204000b0 call p_mouse_sensor_data_set_next +009b 67e0c8d3 store 1 ,mem_mouse_y +009c 20600000 rtn p_mouse_sensor_data_set_y_next: -009e 204000a1 call p_mouse_sensor_data_set_reverse -009f 67e0c8d3 store 1 ,mem_mouse_y -00a0 20600000 rtn +009d 204000a0 call p_mouse_sensor_data_set_reverse +009e 67e0c8d3 store 1 ,mem_mouse_y +009f 20600000 rtn p_mouse_sensor_data_set_reverse: -00a1 1fe20400 copy pdata ,temp -00a2 dfe00100 arg 0x100 ,pdata -00a3 98467e00 isub temp ,pdata -00a4 204000b1 call p_mouse_sensor_data_set_next -00a5 1fe20400 copy pdata ,temp -00a6 dfe00100 arg 0x100 ,pdata -00a7 98467e00 isub temp ,pdata -00a8 20600000 rtn +00a0 1fe20400 copy pdata ,temp +00a1 dfe00100 arg 0x100 ,pdata +00a2 98467e00 isub temp ,pdata +00a3 204000b0 call p_mouse_sensor_data_set_next +00a4 1fe20400 copy pdata ,temp +00a5 dfe00100 arg 0x100 ,pdata +00a6 98467e00 isub temp ,pdata +00a7 20600000 rtn p_mouse_sensor_data_set_x: -00a9 6fe0c8d1 fetch 1 ,mem_mouse_x -00aa c28380ae bbit1 7 ,p_mouse_sensor_data_set_x_next -00ab 204000b1 call p_mouse_sensor_data_set_next -00ac 67e0c8d1 store 1 ,mem_mouse_x -00ad 20600000 rtn +00a8 6fe0c8d1 fetch 1 ,mem_mouse_x +00a9 c28380ad bbit1 7 ,p_mouse_sensor_data_set_x_next +00aa 204000b0 call p_mouse_sensor_data_set_next +00ab 67e0c8d1 store 1 ,mem_mouse_x +00ac 20600000 rtn p_mouse_sensor_data_set_x_next: -00ae 204000a1 call p_mouse_sensor_data_set_reverse -00af 67e0c8d1 store 1 ,mem_mouse_x -00b0 20600000 rtn +00ad 204000a0 call p_mouse_sensor_data_set_reverse +00ae 67e0c8d1 store 1 ,mem_mouse_x +00af 20600000 rtn p_mouse_sensor_data_set_next: -00b1 6848cc0d fetcht 1 ,mem_mouse_xy_date_times -00b2 984ffe00 imul32 temp ,pdata -00b3 6848cc0e fetcht 1 ,mem_mouse_xy_date_times + 1 -00b4 9846fc00 idiv temp -00b5 20407def call wait_div_end -00b6 1807fe00 quotient pdata -00b7 1fe67c7f sub pdata ,0x7f ,null -00b8 242100ba nbranch p_mouse_sensor_data_set_next2 ,positive -00b9 20600000 rtn +00b0 6848cc0d fetcht 1 ,mem_mouse_xy_date_times +00b1 984ffe00 imul32 temp ,pdata +00b2 6848cc0e fetcht 1 ,mem_mouse_xy_date_times + 1 +00b3 9846fc00 idiv temp +00b4 20407def call wait_div_end +00b5 1807fe00 quotient pdata +00b6 1fe67c7f sub pdata ,0x7f ,null +00b7 242100b9 nbranch p_mouse_sensor_data_set_next2 ,positive +00b8 20600000 rtn p_mouse_sensor_data_set_next2: -00ba 5800007f setarg 0x7f -00bb 20600000 rtn +00b9 5800007f setarg 0x7f +00ba 20600000 rtn p_mouse_seting_dpi: -00bc 2040408f call mouse_setting_dpi_4_level -00bd 204048e1 call mouse_dpi_led_blink_delay +00bb 2040408f call mouse_setting_dpi_4_level +00bc 204048e1 call mouse_dpi_led_blink_delay p_mouse_seting_sensor_type: -00be 6fe0c927 fetch 1 ,mem_config_sensor_type -00bf c00600cf beq om16 ,p_mouse_seting_om16_dpi -00c0 c00180c2 beq p3212 ,p_mouse_seting_3212_dpi -00c1 20204098 branch mouse_seting_sensor_type +00bd 6fe0c927 fetch 1 ,mem_config_sensor_type +00be c00600ce beq om16 ,p_mouse_seting_om16_dpi +00bf c00180c1 beq p3212 ,p_mouse_seting_3212_dpi +00c0 20204098 branch mouse_seting_sensor_type p_mouse_seting_3212_dpi: -00c2 6fe0c992 fetch 1 ,mem_mouse_dpi -00c3 c00000c9 beq mouse_dpi_level1 ,p_mouse_set_p3212_cpi0 -00c4 c00080c7 beq mouse_dpi_level2 ,p_mouse_set_p3212_cpi1 -00c5 c00100cb beq mouse_dpi_level3 ,p_mouse_set_p3212_cpi2 -00c6 c00180cd beq mouse_dpi_level4 ,p_mouse_set_p3212_cpi3 +00c1 6fe0c992 fetch 1 ,mem_mouse_dpi +00c2 c00000c8 beq mouse_dpi_level1 ,p_mouse_set_p3212_cpi0 +00c3 c00080c6 beq mouse_dpi_level2 ,p_mouse_set_p3212_cpi1 +00c4 c00100ca beq mouse_dpi_level3 ,p_mouse_set_p3212_cpi2 +00c5 c00180cc beq mouse_dpi_level4 ,p_mouse_set_p3212_cpi3 p_mouse_set_p3212_cpi1: -00c7 6fe0c9d5 fetch 1 ,mem_3212_dpi_1 -00c8 202040c7 branch mouse_p3212_dpi +00c6 6fe0c9d5 fetch 1 ,mem_3212_dpi_1 +00c7 202040c7 branch mouse_p3212_dpi p_mouse_set_p3212_cpi0: -00c9 6fe0c9d4 fetch 1 ,mem_3212_dpi_0 -00ca 202040c7 branch mouse_p3212_dpi +00c8 6fe0c9d4 fetch 1 ,mem_3212_dpi_0 +00c9 202040c7 branch mouse_p3212_dpi p_mouse_set_p3212_cpi2: -00cb 6fe0c9d6 fetch 1 ,mem_3212_dpi_2 -00cc 202040c7 branch mouse_p3212_dpi +00ca 6fe0c9d6 fetch 1 ,mem_3212_dpi_2 +00cb 202040c7 branch mouse_p3212_dpi p_mouse_set_p3212_cpi3: -00cd 6fe0c9d7 fetch 1 ,mem_3212_dpi_3 -00ce 202040c7 branch mouse_p3212_dpi +00cc 6fe0c9d7 fetch 1 ,mem_3212_dpi_3 +00cd 202040c7 branch mouse_p3212_dpi p_mouse_seting_om16_dpi: -00cf 6fe0c992 fetch 1 ,mem_mouse_dpi -00d0 c00000d6 beq mouse_dpi_level1 ,p_mouse_om16_set_cpi0 -00d1 c00080d4 beq mouse_dpi_level2 ,p_mouse_om16_set_cpi1 -00d2 c00100d8 beq mouse_dpi_level3 ,p_mouse_om16_set_cpi2 -00d3 c00180da beq mouse_dpi_level4 ,p_mouse_om16_set_cpi3 +00ce 6fe0c992 fetch 1 ,mem_mouse_dpi +00cf c00000d5 beq mouse_dpi_level1 ,p_mouse_om16_set_cpi0 +00d0 c00080d3 beq mouse_dpi_level2 ,p_mouse_om16_set_cpi1 +00d1 c00100d7 beq mouse_dpi_level3 ,p_mouse_om16_set_cpi2 +00d2 c00180d9 beq mouse_dpi_level4 ,p_mouse_om16_set_cpi3 p_mouse_om16_set_cpi1: -00d4 6848cc0a fetcht 1 ,mem_om16_dpi_1 -00d5 202040a8 branch mouse_dpi_store +00d3 6848cc0a fetcht 1 ,mem_om16_dpi_1 +00d4 202040a8 branch mouse_dpi_store p_mouse_om16_set_cpi0: -00d6 6848cc09 fetcht 1 ,mem_om16_dpi_0 -00d7 202040a8 branch mouse_dpi_store +00d5 6848cc09 fetcht 1 ,mem_om16_dpi_0 +00d6 202040a8 branch mouse_dpi_store p_mouse_om16_set_cpi2: -00d8 6848cc0b fetcht 1 ,mem_om16_dpi_2 -00d9 202040a8 branch mouse_dpi_store +00d7 6848cc0b fetcht 1 ,mem_om16_dpi_2 +00d8 202040a8 branch mouse_dpi_store p_mouse_om16_set_cpi3: -00da 6848cc0c fetcht 1 ,mem_om16_dpi_3 -00db 202040a8 branch mouse_dpi_store +00d9 6848cc0c fetcht 1 ,mem_om16_dpi_3 +00da 202040a8 branch mouse_dpi_store p_mouse_init_sunt: -00dc 20403f65 call mouse_sensor_spi_init -00dd 20758000 rtn wake +00db 20403f65 call mouse_sensor_spi_init +00dc 20758000 rtn wake p_mouse_init_sensor_wakeup: -00de 20404236 call mouse_sensor_poweron +00dd 20404236 call mouse_sensor_poweron p_mouse_init_sensor: -00df 204041b5 call mouse_read_sensor_id -00e0 c01800eb beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge -00e1 c018c217 beq p3065_id1 ,mouse_init_p3065 -00e2 c02c4220 beq pka8g2_id1 ,mouse_ka8g2_id2_judge -00e3 204041b2 call mouse_twspi_reset -00e4 20001af4 nop 6900 -00e5 202000df branch p_mouse_init_sensor +00de 204041b5 call mouse_read_sensor_id +00df c01800ea beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge +00e0 c018c217 beq p3065_id1 ,mouse_init_p3065 +00e1 c02c4220 beq pka8g2_id1 ,mouse_ka8g2_id2_judge +00e2 204041b2 call mouse_twspi_reset +00e3 20001af4 nop 6900 +00e4 202000de branch p_mouse_init_sensor p_mouse_sensor_poweron: -00e6 20403f65 call mouse_sensor_spi_init -00e7 20404232 call mouse_sensor_reset -00e8 da604aa3 arg mem_sensor_poweron_init ,regc -00e9 2040422b call mouse_sensor_wr_seq -00ea 202000be branch p_mouse_seting_sensor_type +00e5 20403f65 call mouse_sensor_spi_init +00e6 20404232 call mouse_sensor_reset +00e7 da604aa3 arg mem_sensor_poweron_init ,regc +00e8 2040422b call mouse_sensor_wr_seq +00e9 202000bd branch p_mouse_seting_sensor_type p_mouse_init_p32xx_id2_judge: -00eb 6fe0c9c2 fetch 1 ,mem_sensor_id2 -00ec c02d00f4 beq p_mx8650 ,p_mouse_mx8650_init_param -00ed c02900f0 beq om16_id2 ,p_mouse_om16_init_param -00ee c00100f2 beq p3212_id2 ,p_mouse_3212_init_param -00ef 202041be branch mouse_init_p32xx_id2_judge + 2 +00ea 6fe0c9c2 fetch 1 ,mem_sensor_id2 +00eb c02d00f3 beq p_mx8650 ,p_mouse_mx8650_init_param +00ec c02900ef beq om16_id2 ,p_mouse_om16_init_param +00ed c00100f1 beq p3212_id2 ,p_mouse_3212_init_param +00ee 202041be branch mouse_init_p32xx_id2_judge + 2 p_mouse_om16_init_param: -00f0 7049270c jam om16 ,mem_config_sensor_type -00f1 202046ee branch mouse_dpi_4level_enable +00ef 7049270c jam om16 ,mem_config_sensor_type +00f0 202046ee branch mouse_dpi_4level_enable p_mouse_3212_init_param: -00f2 204046ee call mouse_dpi_4level_enable -00f3 202041ea branch mouse_3212_init_param +00f1 204046ee call mouse_dpi_4level_enable +00f2 202041ea branch mouse_3212_init_param p_mouse_mx8650_init_param: -00f4 70492705 jam mx8650 ,mem_config_sensor_type -00f5 58008006 setarg 0x8006 -00f6 20405b0c call twspi_write -00f7 20407d12 call delay_10ms -00f8 da604be3 arg mem_sensor_8650_init_new ,regc -00f9 2040422b call mouse_sensor_wr_seq -00fa 202000be branch p_mouse_seting_sensor_type +00f3 70492705 jam mx8650 ,mem_config_sensor_type +00f4 58008006 setarg 0x8006 +00f5 20405b0c call twspi_write +00f6 20407d12 call delay_10ms +00f7 da604be3 arg mem_sensor_8650_init_new ,regc +00f8 2040422b call mouse_sensor_wr_seq +00f9 202000bd branch p_mouse_seting_sensor_type org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/program/patch.prog (revision 486) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/program/patch.prog (working copy) @@ -195,11 +195,10 @@ fetch 1,mem_config_sensor_type rtnne OM16 fetch 1,mem_mouse_dpi - sub pdata,3,pdata - nbranch p_mouse_sensor_data_set,positive + beq MOUSE_DPI_LEVEL2,p_mouse_sensor_data_set rtn p_mouse_sensor_data_set: - setarg 0x0506 + setarg 0x0204 store 2,mem_mouse_xy_date_times call p_mouse_sensor_data_set_x p_mouse_sensor_data_set_y: Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/sched/mouse.dat (revision 486) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G/sched/mouse.dat (working copy) @@ -317,7 +317,7 @@ mem_om16_dpi: 07 ##mem_om16_dpi_0 -07 ##mem_om16_dpi_1 +05 ##mem_om16_dpi_1 04 ##mem_om16_dpi_2 06 ##mem_om16_dpi_3