Index: format/app_mouse.format =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_OM18/format/app_mouse.format (revision 869) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_OM18/format/app_mouse.format (working copy) @@ -333,6 +333,13 @@ 1 mem_om16_dpi_3 18 mem_sensor_om18_init + +0 mem_om18_dpi +1 mem_om18_dpi_0 +1 mem_om18_dpi_1 +1 mem_om18_dpi_2 +1 mem_om18_dpi_3 + ) Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_OM18/output/eeprom.dat (revision 869) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_OM18/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -6e +72 08 c2 84 @@ -39,11 +39,11 @@ c0 67 01 -60 +61 c0 68 01 -a4 +a5 c0 69 81 @@ -131,7 +131,7 @@ 20 20 01 -a6 +a7 6f e4 4b @@ -1391,7 +1391,7 @@ 20 40 01 -5e +5f da 60 4c @@ -1401,9 +1401,13 @@ 42 2b 20 +40 +46 +ee +20 20 01 -a6 +a7 df 20 00 @@ -1427,7 +1431,7 @@ 20 40 01 -73 +74 20 40 00 @@ -1435,7 +1439,7 @@ 20 40 01 -f0 +f1 20 40 3f @@ -1467,7 +1471,7 @@ 20 40 01 -6f +70 20 20 45 @@ -1495,7 +1499,7 @@ c0 06 81 -76 +77 20 20 42 @@ -1511,7 +1515,7 @@ c0 7f 81 -7c +7d 68 48 c9 @@ -1595,19 +1599,19 @@ c0 00 01 -92 +93 c0 00 81 -99 +9a c0 01 01 -9e +9f c0 01 81 -9f +a0 20 60 00 @@ -1691,7 +1695,7 @@ 20 40 01 -cd +ce 6f e0 c9 @@ -1699,11 +1703,11 @@ c0 06 01 -aa +ab c0 06 81 -b7 +b8 20 20 40 @@ -1715,19 +1719,19 @@ c0 00 01 -b1 +b2 c0 00 81 -af +b0 c0 01 01 -b3 +b4 c0 01 81 -b5 +b6 68 48 cc @@ -1771,47 +1775,47 @@ c0 00 01 -bf +c0 c0 00 81 -bd +be c0 01 01 -c1 +c2 c0 01 81 -c3 +c4 6f e0 -c9 -d5 +cc +21 20 20 01 -c4 +c5 6f e0 -c9 -d4 +cc +20 20 20 01 -c4 +c5 6f e0 -c9 -d6 +cc +22 20 20 01 -c4 +c5 6f e0 -c9 -d7 +cc +23 67 e0 c9 @@ -1895,7 +1899,7 @@ 20 3a 01 -db +dc 67 e0 cb @@ -1955,11 +1959,11 @@ 20 41 01 -ea +eb 24 41 01 -ee +ef 20 20 48 @@ -2003,7 +2007,7 @@ c0 00 81 -f5 +f6 20 60 00 @@ -2019,7 +2023,7 @@ 20 40 02 -08 +09 6f e0 c8 @@ -2027,11 +2031,11 @@ c2 83 81 -fd +fe 20 40 02 -10 +11 67 e0 c8 @@ -2043,7 +2047,7 @@ 20 40 02 -00 +01 67 e0 c8 @@ -2067,7 +2071,7 @@ 20 40 02 -10 +11 1f e2 04 @@ -2091,11 +2095,11 @@ c2 83 82 -0d +0e 20 40 02 -10 +11 67 e0 c8 @@ -2107,7 +2111,7 @@ 20 40 02 -00 +01 67 e0 c8 @@ -2147,7 +2151,7 @@ 24 21 02 -19 +1a 20 60 00 @@ -2160,8 +2164,8 @@ 60 00 00 -5c -71 +2e +56 aa 55 40 @@ -2352,6 +2356,16 @@ 06 aa 55 +04 +00 +20 +4c +2a +35 +3f +1a +aa +55 26 00 e2 @@ -2444,24 +2458,10 @@ aa aa 55 -66 -4b -33 -69 -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff -ff +8d +4d +29 +6e ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -30 -de +2f +ab Index: output/memmap.format =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_OM18/output/memmap.format (revision 869) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_OM18/output/memmap.format (working copy) @@ -2211,6 +2211,11 @@ 0x4c0c mem_om16_dpi_2 0x4c0d mem_om16_dpi_3 0x4c0e mem_sensor_om18_init +0x4c20 mem_om18_dpi +0x4c20 mem_om18_dpi_0 +0x4c21 mem_om18_dpi_1 +0x4c22 mem_om18_dpi_2 +0x4c23 mem_om18_dpi_3 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/XZR/1319AC_only24g/LRPair_24G_OM18/output/program.lis (revision 869) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_OM18/output/program.lis (working copy) @@ -8,8 +8,8 @@ 0005 c0638134 beq patch18_7 ,p_mouse_app_enter_hibernate 0006 c06480e1 beq patch19_1 ,p_mouse_setgpio_hibernate 0007 c06500e9 beq patch19_2 ,p_mouse_lpm_before_common -0008 c0670160 beq patch19_6 ,p_mouse_motion -0009 c06801a4 beq patch1a_0 ,p_mouse_seting_dpi +0008 c0670161 beq patch19_6 ,p_mouse_motion +0009 c06801a5 beq patch1a_0 ,p_mouse_seting_dpi 000a c069813f beq patch1a_3 ,p_mouse_init_sunt 000b c06a001b beq patch1a_4 ,p_mouse_sensor_poweron 000c 2020137c branch loop @@ -43,7 +43,7 @@ 001e 2040422b call mouse_sensor_wr_seq p_mouse_dpi_config: -001f 202001a6 branch p_mouse_seting_sensor_type +001f 202001a7 branch p_mouse_seting_sensor_type p_mouse_start_work: 0020 6fe44bab fetch mouse_flag_len ,mem_mouse_flag @@ -432,271 +432,272 @@ 0157 7049270d jam om18 ,mem_config_sensor_type 0158 58008006 setarg 0x8006 0159 20405b0c call twspi_write -015a 2040015e call p_delay_15ms +015a 2040015f call p_delay_15ms 015b da604c0e arg mem_sensor_om18_init ,regc 015c 2040422b call mouse_sensor_wr_seq -015d 202001a6 branch p_mouse_seting_sensor_type +015d 204046ee call mouse_dpi_4level_enable +015e 202001a7 branch p_mouse_seting_sensor_type p_delay_15ms: -015e df20000f arg 15 ,loopcnt -015f 20207d13 branch delay_ms_wait +015f df20000f arg 15 ,loopcnt +0160 20207d13 branch delay_ms_wait p_mouse_motion: -0160 78547c00 disable user -0161 58000000 setarg 0 -0162 67e348d1 store 6 ,mem_mouse_x -0163 20400173 call p_mouse_check_sensor_data -0164 2040001f call p_mouse_dpi_config -0165 204001f0 call p_mouse_sensor_data_mul -0166 20403f7e call mouse_zwheel -0167 20403f83 call mouse_t_zwheel -0168 204040dc call mouse_key -0169 6fe0c8d0 fetch 1 ,mem_mouse_key -016a 1fe17e1f and_into 0x1f ,pdata -016b 67e0c8d0 store 1 ,mem_mouse_key -016c 24344728 nbranch mouse_drawing_optima_init ,user -016d 2040016f call p_mouse_drawing_optima -016e 20204544 branch mouse_no_data_timer_init +0161 78547c00 disable user +0162 58000000 setarg 0 +0163 67e348d1 store 6 ,mem_mouse_x +0164 20400174 call p_mouse_check_sensor_data +0165 2040001f call p_mouse_dpi_config +0166 204001f1 call p_mouse_sensor_data_mul +0167 20403f7e call mouse_zwheel +0168 20403f83 call mouse_t_zwheel +0169 204040dc call mouse_key +016a 6fe0c8d0 fetch 1 ,mem_mouse_key +016b 1fe17e1f and_into 0x1f ,pdata +016c 67e0c8d0 store 1 ,mem_mouse_key +016d 24344728 nbranch mouse_drawing_optima_init ,user +016e 20400170 call p_mouse_drawing_optima +016f 20204544 branch mouse_no_data_timer_init p_mouse_drawing_optima: -016f 6fe0c927 fetch 1 ,mem_config_sensor_type -0170 c1018000 rtneq p3212 -0171 c1068000 rtneq om18 -0172 2020471a branch mouse_drawing_optima +0170 6fe0c927 fetch 1 ,mem_config_sensor_type +0171 c1018000 rtneq p3212 +0172 c1068000 rtneq om18 +0173 2020471a branch mouse_drawing_optima p_mouse_check_sensor_data: -0173 6fe0c927 fetch 1 ,mem_config_sensor_type -0174 c0068176 beq om18 ,p_mouse_om18_sensor_motion -0175 20204240 branch mouse_check_sensor_data +0174 6fe0c927 fetch 1 ,mem_config_sensor_type +0175 c0068177 beq om18 ,p_mouse_om18_sensor_motion +0176 20204240 branch mouse_check_sensor_data p_mouse_om18_sensor_motion: -0176 204042c4 call mouse_clear_sensor_data -0177 6fe0c911 fetch 1 ,mem_sensor_motion_gpio -0178 c07f817c beq gpio_disable ,p_mouse_om18_sensor_motion_skip_motion_pin -0179 6848c911 fetcht 1 ,mem_sensor_motion_gpio -017a 20406059 call gpio_get_bit -017b 24608000 nrtn true +0177 204042c4 call mouse_clear_sensor_data +0178 6fe0c911 fetch 1 ,mem_sensor_motion_gpio +0179 c07f817d beq gpio_disable ,p_mouse_om18_sensor_motion_skip_motion_pin +017a 6848c911 fetcht 1 ,mem_sensor_motion_gpio +017b 20406059 call gpio_get_bit +017c 24608000 nrtn true p_mouse_om18_sensor_motion_skip_motion_pin: -017c 58000000 setarg pan_reg_pid_l -017d 20405b0d call twspi_read -017e c08c41b2 bne om18_id ,mouse_twspi_reset -017f 58000002 setarg pan_reg_motion_staus -0180 20405b0d call twspi_read -0181 c4038000 rtnbit0 7 -0182 204042db call mouse_read_sensor_common -0183 2040428c call mouse_read_3212sensor_xy_high -0184 67e0c8d7 store 1 ,mem_mouse_xy_h -0185 1ff1fe00 rshift4 pdata ,pdata -0186 204042d7 call mouse_data_extsign_bit3 -0187 67e0c8d2 store 1 ,mem_mouse_x + 1 -0188 6fe0c8d7 fetch 1 ,mem_mouse_xy_h -0189 1fe17e0f and pdata ,0x0f ,pdata -018a 204042d7 call mouse_data_extsign_bit3 -018b 67e0c8d4 store 1 ,mem_mouse_y + 1 -018c 6fe0c928 fetch 1 ,mem_config_sensor_angle -018d c0000192 beq mouse_6clk_angle ,p_mouse_motion_6clk_direction_dispose -018e c0008199 beq mouse_9clk_angle ,p_mouse_motion_9clk_direction_dispose -018f c001019e beq mouse_12clk_angle ,p_mouse_motion_12clk_direction_dispose -0190 c001819f beq mouse_3clk_angle ,p_mouse_motion_3clk_direction_dispose -0191 20600000 rtn +017d 58000000 setarg pan_reg_pid_l +017e 20405b0d call twspi_read +017f c08c41b2 bne om18_id ,mouse_twspi_reset +0180 58000002 setarg pan_reg_motion_staus +0181 20405b0d call twspi_read +0182 c4038000 rtnbit0 7 +0183 204042db call mouse_read_sensor_common +0184 2040428c call mouse_read_3212sensor_xy_high +0185 67e0c8d7 store 1 ,mem_mouse_xy_h +0186 1ff1fe00 rshift4 pdata ,pdata +0187 204042d7 call mouse_data_extsign_bit3 +0188 67e0c8d2 store 1 ,mem_mouse_x + 1 +0189 6fe0c8d7 fetch 1 ,mem_mouse_xy_h +018a 1fe17e0f and pdata ,0x0f ,pdata +018b 204042d7 call mouse_data_extsign_bit3 +018c 67e0c8d4 store 1 ,mem_mouse_y + 1 +018d 6fe0c928 fetch 1 ,mem_config_sensor_angle +018e c0000193 beq mouse_6clk_angle ,p_mouse_motion_6clk_direction_dispose +018f c000819a beq mouse_9clk_angle ,p_mouse_motion_9clk_direction_dispose +0190 c001019f beq mouse_12clk_angle ,p_mouse_motion_12clk_direction_dispose +0191 c00181a0 beq mouse_3clk_angle ,p_mouse_motion_3clk_direction_dispose +0192 20600000 rtn p_mouse_motion_6clk_direction_dispose: -0192 6fe148d1 fetch 2 ,mem_mouse_x -0193 1fe67e00 sub pdata ,0 ,pdata -0194 67e148d1 store 2 ,mem_mouse_x -0195 6fe148d3 fetch 2 ,mem_mouse_y -0196 1fe67e00 sub pdata ,0 ,pdata -0197 67e148d3 store 2 ,mem_mouse_y -0198 20207e54 branch enable_user +0193 6fe148d1 fetch 2 ,mem_mouse_x +0194 1fe67e00 sub pdata ,0 ,pdata +0195 67e148d1 store 2 ,mem_mouse_x +0196 6fe148d3 fetch 2 ,mem_mouse_y +0197 1fe67e00 sub pdata ,0 ,pdata +0198 67e148d3 store 2 ,mem_mouse_y +0199 20207e54 branch enable_user p_mouse_motion_9clk_direction_dispose: -0199 204042bf call mouse_sensor_data_swap_places -019a 6fe148d1 fetch 2 ,mem_mouse_x -019b 1fe67e00 sub pdata ,0 ,pdata -019c 67e148d1 store 2 ,mem_mouse_x -019d 20207e54 branch enable_user +019a 204042bf call mouse_sensor_data_swap_places +019b 6fe148d1 fetch 2 ,mem_mouse_x +019c 1fe67e00 sub pdata ,0 ,pdata +019d 67e148d1 store 2 ,mem_mouse_x +019e 20207e54 branch enable_user p_mouse_motion_12clk_direction_dispose: -019e 20207e54 branch enable_user +019f 20207e54 branch enable_user p_mouse_motion_3clk_direction_dispose: -019f 204042bf call mouse_sensor_data_swap_places -01a0 6fe148d3 fetch 2 ,mem_mouse_y -01a1 1fe67e00 sub pdata ,0 ,pdata -01a2 67e148d3 store 2 ,mem_mouse_y -01a3 20207e54 branch enable_user +01a0 204042bf call mouse_sensor_data_swap_places +01a1 6fe148d3 fetch 2 ,mem_mouse_y +01a2 1fe67e00 sub pdata ,0 ,pdata +01a3 67e148d3 store 2 ,mem_mouse_y +01a4 20207e54 branch enable_user p_mouse_seting_dpi: -01a4 2040408f call mouse_setting_dpi_4_level -01a5 204001cd call p_mouse_dpi_led_blink_delay +01a5 2040408f call mouse_setting_dpi_4_level +01a6 204001ce call p_mouse_dpi_led_blink_delay p_mouse_seting_sensor_type: -01a6 6fe0c927 fetch 1 ,mem_config_sensor_type -01a7 c00601aa beq om16 ,p_mouse_seting_om16_dpi -01a8 c00681b7 beq om18 ,p_mouse_seting_om18_dpi -01a9 20204098 branch mouse_seting_sensor_type +01a7 6fe0c927 fetch 1 ,mem_config_sensor_type +01a8 c00601ab beq om16 ,p_mouse_seting_om16_dpi +01a9 c00681b8 beq om18 ,p_mouse_seting_om18_dpi +01aa 20204098 branch mouse_seting_sensor_type p_mouse_seting_om16_dpi: -01aa 6fe0c992 fetch 1 ,mem_mouse_dpi -01ab c00001b1 beq mouse_dpi_level1 ,p_mouse_om16_set_cpi0 -01ac c00081af beq mouse_dpi_level2 ,p_mouse_om16_set_cpi1 -01ad c00101b3 beq mouse_dpi_level3 ,p_mouse_om16_set_cpi2 -01ae c00181b5 beq mouse_dpi_level4 ,p_mouse_om16_set_cpi3 +01ab 6fe0c992 fetch 1 ,mem_mouse_dpi +01ac c00001b2 beq mouse_dpi_level1 ,p_mouse_om16_set_cpi0 +01ad c00081b0 beq mouse_dpi_level2 ,p_mouse_om16_set_cpi1 +01ae c00101b4 beq mouse_dpi_level3 ,p_mouse_om16_set_cpi2 +01af c00181b6 beq mouse_dpi_level4 ,p_mouse_om16_set_cpi3 p_mouse_om16_set_cpi1: -01af 6848cc0b fetcht 1 ,mem_om16_dpi_1 -01b0 202040a8 branch mouse_dpi_store +01b0 6848cc0b fetcht 1 ,mem_om16_dpi_1 +01b1 202040a8 branch mouse_dpi_store p_mouse_om16_set_cpi0: -01b1 6848cc0a fetcht 1 ,mem_om16_dpi_0 -01b2 202040a8 branch mouse_dpi_store +01b2 6848cc0a fetcht 1 ,mem_om16_dpi_0 +01b3 202040a8 branch mouse_dpi_store p_mouse_om16_set_cpi2: -01b3 6848cc0c fetcht 1 ,mem_om16_dpi_2 -01b4 202040a8 branch mouse_dpi_store +01b4 6848cc0c fetcht 1 ,mem_om16_dpi_2 +01b5 202040a8 branch mouse_dpi_store p_mouse_om16_set_cpi3: -01b5 6848cc0d fetcht 1 ,mem_om16_dpi_3 -01b6 202040a8 branch mouse_dpi_store +01b6 6848cc0d fetcht 1 ,mem_om16_dpi_3 +01b7 202040a8 branch mouse_dpi_store p_mouse_seting_om18_dpi: -01b7 20404229 call mouse_sensor_disable_wp -01b8 6fe0c992 fetch 1 ,mem_mouse_dpi -01b9 c00001bf beq mouse_dpi_level1 ,p_mouse_set_om18_cpi0 -01ba c00081bd beq mouse_dpi_level2 ,p_mouse_set_om18_cpi1 -01bb c00101c1 beq mouse_dpi_level3 ,p_mouse_set_om18_cpi2 -01bc c00181c3 beq mouse_dpi_level4 ,p_mouse_set_om18_cpi3 +01b8 20404229 call mouse_sensor_disable_wp +01b9 6fe0c992 fetch 1 ,mem_mouse_dpi +01ba c00001c0 beq mouse_dpi_level1 ,p_mouse_set_om18_cpi0 +01bb c00081be beq mouse_dpi_level2 ,p_mouse_set_om18_cpi1 +01bc c00101c2 beq mouse_dpi_level3 ,p_mouse_set_om18_cpi2 +01bd c00181c4 beq mouse_dpi_level4 ,p_mouse_set_om18_cpi3 p_mouse_set_om18_cpi1: -01bd 6fe0c9d5 fetch 1 ,mem_3212_dpi_1 -01be 202001c4 branch p_mouse_om18_dpi +01be 6fe0cc21 fetch 1 ,mem_om18_dpi_1 +01bf 202001c5 branch p_mouse_om18_dpi p_mouse_set_om18_cpi0: -01bf 6fe0c9d4 fetch 1 ,mem_3212_dpi_0 -01c0 202001c4 branch p_mouse_om18_dpi +01c0 6fe0cc20 fetch 1 ,mem_om18_dpi_0 +01c1 202001c5 branch p_mouse_om18_dpi p_mouse_set_om18_cpi2: -01c1 6fe0c9d6 fetch 1 ,mem_3212_dpi_2 -01c2 202001c4 branch p_mouse_om18_dpi +01c2 6fe0cc22 fetch 1 ,mem_om18_dpi_2 +01c3 202001c5 branch p_mouse_om18_dpi p_mouse_set_om18_cpi3: -01c3 6fe0c9d7 fetch 1 ,mem_3212_dpi_3 +01c4 6fe0cc23 fetch 1 ,mem_om18_dpi_3 p_mouse_om18_dpi: -01c4 67e0c9dc store 1 ,mem_mouse_cpi_count -01c5 1fed7e00 lshift8 pdata ,pdata -01c6 1fe22200 copy pdata ,rega -01c7 1fe0fe10 add pdata ,mouse_om18_dpi_xaddress ,pdata -01c8 20405b0c call twspi_write -01c9 1a227e00 copy rega ,pdata -01ca 1fe0fe11 add pdata ,mouse_om18_dpi_yaddress ,pdata -01cb 20405b0c call twspi_write -01cc 20204227 branch mouse_sensor_enable_wp +01c5 67e0c9dc store 1 ,mem_mouse_cpi_count +01c6 1fed7e00 lshift8 pdata ,pdata +01c7 1fe22200 copy pdata ,rega +01c8 1fe0fe10 add pdata ,mouse_om18_dpi_xaddress ,pdata +01c9 20405b0c call twspi_write +01ca 1a227e00 copy rega ,pdata +01cb 1fe0fe11 add pdata ,mouse_om18_dpi_yaddress ,pdata +01cc 20405b0c call twspi_write +01cd 20204227 branch mouse_sensor_enable_wp p_mouse_dpi_led_blink_delay: -01cd 6fe0c923 fetch 1 ,mem_dpi_led_gpio -01ce c17f8000 rtneq gpio_disable -01cf 6fe14ac2 fetch 2 ,mem_mouse_discovery_timer -01d0 247a0000 nrtn blank -01d1 6fe14883 fetch 2 ,mem_24g_pair_timeout -01d2 247a0000 nrtn blank -01d3 6fe14887 fetch 2 ,mem_24g_reconn_timeout -01d4 247a0000 nrtn blank -01d5 6fe0cba7 fetch 1 ,mem_mouse_device_poweron_timer_count -01d6 247a0000 nrtn blank -01d7 6fe0cbc1 fetch 1 ,mem_mouse_dpi_led_delay_count_init -01d8 203a01db branch p_mouse_dpi_led_blink_init ,blank -01d9 67e0cba8 store 1 ,mem_mouse_dpi_led_delay_count -01da 20600000 rtn +01ce 6fe0c923 fetch 1 ,mem_dpi_led_gpio +01cf c17f8000 rtneq gpio_disable +01d0 6fe14ac2 fetch 2 ,mem_mouse_discovery_timer +01d1 247a0000 nrtn blank +01d2 6fe14883 fetch 2 ,mem_24g_pair_timeout +01d3 247a0000 nrtn blank +01d4 6fe14887 fetch 2 ,mem_24g_reconn_timeout +01d5 247a0000 nrtn blank +01d6 6fe0cba7 fetch 1 ,mem_mouse_device_poweron_timer_count +01d7 247a0000 nrtn blank +01d8 6fe0cbc1 fetch 1 ,mem_mouse_dpi_led_delay_count_init +01d9 203a01dc branch p_mouse_dpi_led_blink_init ,blank +01da 67e0cba8 store 1 ,mem_mouse_dpi_led_delay_count +01db 20600000 rtn p_mouse_dpi_led_blink_init: -01db 6fe0c927 fetch 1 ,mem_config_sensor_type -01dc c001c8f2 beq p3212 ,mouse_dpi_led_blink_init -01dd c005c8f2 beq ka8g2 ,mouse_dpi_led_blink_init -01de 6fe0c923 fetch 1 ,mem_dpi_led_gpio -01df 67e0c92f store 1 ,mem_mouse_struct_led_gpio -01e0 6fe14bc2 fetch 2 ,mem_mouse_dpi_led_blink_time -01e1 67e14930 store 2 ,mem_mouse_on_time -01e2 67e14932 store 2 ,mem_mouse_off_time -01e3 da200000 arg 0 ,rega -01e4 6848c992 fetcht 1 ,mem_mouse_dpi -01e5 18408402 increase 2 ,temp -01e6 18467c03 sub temp ,3 ,null -01e7 204101ea call p_mouse_dpi_led_blink_init_level_4 ,positive -01e8 244101ee ncall p_mouse_dpi_led_blink_count_clean ,positive -01e9 202048ff branch mouse_dpi_led_blink_init_end +01dc 6fe0c927 fetch 1 ,mem_config_sensor_type +01dd c001c8f2 beq p3212 ,mouse_dpi_led_blink_init +01de c005c8f2 beq ka8g2 ,mouse_dpi_led_blink_init +01df 6fe0c923 fetch 1 ,mem_dpi_led_gpio +01e0 67e0c92f store 1 ,mem_mouse_struct_led_gpio +01e1 6fe14bc2 fetch 2 ,mem_mouse_dpi_led_blink_time +01e2 67e14930 store 2 ,mem_mouse_on_time +01e3 67e14932 store 2 ,mem_mouse_off_time +01e4 da200000 arg 0 ,rega +01e5 6848c992 fetcht 1 ,mem_mouse_dpi +01e6 18408402 increase 2 ,temp +01e7 18467c03 sub temp ,3 ,null +01e8 204101eb call p_mouse_dpi_led_blink_init_level_4 ,positive +01e9 244101ef ncall p_mouse_dpi_led_blink_count_clean ,positive +01ea 202048ff branch mouse_dpi_led_blink_init_end p_mouse_dpi_led_blink_init_level_4: -01ea 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -01eb c40e0000 rtnbit0 mouse_enable_dpi_level_4 -01ec 18408401 increase 1 ,temp -01ed 20600000 rtn +01eb 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +01ec c40e0000 rtnbit0 mouse_enable_dpi_level_4 +01ed 18408401 increase 1 ,temp +01ee 20600000 rtn p_mouse_dpi_led_blink_count_clean: -01ee 184085fd increase -3 ,temp -01ef 20600000 rtn +01ef 184085fd increase -3 ,temp +01f0 20600000 rtn p_mouse_sensor_data_mul: -01f0 6fe0c927 fetch 1 ,mem_config_sensor_type -01f1 c1860000 rtnne om16 -01f2 6fe0c992 fetch 1 ,mem_mouse_dpi -01f3 c00081f5 beq mouse_dpi_level2 ,p_mouse_sensor_data_set -01f4 20600000 rtn +01f1 6fe0c927 fetch 1 ,mem_config_sensor_type +01f2 c1860000 rtnne om16 +01f3 6fe0c992 fetch 1 ,mem_mouse_dpi +01f4 c00081f6 beq mouse_dpi_level2 ,p_mouse_sensor_data_set +01f5 20600000 rtn p_mouse_sensor_data_set: -01f5 58000204 setarg 0x0204 -01f6 67e14c08 store 2 ,mem_mouse_xy_date_times -01f7 20400208 call p_mouse_sensor_data_set_x +01f6 58000204 setarg 0x0204 +01f7 67e14c08 store 2 ,mem_mouse_xy_date_times +01f8 20400209 call p_mouse_sensor_data_set_x p_mouse_sensor_data_set_y: -01f8 6fe0c8d3 fetch 1 ,mem_mouse_y -01f9 c28381fd bbit1 7 ,p_mouse_sensor_data_set_y_next -01fa 20400210 call p_mouse_sensor_data_set_next -01fb 67e0c8d3 store 1 ,mem_mouse_y -01fc 20600000 rtn +01f9 6fe0c8d3 fetch 1 ,mem_mouse_y +01fa c28381fe bbit1 7 ,p_mouse_sensor_data_set_y_next +01fb 20400211 call p_mouse_sensor_data_set_next +01fc 67e0c8d3 store 1 ,mem_mouse_y +01fd 20600000 rtn p_mouse_sensor_data_set_y_next: -01fd 20400200 call p_mouse_sensor_data_set_reverse -01fe 67e0c8d3 store 1 ,mem_mouse_y -01ff 20600000 rtn +01fe 20400201 call p_mouse_sensor_data_set_reverse +01ff 67e0c8d3 store 1 ,mem_mouse_y +0200 20600000 rtn p_mouse_sensor_data_set_reverse: -0200 1fe20400 copy pdata ,temp -0201 dfe00100 arg 0x100 ,pdata -0202 98467e00 isub temp ,pdata -0203 20400210 call p_mouse_sensor_data_set_next -0204 1fe20400 copy pdata ,temp -0205 dfe00100 arg 0x100 ,pdata -0206 98467e00 isub temp ,pdata -0207 20600000 rtn +0201 1fe20400 copy pdata ,temp +0202 dfe00100 arg 0x100 ,pdata +0203 98467e00 isub temp ,pdata +0204 20400211 call p_mouse_sensor_data_set_next +0205 1fe20400 copy pdata ,temp +0206 dfe00100 arg 0x100 ,pdata +0207 98467e00 isub temp ,pdata +0208 20600000 rtn p_mouse_sensor_data_set_x: -0208 6fe0c8d1 fetch 1 ,mem_mouse_x -0209 c283820d bbit1 7 ,p_mouse_sensor_data_set_x_next -020a 20400210 call p_mouse_sensor_data_set_next -020b 67e0c8d1 store 1 ,mem_mouse_x -020c 20600000 rtn +0209 6fe0c8d1 fetch 1 ,mem_mouse_x +020a c283820e bbit1 7 ,p_mouse_sensor_data_set_x_next +020b 20400211 call p_mouse_sensor_data_set_next +020c 67e0c8d1 store 1 ,mem_mouse_x +020d 20600000 rtn p_mouse_sensor_data_set_x_next: -020d 20400200 call p_mouse_sensor_data_set_reverse -020e 67e0c8d1 store 1 ,mem_mouse_x -020f 20600000 rtn +020e 20400201 call p_mouse_sensor_data_set_reverse +020f 67e0c8d1 store 1 ,mem_mouse_x +0210 20600000 rtn p_mouse_sensor_data_set_next: -0210 6848cc08 fetcht 1 ,mem_mouse_xy_date_times -0211 984ffe00 imul32 temp ,pdata -0212 6848cc09 fetcht 1 ,mem_mouse_xy_date_times + 1 -0213 9846fc00 idiv temp -0214 20407def call wait_div_end -0215 1807fe00 quotient pdata -0216 1fe67c7f sub pdata ,0x7f ,null -0217 24210219 nbranch p_mouse_sensor_data_set_next2 ,positive -0218 20600000 rtn +0211 6848cc08 fetcht 1 ,mem_mouse_xy_date_times +0212 984ffe00 imul32 temp ,pdata +0213 6848cc09 fetcht 1 ,mem_mouse_xy_date_times + 1 +0214 9846fc00 idiv temp +0215 20407def call wait_div_end +0216 1807fe00 quotient pdata +0217 1fe67c7f sub pdata ,0x7f ,null +0218 2421021a nbranch p_mouse_sensor_data_set_next2 ,positive +0219 20600000 rtn p_mouse_sensor_data_set_next2: -0219 5800007f setarg 0x7f -021a 20600000 rtn +021a 5800007f setarg 0x7f +021b 20600000 rtn org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_OM18/program/patch.prog (revision 869) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_OM18/program/patch.prog (working copy) @@ -443,6 +443,7 @@ call p_delay_15ms arg mem_sensor_om18_init,regc call mouse_sensor_wr_seq + call mouse_dpi_4level_enable branch p_mouse_seting_sensor_type p_delay_15ms: @@ -561,21 +562,21 @@ p_mouse_seting_om18_dpi: call mouse_sensor_disable_wp fetch 1,mem_mouse_dpi - beq MOUSE_DPI_LEVEL1,p_mouse_set_om18_cpi0 //1200 - beq MOUSE_DPI_LEVEL2,p_mouse_set_om18_cpi1 //1600 + beq MOUSE_DPI_LEVEL1,p_mouse_set_om18_cpi0 //1600 + beq MOUSE_DPI_LEVEL2,p_mouse_set_om18_cpi1 //2000 beq MOUSE_DPI_LEVEL3,p_mouse_set_om18_cpi2 //2400 - beq MOUSE_DPI_LEVEL4,p_mouse_set_om18_cpi3 //800 + beq MOUSE_DPI_LEVEL4,p_mouse_set_om18_cpi3 //1000 p_mouse_set_om18_cpi1: - fetch 1,mem_3212_dpi_1 + fetch 1,mem_om18_dpi_1 branch p_mouse_om18_dpi p_mouse_set_om18_cpi0: - fetch 1,mem_3212_dpi_0 + fetch 1,mem_om18_dpi_0 branch p_mouse_om18_dpi p_mouse_set_om18_cpi2: - fetch 1,mem_3212_dpi_2 + fetch 1,mem_om18_dpi_2 branch p_mouse_om18_dpi p_mouse_set_om18_cpi3: - fetch 1,mem_3212_dpi_3 + fetch 1,mem_om18_dpi_3 p_mouse_om18_dpi: store 1,mem_mouse_cpi_count lshift8 pdata,pdata Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_OM18/sched/mouse.dat (revision 869) +++ /YC1308AC/branch/mouse_project/XZR/1319AC_only24g/LRPair_24G_OM18/sched/mouse.dat (working copy) @@ -78,6 +78,13 @@ 05 ##mem_om16_dpi_1 04 ##mem_om16_dpi_2 06 ##mem_om16_dpi_3 + +mem_om18_dpi: +2a ##mem_om18_dpi_0 +35 ##mem_om18_dpi_1 +3f ##mem_om18_dpi_2 +1a ##mem_om18_dpi_3 + mem_sensor_8650_init_new: 09 5a ff 27