max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adb_usb: Change mouse acceleration according to cpi

Browse source
This commit is contained in:
tmk 2019-06-22 11:00:08 +09:00
parent 814eaa2dff
commit 35da7a8d70
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
converter/adb_usb/matrix.c
View file

@ -38,6 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
static bool has_media_keys = false; static bool has_media_keys = false;
static bool is_iso_layout = false; static bool is_iso_layout = false;
static uint8_t mouse_handler = ADB_HANDLER_CLASSIC1_MOUSE; static uint8_t mouse_handler = ADB_HANDLER_CLASSIC1_MOUSE;
static uint16_t mouse_cpi = 100;
// matrix state buffer(1:on, 0:off) // matrix state buffer(1:on, 0:off)
static matrix_row_t matrix[MATRIX_ROWS]; static matrix_row_t matrix[MATRIX_ROWS];
@ -115,6 +116,9 @@ void matrix_init(void)
mouse_handler = adb_host_talk(ADB_ADDR_MOUSE, ADB_REG_3) & 0xff; mouse_handler = adb_host_talk(ADB_ADDR_MOUSE, ADB_REG_3) & 0xff;
mouse_handler = mouse_handler ? mouse_handler : ADB_HANDLER_CLASSIC1_MOUSE; mouse_handler = mouse_handler ? mouse_handler : ADB_HANDLER_CLASSIC1_MOUSE;
if (mouse_handler == ADB_HANDLER_CLASSIC1_MOUSE) { mouse_cpi = 100; }
if (mouse_handler == ADB_HANDLER_CLASSIC2_MOUSE) { mouse_cpi = 200; }
// Extended Mouse Protocol // Extended Mouse Protocol
if (mouse_handler == ADB_HANDLER_EXTENDED_MOUSE) { if (mouse_handler == ADB_HANDLER_EXTENDED_MOUSE) {
// Device info format(reg1 8-byte data) // Device info format(reg1 8-byte data)
@ -131,6 +135,12 @@ void matrix_init(void)
xprintf("]\n"); xprintf("]\n");
} }
if (len > 5) {
mouse_cpi = (buf[4]<<8) | buf[5];
} else {
mouse_cpi = 100;
}
// Kensington Turbo Mouse 5 // Kensington Turbo Mouse 5
if (len == 8 && buf[0] == 0x4B && buf[1] == 0x4D && buf[2] == 0x4C && buf[3] == 0x31) { if (len == 8 && buf[0] == 0x4B && buf[1] == 0x4D && buf[2] == 0x4C && buf[3] == 0x31) {
xprintf("Turbo Mouse 5\n"); xprintf("Turbo Mouse 5\n");
@ -156,6 +166,7 @@ void matrix_init(void)
mouse_handler = adb_host_talk(ADB_ADDR_MOUSE, ADB_REG_3) & 0xff; mouse_handler = adb_host_talk(ADB_ADDR_MOUSE, ADB_REG_3) & 0xff;
mouse_handler = mouse_handler ? mouse_handler : ADB_HANDLER_CLASSIC1_MOUSE; mouse_handler = mouse_handler ? mouse_handler : ADB_HANDLER_CLASSIC1_MOUSE;
xprintf("handler: %d\n", mouse_handler); xprintf("handler: %d\n", mouse_handler);
xprintf("cpi: %d\n", mouse_cpi);
#endif #endif
@ -272,19 +283,18 @@ void adb_mouse_task(void)
mouse_report.y = -MAX(-MAX(y, -127), -127); mouse_report.y = -MAX(-MAX(y, -127), -127);
if (debug_mouse) { if (debug_mouse) {
xprintf("Mouse raw: ["); xprintf("Mouse: [");
for (int8_t i = 0; i < len; i++) xprintf("%02X ", buf[i]); for (int8_t i = 0; i < len; i++) xprintf("%02X ", buf[i]);
xprintf("]\n"); xprintf("] ");
xprintf("[B:%02X, X:%d(%d), Y:%d(%d), A:%d]\n", mouse_report.buttons, mouse_report.x, xx, mouse_report.y, yy, mouseacc);
xprintf("Mouse info[");
xprintf("B:%02X, X:%d(%d), Y:%d(%d), A:%d]\n", buttons, x, xx, y, yy, mouseacc);
} }
// Send result by usb. // Send result by usb.
host_mouse_send(&mouse_report); host_mouse_send(&mouse_report);
// TODO: acceleration curve is needed for precise operation?
// increase acceleration of mouse // increase acceleration of mouse
mouseacc += ( mouseacc < ADB_MOUSE_MAXACC ? 1 : 0 ); mouseacc += ( mouseacc < (mouse_cpi < 200 ? ADB_MOUSE_MAXACC : ADB_MOUSE_MAXACC/2) ? 1 : 0 );
return; return;
} }