Index: output/eeprom.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_LRPair/output/eeprom.dat (revision 889) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_LRPair/output/eeprom.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -3e +4a 10 c2 84 @@ -67,15 +67,15 @@ c0 68 83 -75 +78 c0 69 83 -c3 +c6 c0 6a 03 -5b +5e c0 6b 01 @@ -91,7 +91,7 @@ c0 6f 03 -ab +ae c0 74 02 @@ -559,7 +559,7 @@ 20 40 03 -61 +64 20 40 3d @@ -575,7 +575,7 @@ 20 40 03 -6d +70 20 20 3b @@ -919,7 +919,7 @@ 20 20 03 -6d +70 6f e0 c8 @@ -955,7 +955,7 @@ 20 20 03 -c5 +c8 20 40 26 @@ -1079,7 +1079,7 @@ 20 40 03 -c5 +c8 6f e4 4b @@ -1195,11 +1195,11 @@ 20 40 03 -66 +69 20 40 03 -6d +70 20 20 3e @@ -1487,7 +1487,7 @@ 20 40 03 -6d +70 20 20 01 @@ -3183,15 +3183,15 @@ 20 40 03 -2a +2d 20 40 03 -61 +26 20 40 03 -e4 +e7 20 40 3f @@ -3223,7 +3223,7 @@ 20 40 03 -26 +29 20 20 45 @@ -3233,6 +3233,18 @@ c9 27 c1 +06 +80 +00 +20 +20 +03 +64 +6f +e0 +c9 +27 +c1 01 80 00 @@ -3251,7 +3263,7 @@ c0 06 83 -2d +30 20 20 42 @@ -3267,7 +3279,7 @@ c0 7f 83 -33 +36 68 48 c9 @@ -3351,19 +3363,19 @@ c0 00 03 -49 +4c c0 00 83 -50 +53 c0 01 03 -55 +58 c0 01 83 -56 +59 20 60 00 @@ -3451,7 +3463,7 @@ c0 05 83 -62 +65 20 40 42 @@ -3471,7 +3483,7 @@ 20 40 03 -69 +6c da 60 4b @@ -3483,7 +3495,7 @@ 20 20 03 -61 +64 6f e0 c9 @@ -3491,7 +3503,7 @@ c0 05 83 -69 +6c 20 20 42 @@ -3527,7 +3539,7 @@ c0 05 83 -73 +76 58 00 08 @@ -3559,23 +3571,23 @@ 20 40 03 -7e +81 20 40 03 -83 +86 20 40 03 -88 +8b 20 40 03 -8d +90 20 40 03 -9a +9d 20 20 41 @@ -3587,7 +3599,7 @@ 20 40 03 -a7 +aa 20 40 41 @@ -3607,7 +3619,7 @@ 20 40 03 -a7 +aa 20 40 41 @@ -3627,7 +3639,7 @@ 20 40 03 -a7 +aa 20 40 41 @@ -3671,7 +3683,7 @@ c0 7f 83 -96 +99 20 20 41 @@ -3683,7 +3695,7 @@ 20 40 03 -a9 +ac 68 48 c9 @@ -3723,7 +3735,7 @@ c0 7f 83 -a3 +a6 20 20 41 @@ -3735,7 +3747,7 @@ 20 40 03 -a9 +ac 68 48 c9 @@ -3771,7 +3783,7 @@ 20 40 03 -af +b2 20 20 46 @@ -3807,7 +3819,7 @@ 20 40 03 -b8 +bb 20 20 40 @@ -3835,7 +3847,7 @@ c0 7f 83 -bf +c2 20 20 40 @@ -3847,7 +3859,7 @@ 20 40 03 -a9 +ac 68 48 c9 @@ -3875,7 +3887,7 @@ c0 18 03 -ce +d1 c0 18 c2 @@ -3887,7 +3899,7 @@ c0 0c 03 -da +dd 20 40 41 @@ -3899,7 +3911,7 @@ 20 20 03 -c6 +c9 6f e0 c9 @@ -3907,11 +3919,11 @@ c0 29 03 -d8 +db c0 68 83 -d2 +d5 20 20 41 @@ -3927,7 +3939,7 @@ c0 50 83 -d6 +d9 20 20 41 @@ -3963,7 +3975,7 @@ 20 40 03 -e2 +e5 da 60 4b @@ -4003,7 +4015,7 @@ c0 00 83 -e9 +ec 20 60 00 @@ -4019,7 +4031,7 @@ 20 40 03 -fc +ff 6f e0 c8 @@ -4027,11 +4039,11 @@ c2 83 83 -f1 +f4 20 40 04 -04 +07 67 e0 c8 @@ -4043,7 +4055,7 @@ 20 40 03 -f4 +f7 67 e0 c8 @@ -4067,7 +4079,7 @@ 20 40 04 -04 +07 1f e2 04 @@ -4091,11 +4103,11 @@ c2 83 84 -01 +04 20 40 04 -04 +07 67 e0 c8 @@ -4107,7 +4119,7 @@ 20 40 03 -f4 +f7 67 e0 c8 @@ -4147,7 +4159,7 @@ 24 21 04 -0d +10 20 60 00 @@ -4160,8 +4172,8 @@ 60 00 00 -60 -5b +ca +83 aa 55 40 @@ -4305,7 +4317,7 @@ ab 4b 04 -08 +18 4a 00 00 @@ -5390,20 +5402,8 @@ e8 41 01 -55 -aa -aa -55 -da -72 -27 -5b -ff -ff -ff -ff -ff -ff +01 +eb ff ff ff @@ -8189,4 +8189,4 @@ ff ff d7 -39 +b8 Index: output/flash.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_LRPair/output/flash.dat (revision 889) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_LRPair/output/flash.dat (working copy) @@ -2,7 +2,7 @@ 02 aa 55 -3e +4a 10 c2 84 @@ -67,15 +67,15 @@ c0 68 83 -75 +78 c0 69 83 -c3 +c6 c0 6a 03 -5b +5e c0 6b 01 @@ -91,7 +91,7 @@ c0 6f 03 -ab +ae c0 74 02 @@ -559,7 +559,7 @@ 20 40 03 -61 +64 20 40 3d @@ -575,7 +575,7 @@ 20 40 03 -6d +70 20 20 3b @@ -919,7 +919,7 @@ 20 20 03 -6d +70 6f e0 c8 @@ -955,7 +955,7 @@ 20 20 03 -c5 +c8 20 40 26 @@ -1079,7 +1079,7 @@ 20 40 03 -c5 +c8 6f e4 4b @@ -1195,11 +1195,11 @@ 20 40 03 -66 +69 20 40 03 -6d +70 20 20 3e @@ -1487,7 +1487,7 @@ 20 40 03 -6d +70 20 20 01 @@ -3183,15 +3183,15 @@ 20 40 03 -2a +2d 20 40 03 -61 +26 20 40 03 -e4 +e7 20 40 3f @@ -3223,7 +3223,7 @@ 20 40 03 -26 +29 20 20 45 @@ -3233,6 +3233,18 @@ c9 27 c1 +06 +80 +00 +20 +20 +03 +64 +6f +e0 +c9 +27 +c1 01 80 00 @@ -3251,7 +3263,7 @@ c0 06 83 -2d +30 20 20 42 @@ -3267,7 +3279,7 @@ c0 7f 83 -33 +36 68 48 c9 @@ -3351,19 +3363,19 @@ c0 00 03 -49 +4c c0 00 83 -50 +53 c0 01 03 -55 +58 c0 01 83 -56 +59 20 60 00 @@ -3451,7 +3463,7 @@ c0 05 83 -62 +65 20 40 42 @@ -3471,7 +3483,7 @@ 20 40 03 -69 +6c da 60 4b @@ -3483,7 +3495,7 @@ 20 20 03 -61 +64 6f e0 c9 @@ -3491,7 +3503,7 @@ c0 05 83 -69 +6c 20 20 42 @@ -3527,7 +3539,7 @@ c0 05 83 -73 +76 58 00 08 @@ -3559,23 +3571,23 @@ 20 40 03 -7e +81 20 40 03 -83 +86 20 40 03 -88 +8b 20 40 03 -8d +90 20 40 03 -9a +9d 20 20 41 @@ -3587,7 +3599,7 @@ 20 40 03 -a7 +aa 20 40 41 @@ -3607,7 +3619,7 @@ 20 40 03 -a7 +aa 20 40 41 @@ -3627,7 +3639,7 @@ 20 40 03 -a7 +aa 20 40 41 @@ -3671,7 +3683,7 @@ c0 7f 83 -96 +99 20 20 41 @@ -3683,7 +3695,7 @@ 20 40 03 -a9 +ac 68 48 c9 @@ -3723,7 +3735,7 @@ c0 7f 83 -a3 +a6 20 20 41 @@ -3735,7 +3747,7 @@ 20 40 03 -a9 +ac 68 48 c9 @@ -3771,7 +3783,7 @@ 20 40 03 -af +b2 20 20 46 @@ -3807,7 +3819,7 @@ 20 40 03 -b8 +bb 20 20 40 @@ -3835,7 +3847,7 @@ c0 7f 83 -bf +c2 20 20 40 @@ -3847,7 +3859,7 @@ 20 40 03 -a9 +ac 68 48 c9 @@ -3875,7 +3887,7 @@ c0 18 03 -ce +d1 c0 18 c2 @@ -3887,7 +3899,7 @@ c0 0c 03 -da +dd 20 40 41 @@ -3899,7 +3911,7 @@ 20 20 03 -c6 +c9 6f e0 c9 @@ -3907,11 +3919,11 @@ c0 29 03 -d8 +db c0 68 83 -d2 +d5 20 20 41 @@ -3927,7 +3939,7 @@ c0 50 83 -d6 +d9 20 20 41 @@ -3963,7 +3975,7 @@ 20 40 03 -e2 +e5 da 60 4b @@ -4003,7 +4015,7 @@ c0 00 83 -e9 +ec 20 60 00 @@ -4019,7 +4031,7 @@ 20 40 03 -fc +ff 6f e0 c8 @@ -4027,11 +4039,11 @@ c2 83 83 -f1 +f4 20 40 04 -04 +07 67 e0 c8 @@ -4043,7 +4055,7 @@ 20 40 03 -f4 +f7 67 e0 c8 @@ -4067,7 +4079,7 @@ 20 40 04 -04 +07 1f e2 04 @@ -4091,11 +4103,11 @@ c2 83 84 -01 +04 20 40 04 -04 +07 67 e0 c8 @@ -4107,7 +4119,7 @@ 20 40 03 -f4 +f7 67 e0 c8 @@ -4147,7 +4159,7 @@ 24 21 04 -0d +10 20 60 00 @@ -4160,8 +4172,8 @@ 60 00 00 -60 -5b +ca +83 aa 55 40 @@ -4305,7 +4317,7 @@ ab 4b 04 -08 +18 4a 00 00 @@ -5390,20 +5402,8 @@ e8 41 01 -55 -aa -aa -55 -da -72 -27 -5b -ff -ff -ff -ff -ff -ff +01 +eb ff ff ff @@ -8189,4 +8189,4 @@ ff ff d7 -39 +b8 Index: output/program.lis =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_LRPair/output/program.lis (revision 889) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_LRPair/output/program.lis (working copy) @@ -15,13 +15,13 @@ 000c c0660067 beq patch19_4 ,p_mouse_adc_read_start 000d c0670317 beq patch19_6 ,p_mouse_motion 000e c0680220 beq patch1a_0 ,p_mouse_seting_dpi -000f c0688375 beq patch1a_1 ,p_mouse_check_key_gpio -0010 c06983c3 beq patch1a_3 ,p_mouse_init_sunt -0011 c06a035b beq patch1a_4 ,p_mouse_sensor_poweron +000f c0688378 beq patch1a_1 ,p_mouse_check_key_gpio +0010 c06983c6 beq patch1a_3 ,p_mouse_init_sunt +0011 c06a035e beq patch1a_4 ,p_mouse_sensor_poweron 0012 c06b018d beq patch1a_6 ,p_mouse_priority_bb_event 0013 c06c826e beq patch1b_1 ,p_mouse_bb_event_timer 0014 c06d02bc beq patch1b_2 ,p_mouse_start_discovery -0015 c06f03ab beq patch1b_6 ,p_mouse_idle +0015 c06f03ae beq patch1b_6 ,p_mouse_idle 0016 c07402c9 beq patch1d_0 ,p_hid_rx_process 0017 2020137c branch loop @@ -168,11 +168,11 @@ 0087 20400090 call p_mouse_setting_config 0088 204041a7 call mouse_init_sunt 0089 20758000 rtn wake -008a 20400361 call p_mouse_dpi_config +008a 20400364 call p_mouse_dpi_config 008b 20403d8a call mouse_usb_check_enable 008c 20404728 call mouse_drawing_optima_init 008d 204000a0 call p_mouse_cb_fuction -008e 2040036d call p_mouse_sensor_powerdown +008e 20400370 call p_mouse_sensor_powerdown 008f 20203bc9 branch mouse_init + 8 p_mouse_setting_config: @@ -282,7 +282,7 @@ 00e1 67e0cba4 store 1 ,mem_mouse_search_dongle_action 00e2 6fe14bbc fetch 2 ,mem_mouse_24g_search_dongle_time_init 00e3 67e14ab2 store 2 ,mem_mouse_no_data_timer -00e4 2020036d branch p_mouse_sensor_powerdown +00e4 20200370 branch p_mouse_sensor_powerdown p_mouse_24g_search_dongle_success: 00e5 6fe0c8a7 fetch 1 ,mem_24g_abort_pac @@ -293,7 +293,7 @@ 00ea 793ffe00 set0 g24_disconn_state ,pdata 00eb 67e0cba4 store 1 ,mem_mouse_search_dongle_action 00ec 20404544 call mouse_no_data_timer_init -00ed 202003c5 branch p_mouse_init_sensor_wakeup +00ed 202003c8 branch p_mouse_init_sensor_wakeup p_g24_transmit_no_interrupt: 00ee 20402631 call g24_txdata_prep @@ -338,7 +338,7 @@ 010b 20600000 rtn p_mouse_wakeup_24g_from_long_sleep: -010c 204003c5 call p_mouse_init_sensor_wakeup +010c 204003c8 call p_mouse_init_sensor_wakeup 010d 6fe44bab fetch mouse_flag_len ,mem_mouse_flag 010e c41e0000 rtnbit0 mouse_enable_wheel_wake_up_cancel @@ -375,8 +375,8 @@ 0126 58000006 setarg pan_reg_config 0127 20405b0d call twspi_read 0128 c281be23 bbit1 3 ,mouse_app_enter_hibernate + 3 -0129 20400366 call p_mouse_sensor_reset -012a 2040036d call p_mouse_sensor_powerdown +0129 20400369 call p_mouse_sensor_reset +012a 20400370 call p_mouse_sensor_powerdown 012b 20203e23 branch mouse_app_enter_hibernate + 3 p_mouse_om16_enter_hibernate: @@ -466,7 +466,7 @@ 016f 58000000 setarg 0 0170 67e3c8d0 store 7 ,mem_mouse_key 0171 704be101 jam 1 ,mem_sensor_shutdown_flag -0172 2040036d call p_mouse_sensor_powerdown +0172 20400370 call p_mouse_sensor_powerdown 0173 20200179 branch p_g24_long_sleep p_g24_nodata_transmit: @@ -1032,9 +1032,9 @@ 0317 78547c00 disable user 0318 58000000 setarg 0 0319 67e348d1 store 6 ,mem_mouse_x -031a 2040032a call p_mouse_check_sensor_data -031b 20400361 call p_mouse_dpi_config -031c 204003e4 call p_mouse_sensor_data_mul +031a 2040032d call p_mouse_check_sensor_data +031b 20400326 call p_mouse_dpi_config_after_check_sensor_data +031c 204003e7 call p_mouse_sensor_data_mul 031d 20403f7e call mouse_zwheel 031e 20403f83 call mouse_t_zwheel 031f 204040dc call mouse_key @@ -1042,335 +1042,340 @@ 0321 1fe17e1f and_into 0x1f ,pdata 0322 67e0c8d0 store 1 ,mem_mouse_key 0323 24344728 nbranch mouse_drawing_optima_init ,user -0324 20400326 call p_mouse_drawing_optima +0324 20400329 call p_mouse_drawing_optima 0325 20204544 branch mouse_no_data_timer_init -p_mouse_drawing_optima: +p_mouse_dpi_config_after_check_sensor_data: 0326 6fe0c927 fetch 1 ,mem_config_sensor_type -0327 c1018000 rtneq p3212 -0328 c1068000 rtneq om18 -0329 2020471a branch mouse_drawing_optima +0327 c1068000 rtneq om18 +0328 20200364 branch p_mouse_dpi_config + +p_mouse_drawing_optima: +0329 6fe0c927 fetch 1 ,mem_config_sensor_type +032a c1018000 rtneq p3212 +032b c1068000 rtneq om18 +032c 2020471a branch mouse_drawing_optima p_mouse_check_sensor_data: -032a 6fe0c927 fetch 1 ,mem_config_sensor_type -032b c006832d beq om18 ,p_mouse_om18_sensor_motion -032c 20204240 branch mouse_check_sensor_data +032d 6fe0c927 fetch 1 ,mem_config_sensor_type +032e c0068330 beq om18 ,p_mouse_om18_sensor_motion +032f 20204240 branch mouse_check_sensor_data p_mouse_om18_sensor_motion: -032d 204042c4 call mouse_clear_sensor_data -032e 6fe0c911 fetch 1 ,mem_sensor_motion_gpio -032f c07f8333 beq gpio_disable ,p_mouse_om18_sensor_motion_skip_motion_pin -0330 6848c911 fetcht 1 ,mem_sensor_motion_gpio -0331 20406059 call gpio_get_bit -0332 24608000 nrtn true +0330 204042c4 call mouse_clear_sensor_data +0331 6fe0c911 fetch 1 ,mem_sensor_motion_gpio +0332 c07f8336 beq gpio_disable ,p_mouse_om18_sensor_motion_skip_motion_pin +0333 6848c911 fetcht 1 ,mem_sensor_motion_gpio +0334 20406059 call gpio_get_bit +0335 24608000 nrtn true p_mouse_om18_sensor_motion_skip_motion_pin: -0333 58000000 setarg pan_reg_pid_l -0334 20405b0d call twspi_read -0335 c08c41b2 bne om18_id ,mouse_twspi_reset -0336 58000002 setarg pan_reg_motion_staus +0336 58000000 setarg pan_reg_pid_l 0337 20405b0d call twspi_read -0338 c4038000 rtnbit0 7 -0339 204042db call mouse_read_sensor_common -033a 2040428c call mouse_read_3212sensor_xy_high -033b 67e0c8d7 store 1 ,mem_mouse_xy_h -033c 1ff1fe00 rshift4 pdata ,pdata -033d 204042d7 call mouse_data_extsign_bit3 -033e 67e0c8d2 store 1 ,mem_mouse_x + 1 -033f 6fe0c8d7 fetch 1 ,mem_mouse_xy_h -0340 1fe17e0f and pdata ,0x0f ,pdata -0341 204042d7 call mouse_data_extsign_bit3 -0342 67e0c8d4 store 1 ,mem_mouse_y + 1 -0343 6fe0c928 fetch 1 ,mem_config_sensor_angle -0344 c0000349 beq mouse_6clk_angle ,p_mouse_motion_6clk_direction_dispose -0345 c0008350 beq mouse_9clk_angle ,p_mouse_motion_9clk_direction_dispose -0346 c0010355 beq mouse_12clk_angle ,p_mouse_motion_12clk_direction_dispose -0347 c0018356 beq mouse_3clk_angle ,p_mouse_motion_3clk_direction_dispose -0348 20600000 rtn +0338 c08c41b2 bne om18_id ,mouse_twspi_reset +0339 58000002 setarg pan_reg_motion_staus +033a 20405b0d call twspi_read +033b c4038000 rtnbit0 7 +033c 204042db call mouse_read_sensor_common +033d 2040428c call mouse_read_3212sensor_xy_high +033e 67e0c8d7 store 1 ,mem_mouse_xy_h +033f 1ff1fe00 rshift4 pdata ,pdata +0340 204042d7 call mouse_data_extsign_bit3 +0341 67e0c8d2 store 1 ,mem_mouse_x + 1 +0342 6fe0c8d7 fetch 1 ,mem_mouse_xy_h +0343 1fe17e0f and pdata ,0x0f ,pdata +0344 204042d7 call mouse_data_extsign_bit3 +0345 67e0c8d4 store 1 ,mem_mouse_y + 1 +0346 6fe0c928 fetch 1 ,mem_config_sensor_angle +0347 c000034c beq mouse_6clk_angle ,p_mouse_motion_6clk_direction_dispose +0348 c0008353 beq mouse_9clk_angle ,p_mouse_motion_9clk_direction_dispose +0349 c0010358 beq mouse_12clk_angle ,p_mouse_motion_12clk_direction_dispose +034a c0018359 beq mouse_3clk_angle ,p_mouse_motion_3clk_direction_dispose +034b 20600000 rtn p_mouse_motion_6clk_direction_dispose: -0349 6fe148d1 fetch 2 ,mem_mouse_x -034a 1fe67e00 sub pdata ,0 ,pdata -034b 67e148d1 store 2 ,mem_mouse_x -034c 6fe148d3 fetch 2 ,mem_mouse_y +034c 6fe148d1 fetch 2 ,mem_mouse_x 034d 1fe67e00 sub pdata ,0 ,pdata -034e 67e148d3 store 2 ,mem_mouse_y -034f 20207e54 branch enable_user +034e 67e148d1 store 2 ,mem_mouse_x +034f 6fe148d3 fetch 2 ,mem_mouse_y +0350 1fe67e00 sub pdata ,0 ,pdata +0351 67e148d3 store 2 ,mem_mouse_y +0352 20207e54 branch enable_user p_mouse_motion_9clk_direction_dispose: -0350 204042bf call mouse_sensor_data_swap_places -0351 6fe148d1 fetch 2 ,mem_mouse_x -0352 1fe67e00 sub pdata ,0 ,pdata -0353 67e148d1 store 2 ,mem_mouse_x -0354 20207e54 branch enable_user +0353 204042bf call mouse_sensor_data_swap_places +0354 6fe148d1 fetch 2 ,mem_mouse_x +0355 1fe67e00 sub pdata ,0 ,pdata +0356 67e148d1 store 2 ,mem_mouse_x +0357 20207e54 branch enable_user p_mouse_motion_12clk_direction_dispose: -0355 20207e54 branch enable_user +0358 20207e54 branch enable_user p_mouse_motion_3clk_direction_dispose: -0356 204042bf call mouse_sensor_data_swap_places -0357 6fe148d3 fetch 2 ,mem_mouse_y -0358 1fe67e00 sub pdata ,0 ,pdata -0359 67e148d3 store 2 ,mem_mouse_y -035a 20207e54 branch enable_user +0359 204042bf call mouse_sensor_data_swap_places +035a 6fe148d3 fetch 2 ,mem_mouse_y +035b 1fe67e00 sub pdata ,0 ,pdata +035c 67e148d3 store 2 ,mem_mouse_y +035d 20207e54 branch enable_user p_mouse_sensor_poweron: -035b 20403f65 call mouse_sensor_spi_init -035c 6fe0c927 fetch 1 ,mem_config_sensor_type -035d c0058362 beq ka8g2 ,p_mouse_ka8g2_sensor_init -035e 20404232 call mouse_sensor_reset -035f da604aa3 arg mem_sensor_poweron_init ,regc -0360 2040422b call mouse_sensor_wr_seq +035e 20403f65 call mouse_sensor_spi_init +035f 6fe0c927 fetch 1 ,mem_config_sensor_type +0360 c0058365 beq ka8g2 ,p_mouse_ka8g2_sensor_init +0361 20404232 call mouse_sensor_reset +0362 da604aa3 arg mem_sensor_poweron_init ,regc +0363 2040422b call mouse_sensor_wr_seq p_mouse_dpi_config: -0361 20200222 branch p_mouse_seting_sensor_type +0364 20200222 branch p_mouse_seting_sensor_type p_mouse_ka8g2_sensor_init: -0362 20400369 call p_mouse_ka8g2_sensor_reset -0363 da604be3 arg mem_ka8g2_sensor_poweron_init ,regc -0364 2040422b call mouse_sensor_wr_seq -0365 20200361 branch p_mouse_dpi_config +0365 2040036c call p_mouse_ka8g2_sensor_reset +0366 da604be3 arg mem_ka8g2_sensor_poweron_init ,regc +0367 2040422b call mouse_sensor_wr_seq +0368 20200364 branch p_mouse_dpi_config p_mouse_sensor_reset: -0366 6fe0c927 fetch 1 ,mem_config_sensor_type -0367 c0058369 beq ka8g2 ,p_mouse_ka8g2_sensor_reset -0368 20204232 branch mouse_sensor_reset +0369 6fe0c927 fetch 1 ,mem_config_sensor_type +036a c005836c beq ka8g2 ,p_mouse_ka8g2_sensor_reset +036b 20204232 branch mouse_sensor_reset p_mouse_ka8g2_sensor_reset: -0369 58009706 setarg 0x9706 -036a 20405b0c call twspi_write -036b 20002ee0 nop 12000 -036c 20600000 rtn +036c 58009706 setarg 0x9706 +036d 20405b0c call twspi_write +036e 20002ee0 nop 12000 +036f 20600000 rtn p_mouse_sensor_powerdown: -036d 204041a7 call mouse_init_sunt -036e 20403f65 call mouse_sensor_spi_init -036f 6fe0c927 fetch 1 ,mem_config_sensor_type -0370 c0058373 beq ka8g2 ,p_mouse_ka8g2_sensor_powerdown -0371 58000806 setarg 0x0806 -0372 20205b0c branch twspi_write +0370 204041a7 call mouse_init_sunt +0371 20403f65 call mouse_sensor_spi_init +0372 6fe0c927 fetch 1 ,mem_config_sensor_type +0373 c0058376 beq ka8g2 ,p_mouse_ka8g2_sensor_powerdown +0374 58000806 setarg 0x0806 +0375 20205b0c branch twspi_write p_mouse_ka8g2_sensor_powerdown: -0373 58001f06 setarg 0x1f06 -0374 20205b0c branch twspi_write +0376 58001f06 setarg 0x1f06 +0377 20205b0c branch twspi_write p_mouse_check_key_gpio: -0375 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag -0376 245a4121 ncall mouse_check_key_gpio_once ,blank -0377 da200000 arg 0 ,rega -0378 2040037e call p_mouse_check_lkey_gpio -0379 20400383 call p_mouse_check_rkey_gpio -037a 20400388 call p_mouse_check_mkey_gpio -037b 2040038d call p_mouse_check_bkkey_gpio -037c 2040039a call p_mouse_check_fwkey_gpio -037d 2020411e branch mouse_check_key_gpio_next +0378 6fe0cbe1 fetch 1 ,mem_sensor_shutdown_flag +0379 245a4121 ncall mouse_check_key_gpio_once ,blank +037a da200000 arg 0 ,rega +037b 20400381 call p_mouse_check_lkey_gpio +037c 20400386 call p_mouse_check_rkey_gpio +037d 2040038b call p_mouse_check_mkey_gpio +037e 20400390 call p_mouse_check_bkkey_gpio +037f 2040039d call p_mouse_check_fwkey_gpio +0380 2020411e branch mouse_check_key_gpio_next p_mouse_check_lkey_gpio: -037e 6fe0c918 fetch 1 ,mem_lbutton_gpio -037f 204003a7 call p_mouse_gpio_config_output_high -0380 20404124 call mouse_check_lkey_gpio -0381 6848c918 fetcht 1 ,mem_lbutton_gpio -0382 20203f56 branch mouse_gpio_config_input_pu +0381 6fe0c918 fetch 1 ,mem_lbutton_gpio +0382 204003aa call p_mouse_gpio_config_output_high +0383 20404124 call mouse_check_lkey_gpio +0384 6848c918 fetcht 1 ,mem_lbutton_gpio +0385 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_rkey_gpio: -0383 6fe0c919 fetch 1 ,mem_rbutton_gpio -0384 204003a7 call p_mouse_gpio_config_output_high -0385 2040412a call mouse_check_rkey_gpio -0386 6848c919 fetcht 1 ,mem_rbutton_gpio -0387 20203f56 branch mouse_gpio_config_input_pu +0386 6fe0c919 fetch 1 ,mem_rbutton_gpio +0387 204003aa call p_mouse_gpio_config_output_high +0388 2040412a call mouse_check_rkey_gpio +0389 6848c919 fetcht 1 ,mem_rbutton_gpio +038a 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_mkey_gpio: -0388 6fe0c91a fetch 1 ,mem_mbutton_gpio -0389 204003a7 call p_mouse_gpio_config_output_high -038a 20404130 call mouse_check_mkey_gpio -038b 6848c91a fetcht 1 ,mem_mbutton_gpio -038c 20203f56 branch mouse_gpio_config_input_pu +038b 6fe0c91a fetch 1 ,mem_mbutton_gpio +038c 204003aa call p_mouse_gpio_config_output_high +038d 20404130 call mouse_check_mkey_gpio +038e 6848c91a fetcht 1 ,mem_mbutton_gpio +038f 20203f56 branch mouse_gpio_config_input_pu p_mouse_check_bkkey_gpio: -038d 6fe0c90d fetch 1 ,mem_bk_button_gpio -038e c17f8000 rtneq gpio_disable -038f 704b9603 jam mouse_bk_key ,mem_mouse_key_temp -0390 6fe0cb91 fetch 1 ,mem_mouse_bkkey_press_status -0391 1fe22600 copy pdata ,regc -0392 6848c90d fetcht 1 ,mem_bk_button_gpio -0393 6fe0c910 fetch 1 ,mem_matrix_public_gpio -0394 c07f8396 beq gpio_disable ,p_mouse_3io6key_bk_check -0395 2020413e branch mouse_check_bkkey_gpio_next +0390 6fe0c90d fetch 1 ,mem_bk_button_gpio +0391 c17f8000 rtneq gpio_disable +0392 704b9603 jam mouse_bk_key ,mem_mouse_key_temp +0393 6fe0cb91 fetch 1 ,mem_mouse_bkkey_press_status +0394 1fe22600 copy pdata ,regc +0395 6848c90d fetcht 1 ,mem_bk_button_gpio +0396 6fe0c910 fetch 1 ,mem_matrix_public_gpio +0397 c07f8399 beq gpio_disable ,p_mouse_3io6key_bk_check +0398 2020413e branch mouse_check_bkkey_gpio_next p_mouse_3io6key_bk_check: -0396 6fe0c90d fetch 1 ,mem_bk_button_gpio -0397 204003a9 call p_mouse_gpio_config_output_low -0398 6848c90d fetcht 1 ,mem_bk_button_gpio -0399 2020414b branch mouse_3io6key_bk_check +0399 6fe0c90d fetch 1 ,mem_bk_button_gpio +039a 204003ac call p_mouse_gpio_config_output_low +039b 6848c90d fetcht 1 ,mem_bk_button_gpio +039c 2020414b branch mouse_3io6key_bk_check p_mouse_check_fwkey_gpio: -039a 6fe0c90e fetch 1 ,mem_fw_button_gpio -039b c17f8000 rtneq gpio_disable -039c 704b9604 jam mouse_fw_key ,mem_mouse_key_temp -039d 6fe0cb92 fetch 1 ,mem_mouse_fwkey_press_status -039e 1fe22600 copy pdata ,regc -039f 6848c90e fetcht 1 ,mem_fw_button_gpio -03a0 6fe0c910 fetch 1 ,mem_matrix_public_gpio -03a1 c07f83a3 beq gpio_disable ,p_mouse_3io6key_fw_check -03a2 20204157 branch mouse_check_fwkey_gpio_next +039d 6fe0c90e fetch 1 ,mem_fw_button_gpio +039e c17f8000 rtneq gpio_disable +039f 704b9604 jam mouse_fw_key ,mem_mouse_key_temp +03a0 6fe0cb92 fetch 1 ,mem_mouse_fwkey_press_status +03a1 1fe22600 copy pdata ,regc +03a2 6848c90e fetcht 1 ,mem_fw_button_gpio +03a3 6fe0c910 fetch 1 ,mem_matrix_public_gpio +03a4 c07f83a6 beq gpio_disable ,p_mouse_3io6key_fw_check +03a5 20204157 branch mouse_check_fwkey_gpio_next p_mouse_3io6key_fw_check: -03a3 6fe0c90e fetch 1 ,mem_fw_button_gpio -03a4 204003a9 call p_mouse_gpio_config_output_low -03a5 6848c90e fetcht 1 ,mem_fw_button_gpio -03a6 20204164 branch mouse_3io6key_fw_check +03a6 6fe0c90e fetch 1 ,mem_fw_button_gpio +03a7 204003ac call p_mouse_gpio_config_output_low +03a8 6848c90e fetcht 1 ,mem_fw_button_gpio +03a9 20204164 branch mouse_3io6key_fw_check p_mouse_gpio_config_output_high: -03a7 d840003f arg gpcfg_output_high ,temp -03a8 20206093 branch gpio_config_function_int +03aa d840003f arg gpcfg_output_high ,temp +03ab 20206093 branch gpio_config_function_int p_mouse_gpio_config_output_low: -03a9 d840003e arg gpcfg_output_low ,temp -03aa 20206093 branch gpio_config_function_int +03ac d840003e arg gpcfg_output_low ,temp +03ad 20206093 branch gpio_config_function_int p_mouse_idle: -03ab 20404990 call mouse_low_voltage_led_no_enter_lpm -03ac 20407936 call ui_check_paring_button -03ad 204003af call p_mouse_dpi_check -03ae 2020464f branch mouse_idle + 4 +03ae 20404990 call mouse_low_voltage_led_no_enter_lpm +03af 20407936 call ui_check_paring_button +03b0 204003b2 call p_mouse_dpi_check +03b1 2020464f branch mouse_idle + 4 p_mouse_dpi_check: -03af 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -03b0 c2974036 bbit1 mouse_enable_dpi_key_connect_adc ,mouse_dpi_check_connect_adc -03b1 6fe0c90f fetch 1 ,mem_dpi_button_gpio -03b2 c17f8000 rtneq gpio_disable -03b3 da200000 arg 0 ,rega -03b4 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp -03b5 6848c90f fetcht 1 ,mem_dpi_button_gpio -03b6 204003b8 call p_mouse_dpi_key_check -03b7 2020402f branch mouse_dpi_check_next +03b2 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +03b3 c2974036 bbit1 mouse_enable_dpi_key_connect_adc ,mouse_dpi_check_connect_adc +03b4 6fe0c90f fetch 1 ,mem_dpi_button_gpio +03b5 c17f8000 rtneq gpio_disable +03b6 da200000 arg 0 ,rega +03b7 704b9605 jam mouse_dpi_key ,mem_mouse_key_temp +03b8 6848c90f fetcht 1 ,mem_dpi_button_gpio +03b9 204003bb call p_mouse_dpi_key_check +03ba 2020402f branch mouse_dpi_check_next p_mouse_dpi_key_check: -03b8 6fe44bab fetch mouse_flag_len ,mem_mouse_flag -03b9 c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd -03ba 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status -03bb 1fe22600 copy pdata ,regc -03bc 6fe0c910 fetch 1 ,mem_matrix_public_gpio -03bd c07f83bf beq gpio_disable ,p_mouse_3io6key_dpi_check -03be 2020403f branch mouse_dpi_key_check_next +03bb 6fe44bab fetch mouse_flag_len ,mem_mouse_flag +03bc c2964048 bbit1 mouse_enable_dpi_key_connect_gnd ,mouse_dpi_key_connect_gnd +03bd 6fe0cb93 fetch 1 ,mem_mouse_dpikey_press_status +03be 1fe22600 copy pdata ,regc +03bf 6fe0c910 fetch 1 ,mem_matrix_public_gpio +03c0 c07f83c2 beq gpio_disable ,p_mouse_3io6key_dpi_check +03c1 2020403f branch mouse_dpi_key_check_next p_mouse_3io6key_dpi_check: -03bf 6fe0c90f fetch 1 ,mem_dpi_button_gpio -03c0 204003a9 call p_mouse_gpio_config_output_low -03c1 6848c90f fetcht 1 ,mem_dpi_button_gpio -03c2 20204195 branch mouse_3io6key_check +03c2 6fe0c90f fetch 1 ,mem_dpi_button_gpio +03c3 204003ac call p_mouse_gpio_config_output_low +03c4 6848c90f fetcht 1 ,mem_dpi_button_gpio +03c5 20204195 branch mouse_3io6key_check p_mouse_init_sunt: -03c3 20403f65 call mouse_sensor_spi_init -03c4 20758000 rtn wake +03c6 20403f65 call mouse_sensor_spi_init +03c7 20758000 rtn wake p_mouse_init_sensor_wakeup: -03c5 20404236 call mouse_sensor_poweron +03c8 20404236 call mouse_sensor_poweron p_mouse_init_sensor: -03c6 204041b5 call mouse_read_sensor_id -03c7 c01803ce beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge -03c8 c018c217 beq p3065_id1 ,mouse_init_p3065 -03c9 c02c4220 beq pka8g2_id1 ,mouse_ka8g2_id2_judge -03ca c00c03da beq om18_id ,p_mouse_om18_init_param -03cb 204041b2 call mouse_twspi_reset -03cc 20001af4 nop 6900 -03cd 202003c6 branch p_mouse_init_sensor +03c9 204041b5 call mouse_read_sensor_id +03ca c01803d1 beq p32xx_id1 ,p_mouse_init_p32xx_id2_judge +03cb c018c217 beq p3065_id1 ,mouse_init_p3065 +03cc c02c4220 beq pka8g2_id1 ,mouse_ka8g2_id2_judge +03cd c00c03dd beq om18_id ,p_mouse_om18_init_param +03ce 204041b2 call mouse_twspi_reset +03cf 20001af4 nop 6900 +03d0 202003c9 branch p_mouse_init_sensor p_mouse_init_p32xx_id2_judge: -03ce 6fe0c9c2 fetch 1 ,mem_sensor_id2 -03cf c02903d8 beq om16_id2 ,p_mouse_om16_init_param -03d0 c06883d2 beq p3205_tj3t_id2 ,p_mouse_3205_3t_init_param -03d1 202041bd branch mouse_init_p32xx_id2_judge + 1 +03d1 6fe0c9c2 fetch 1 ,mem_sensor_id2 +03d2 c02903db beq om16_id2 ,p_mouse_om16_init_param +03d3 c06883d5 beq p3205_tj3t_id2 ,p_mouse_3205_3t_init_param +03d4 202041bd branch mouse_init_p32xx_id2_judge + 1 p_mouse_3205_3t_init_param: -03d2 58000049 setarg 0x49 -03d3 20405b0d call twspi_read -03d4 c05083d6 beq 0xa1 ,p_mouse_s201x_init_param -03d5 202041da branch mouse_3205_3t_init_param +03d5 58000049 setarg 0x49 +03d6 20405b0d call twspi_read +03d7 c05083d9 beq 0xa1 ,p_mouse_s201x_init_param +03d8 202041da branch mouse_3205_3t_init_param p_mouse_s201x_init_param: -03d6 7049270e jam s201x ,mem_config_sensor_type -03d7 20600000 rtn +03d9 7049270e jam s201x ,mem_config_sensor_type +03da 20600000 rtn p_mouse_om16_init_param: -03d8 7049270c jam om16 ,mem_config_sensor_type -03d9 202046ee branch mouse_dpi_4level_enable +03db 7049270c jam om16 ,mem_config_sensor_type +03dc 202046ee branch mouse_dpi_4level_enable p_mouse_om18_init_param: -03da 7049270d jam om18 ,mem_config_sensor_type -03db 58008006 setarg 0x8006 -03dc 20405b0c call twspi_write -03dd 204003e2 call p_delay_15ms -03de da604bf7 arg mem_sensor_om18_init ,regc -03df 2040422b call mouse_sensor_wr_seq -03e0 204046ee call mouse_dpi_4level_enable -03e1 20200222 branch p_mouse_seting_sensor_type +03dd 7049270d jam om18 ,mem_config_sensor_type +03de 58008006 setarg 0x8006 +03df 20405b0c call twspi_write +03e0 204003e5 call p_delay_15ms +03e1 da604bf7 arg mem_sensor_om18_init ,regc +03e2 2040422b call mouse_sensor_wr_seq +03e3 204046ee call mouse_dpi_4level_enable +03e4 20200222 branch p_mouse_seting_sensor_type p_delay_15ms: -03e2 df20000f arg 15 ,loopcnt -03e3 20207d13 branch delay_ms_wait +03e5 df20000f arg 15 ,loopcnt +03e6 20207d13 branch delay_ms_wait p_mouse_sensor_data_mul: -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 +03e7 6fe0c927 fetch 1 ,mem_config_sensor_type +03e8 c1860000 rtnne om16 +03e9 6fe0c992 fetch 1 ,mem_mouse_dpi +03ea c00083ec beq mouse_dpi_level2 ,p_mouse_sensor_data_set +03eb 20600000 rtn p_mouse_sensor_data_set: -03e9 58000204 setarg 0x0204 -03ea 67e14bed store 2 ,mem_mouse_xy_date_times -03eb 204003fc call p_mouse_sensor_data_set_x +03ec 58000204 setarg 0x0204 +03ed 67e14bed store 2 ,mem_mouse_xy_date_times +03ee 204003ff call p_mouse_sensor_data_set_x p_mouse_sensor_data_set_y: -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: -03f1 204003f4 call p_mouse_sensor_data_set_reverse +03ef 6fe0c8d3 fetch 1 ,mem_mouse_y +03f0 c28383f4 bbit1 7 ,p_mouse_sensor_data_set_y_next +03f1 20400407 call p_mouse_sensor_data_set_next 03f2 67e0c8d3 store 1 ,mem_mouse_y 03f3 20600000 rtn +p_mouse_sensor_data_set_y_next: +03f4 204003f7 call p_mouse_sensor_data_set_reverse +03f5 67e0c8d3 store 1 ,mem_mouse_y +03f6 20600000 rtn + p_mouse_sensor_data_set_reverse: -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 +03f7 1fe20400 copy pdata ,temp +03f8 dfe00100 arg 0x100 ,pdata +03f9 98467e00 isub temp ,pdata +03fa 20400407 call p_mouse_sensor_data_set_next +03fb 1fe20400 copy pdata ,temp +03fc dfe00100 arg 0x100 ,pdata +03fd 98467e00 isub temp ,pdata +03fe 20600000 rtn p_mouse_sensor_data_set_x: -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: -0401 204003f4 call p_mouse_sensor_data_set_reverse +03ff 6fe0c8d1 fetch 1 ,mem_mouse_x +0400 c2838404 bbit1 7 ,p_mouse_sensor_data_set_x_next +0401 20400407 call p_mouse_sensor_data_set_next 0402 67e0c8d1 store 1 ,mem_mouse_x 0403 20600000 rtn +p_mouse_sensor_data_set_x_next: +0404 204003f7 call p_mouse_sensor_data_set_reverse +0405 67e0c8d1 store 1 ,mem_mouse_x +0406 20600000 rtn + p_mouse_sensor_data_set_next: -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 +0407 6848cbed fetcht 1 ,mem_mouse_xy_date_times +0408 984ffe00 imul32 temp ,pdata +0409 6848cbee fetcht 1 ,mem_mouse_xy_date_times + 1 +040a 9846fc00 idiv temp +040b 20407def call wait_div_end +040c 1807fe00 quotient pdata +040d 1fe67c7f sub pdata ,0x7f ,null +040e 24210410 nbranch p_mouse_sensor_data_set_next2 ,positive +040f 20600000 rtn p_mouse_sensor_data_set_next2: -040d 5800007f setarg 0x7f -040e 20600000 rtn +0410 5800007f setarg 0x7f +0411 20600000 rtn org 0x800 start: Index: program/patch.prog =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_LRPair/program/patch.prog (revision 889) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_LRPair/program/patch.prog (working copy) @@ -1052,7 +1052,7 @@ setarg 0 store 6,mem_mouse_x call p_mouse_check_sensor_data - call p_mouse_dpi_config + call p_mouse_dpi_config_after_check_sensor_data call p_mouse_sensor_data_mul call mouse_zwheel call mouse_t_zwheel @@ -1064,6 +1064,11 @@ call p_mouse_drawing_optima branch mouse_no_data_timer_init +p_mouse_dpi_config_after_check_sensor_data: + fetch 1,mem_config_sensor_type + rtneq OM18 + branch p_mouse_dpi_config + p_mouse_drawing_optima: fetch 1,mem_config_sensor_type rtneq P3212 Index: sched/mouse.dat =================================================================== --- /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_LRPair/sched/mouse.dat (revision 889) +++ /YC1308AC/branch/mouse_project/XZR/mouse_public_xzr_branch/Only2.4G_LRPair/sched/mouse.dat (working copy) @@ -31,7 +31,7 @@ #bit3 MOUSE_ENABLE_WAKEUP_FROM_POWER #bit4 MOUSE_ENABLE_16M #bit5 MOUSE_ENABLE_USB -08 +18 #mouse flag byte3 #bit0 MOUSE_ENABLE_SPI2