Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_AutoPair/output/eeprom.dat (revision 885) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_AutoPair/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -3a +3e 10 c2 84 @@ -3191,7 +3191,7 @@ 20 40 03 -e3 +e4 20 40 3f @@ -3963,7 +3963,7 @@ 20 40 03 -e1 +e2 da 60 4b @@ -3973,6 +3973,10 @@ 42 2b 20 +40 +46 +ee +20 20 02 22 @@ -3999,7 +4003,7 @@ c0 00 83 -e8 +e9 20 60 00 @@ -4015,7 +4019,7 @@ 20 40 03 -fb +fc 6f e0 c8 @@ -4023,11 +4027,11 @@ c2 83 83 -f0 +f1 20 40 04 -03 +04 67 e0 c8 @@ -4039,7 +4043,7 @@ 20 40 03 -f3 +f4 67 e0 c8 @@ -4063,7 +4067,7 @@ 20 40 04 -03 +04 1f e2 04 @@ -4087,11 +4091,11 @@ c2 83 84 -00 +01 20 40 04 -03 +04 67 e0 c8 @@ -4103,7 +4107,7 @@ 20 40 03 -f3 +f4 67 e0 c8 @@ -4143,7 +4147,7 @@ 24 21 04 -0c +0d 20 60 00 @@ -4156,8 +4160,8 @@ 60 00 00 -d8 -34 +60 +5b aa 55 40 @@ -4301,13 +4305,13 @@ ab 4b 04 -18 +08 4a 00 00 -80 -03 -01 +00 +02 +13 aa 55 0c @@ -4492,7 +4496,7 @@ ca 4b 07 -06 +03 aa 55 01 @@ -4936,10 +4940,10 @@ 05 04 06 -1b -2b -35 -3f +24 +2a +34 +16 aa 55 b2 @@ -5390,14 +5394,10 @@ aa aa 55 -80 -73 -ac -6d -ff -ff -ff -ff +dc +72 +e6 +f5 ff ff ff @@ -8188,5 +8188,5 @@ ff ff ff -3b -d5 +d7 +39 Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_AutoPair/output/program.lis (revision 885) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_AutoPair/output/program.lis (working copy) @@ -1034,7 +1034,7 @@ 0319 67e348d1 store 6 ,mem_mouse_x 031a 2040032a call p_mouse_check_sensor_data 031b 20400361 call p_mouse_dpi_config -031c 204003e3 call p_mouse_sensor_data_mul +031c 204003e4 call p_mouse_sensor_data_mul 031d 20403f7e call mouse_zwheel 031e 20403f83 call mouse_t_zwheel 031f 204040dc call mouse_key @@ -1301,75 +1301,76 @@ 03da 7049270d jam om18 ,mem_config_sensor_type 03db 58008006 setarg 0x8006 03dc 20405b0c call twspi_write -03dd 204003e1 call p_delay_15ms +03dd 204003e2 call p_delay_15ms 03de da604bf7 arg mem_sensor_om18_init ,regc 03df 2040422b call mouse_sensor_wr_seq -03e0 20200222 branch p_mouse_seting_sensor_type +03e0 204046ee call mouse_dpi_4level_enable +03e1 20200222 branch p_mouse_seting_sensor_type p_delay_15ms: -03e1 df20000f arg 15 ,loopcnt -03e2 20207d13 branch delay_ms_wait +03e2 df20000f arg 15 ,loopcnt +03e3 20207d13 branch delay_ms_wait p_mouse_sensor_data_mul: -03e3 6fe0c927 fetch 1 ,mem_config_sensor_type -03e4 c1860000 rtnne om16 -03e5 6fe0c992 fetch 1 ,mem_mouse_dpi -03e6 c00083e8 beq mouse_dpi_level2 ,p_mouse_sensor_data_set -03e7 20600000 rtn +03e4 6fe0c927 fetch 1 ,mem_config_sensor_type +03e5 c1860000 rtnne om16 +03e6 6fe0c992 fetch 1 ,mem_mouse_dpi +03e7 c00083e9 beq mouse_dpi_level2 ,p_mouse_sensor_data_set +03e8 20600000 rtn p_mouse_sensor_data_set: -03e8 58000204 setarg 0x0204 -03e9 67e14bed store 2 ,mem_mouse_xy_date_times -03ea 204003fb call p_mouse_sensor_data_set_x +03e9 58000204 setarg 0x0204 +03ea 67e14bed store 2 ,mem_mouse_xy_date_times +03eb 204003fc call p_mouse_sensor_data_set_x p_mouse_sensor_data_set_y: -03eb 6fe0c8d3 fetch 1 ,mem_mouse_y -03ec c28383f0 bbit1 7 ,p_mouse_sensor_data_set_y_next -03ed 20400403 call p_mouse_sensor_data_set_next -03ee 67e0c8d3 store 1 ,mem_mouse_y -03ef 20600000 rtn +03ec 6fe0c8d3 fetch 1 ,mem_mouse_y +03ed c28383f1 bbit1 7 ,p_mouse_sensor_data_set_y_next +03ee 20400404 call p_mouse_sensor_data_set_next +03ef 67e0c8d3 store 1 ,mem_mouse_y +03f0 20600000 rtn p_mouse_sensor_data_set_y_next: -03f0 204003f3 call p_mouse_sensor_data_set_reverse -03f1 67e0c8d3 store 1 ,mem_mouse_y -03f2 20600000 rtn +03f1 204003f4 call p_mouse_sensor_data_set_reverse +03f2 67e0c8d3 store 1 ,mem_mouse_y +03f3 20600000 rtn p_mouse_sensor_data_set_reverse: -03f3 1fe20400 copy pdata ,temp -03f4 dfe00100 arg 0x100 ,pdata -03f5 98467e00 isub temp ,pdata -03f6 20400403 call p_mouse_sensor_data_set_next -03f7 1fe20400 copy pdata ,temp -03f8 dfe00100 arg 0x100 ,pdata -03f9 98467e00 isub temp ,pdata -03fa 20600000 rtn +03f4 1fe20400 copy pdata ,temp +03f5 dfe00100 arg 0x100 ,pdata +03f6 98467e00 isub temp ,pdata +03f7 20400404 call p_mouse_sensor_data_set_next +03f8 1fe20400 copy pdata ,temp +03f9 dfe00100 arg 0x100 ,pdata +03fa 98467e00 isub temp ,pdata +03fb 20600000 rtn p_mouse_sensor_data_set_x: -03fb 6fe0c8d1 fetch 1 ,mem_mouse_x -03fc c2838400 bbit1 7 ,p_mouse_sensor_data_set_x_next -03fd 20400403 call p_mouse_sensor_data_set_next -03fe 67e0c8d1 store 1 ,mem_mouse_x -03ff 20600000 rtn +03fc 6fe0c8d1 fetch 1 ,mem_mouse_x +03fd c2838401 bbit1 7 ,p_mouse_sensor_data_set_x_next +03fe 20400404 call p_mouse_sensor_data_set_next +03ff 67e0c8d1 store 1 ,mem_mouse_x +0400 20600000 rtn p_mouse_sensor_data_set_x_next: -0400 204003f3 call p_mouse_sensor_data_set_reverse -0401 67e0c8d1 store 1 ,mem_mouse_x -0402 20600000 rtn +0401 204003f4 call p_mouse_sensor_data_set_reverse +0402 67e0c8d1 store 1 ,mem_mouse_x +0403 20600000 rtn p_mouse_sensor_data_set_next: -0403 6848cbed fetcht 1 ,mem_mouse_xy_date_times -0404 984ffe00 imul32 temp ,pdata -0405 6848cbee fetcht 1 ,mem_mouse_xy_date_times + 1 -0406 9846fc00 idiv temp -0407 20407def call wait_div_end -0408 1807fe00 quotient pdata -0409 1fe67c7f sub pdata ,0x7f ,null -040a 2421040c nbranch p_mouse_sensor_data_set_next2 ,positive -040b 20600000 rtn +0404 6848cbed fetcht 1 ,mem_mouse_xy_date_times +0405 984ffe00 imul32 temp ,pdata +0406 6848cbee fetcht 1 ,mem_mouse_xy_date_times + 1 +0407 9846fc00 idiv temp +0408 20407def call wait_div_end +0409 1807fe00 quotient pdata +040a 1fe67c7f sub pdata ,0x7f ,null +040b 2421040d nbranch p_mouse_sensor_data_set_next2 ,positive +040c 20600000 rtn p_mouse_sensor_data_set_next2: -040c 5800007f setarg 0x7f -040d 20600000 rtn +040d 5800007f setarg 0x7f +040e 20600000 rtn org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_AutoPair/program/patch.prog (revision 885) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_AutoPair/program/patch.prog (working copy) @@ -1314,7 +1314,7 @@ call p_delay_15ms arg mem_sensor_om18_init,regc call mouse_sensor_wr_seq - //call mouse_dpi_4level_enable + call mouse_dpi_4level_enable branch p_mouse_seting_sensor_type p_delay_15ms: Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_AutoPair/sched/mouse.dat (revision 885) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_AutoPair/sched/mouse.dat (working copy) @@ -31,7 +31,7 @@ #bit3 MOUSE_ENABLE_WAKEUP_FROM_POWER #bit4 MOUSE_ENABLE_16M #bit5 MOUSE_ENABLE_USB -18 +08 #mouse flag byte3 #bit0 MOUSE_ENABLE_SPI2 @@ -74,7 +74,7 @@ #bit5 MOUSE_ENABLE_PB_BUTTON_CONNECT_GND #bit6 MOUSE_ENABLE_DPI_KEY_CONNECT_ADC #bit7 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING -80 +00 #mouse flag byte7 #bit0 MOUSE_ENABLE_AUTO_24G_PARING @@ -85,7 +85,7 @@ #bit5 MOUSE_ENABLE_COMMBINATION_KEY_BY_BT_DISCOVERY #bit6 MOUSE_ENABLE_DPI_KEY_LONG_PRESS_DISCONVERY #bit7 MOUSE_ENABLE_PB_BUTTON_LONG_PRESS_DISCONVERY -03 +02 #mouse flag byte8 #bit0 MOUSE_ENABLE_SMOOTHER @@ -93,7 +93,7 @@ #bit2 MOUSE_ENABLE_24G_AUTO_PAIR_NERVER_BEEN_PAIRED #bit3 MOUSE_ENABLE_LE_BATTERY_SERVICE_CANCEL #bit4 MOUSE_ENABLE_WHEEL_WAKE_UP_CANCEL -01 +13 mem_mouse_discovery_timeout:b0 04 #2min @@ -187,7 +187,7 @@ #bit0:mouse_key_l bit1:mouse_key_r bit2:mouse_key_m mem_mouse_commbination_key_bt:07 -mem_mouse_commbination_key_24g:06 +mem_mouse_commbination_key_24g:03 mem_store_information_delay_timer_init:02 @@ -325,10 +325,10 @@ 06 ##mem_om16_dpi_3 mem_om18_dpi: -1b ##mem_om18_dpi_0 1000 -2b ##mem_om18_dpi_1 1600 -35 ##mem_om18_dpi_2 2000 -3f ##mem_om18_dpi_3 2400 +24 ##mem_om18_dpi_0 1600 +2a ##mem_om18_dpi_1 2000 +34 ##mem_om18_dpi_2 2400 +16 ##mem_om18_dpi_3 1000 mem_sensor_3212_init: 09 5a