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

adb_usb: Fix mouse init and debug print

Browse source
This commit is contained in:
tmk 2020-02-04 14:52:00 +09:00
parent 3b7bf1f6e0
commit a4abe50f18
1 changed files with 21 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
converter/adb_usb/matrix.c
View file

@ -39,7 +39,7 @@ static bool has_media_keys = false;
static bool is_iso_layout = false; static bool is_iso_layout = false;
#if ADB_MOUSE_ENABLE #if ADB_MOUSE_ENABLE
#define dmprintf(fmt, ...) do { if (debug_mouse) xprintf(fmt, ##__VA_ARGS__); } while (0) #define dmprintf(fmt, ...) do { /* if (debug_mouse) */ xprintf("M:" fmt, ##__VA_ARGS__); } while (0)
static uint16_t mouse_cpi = 100; static uint16_t mouse_cpi = 100;
static void mouse_init(uint8_t addr); static void mouse_init(uint8_t addr);
#endif #endif
@ -108,20 +108,6 @@ void matrix_init(void)
// lower byte: device handler 00000011 // lower byte: device handler 00000011
adb_host_listen(ADB_ADDR_KEYBOARD, ADB_REG_3, ADB_ADDR_KEYBOARD, ADB_HANDLER_EXTENDED_KEYBOARD); adb_host_listen(ADB_ADDR_KEYBOARD, ADB_REG_3, ADB_ADDR_KEYBOARD, ADB_HANDLER_EXTENDED_KEYBOARD);
//
// Mouse
//
// https://developer.apple.com/library/archive/technotes/hw/hw_01.html#Extended
#ifdef ADB_MOUSE_ENABLE
xprintf("\nMouse:\n");
// Check device on addr3
mouse_init(ADB_ADDR_MOUSE);
#endif
device_scan();
// initialize matrix state: all keys off // initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00; for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
@ -140,9 +126,10 @@ static void mouse_init(uint8_t orig_addr)
uint8_t addr; uint8_t addr;
again: again:
// Move to tmp address 15 to setup mouse function
mouse_handler = (reg3 = adb_host_talk(orig_addr, ADB_REG_3)) & 0xFF; mouse_handler = (reg3 = adb_host_talk(orig_addr, ADB_REG_3)) & 0xFF;
if (!reg3) return; if (!reg3) return;
dmprintf("addr%d reg3: %02X\n", orig_addr, reg3); dmprintf("addr%d reg3: %04X\n", orig_addr, reg3);
// Move device to tmp address // Move device to tmp address
adb_host_flush(orig_addr); adb_host_flush(orig_addr);
@ -155,10 +142,10 @@ again:
goto again; goto again;
} }
addr = ADB_ADDR_TMP; addr = ADB_ADDR_TMP;
dmprintf("addr%d reg3: %02X\n", addr, reg3);
detect_again: detect_again:
// Try to escalate into extended/classic2 protocol
if (mouse_handler == ADB_HANDLER_CLASSIC1_MOUSE || mouse_handler == ADB_HANDLER_CLASSIC2_MOUSE) { if (mouse_handler == ADB_HANDLER_CLASSIC1_MOUSE || mouse_handler == ADB_HANDLER_CLASSIC2_MOUSE) {
adb_host_flush(addr); adb_host_flush(addr);
adb_host_listen(addr, ADB_REG_3, (reg3 >> 8), ADB_HANDLER_EXTENDED_MOUSE); adb_host_listen(addr, ADB_REG_3, (reg3 >> 8), ADB_HANDLER_EXTENDED_MOUSE);
@ -172,15 +159,20 @@ detect_again:
mouse_handler = (reg3 = adb_host_talk(addr, ADB_REG_3)) & 0xFF; mouse_handler = (reg3 = adb_host_talk(addr, ADB_REG_3)) & 0xFF;
} }
dmprintf("addr%d reg3: %04X\n", addr, reg3);
if (mouse_handler == ADB_HANDLER_CLASSIC1_MOUSE) { }
xprintf("Classic 100cpi\n");
mouse_cpi = 100; // Classic Protocol 100cpi
} if (mouse_handler == ADB_HANDLER_CLASSIC1_MOUSE) {
if (mouse_handler == ADB_HANDLER_CLASSIC2_MOUSE) { xprintf("Classic 100cpi\n");
xprintf("Classic 200cpi\n"); mouse_cpi = 100;
mouse_cpi = 200; }
}
// Classic Protocol 200cpi
if (mouse_handler == ADB_HANDLER_CLASSIC2_MOUSE) {
xprintf("Classic 200cpi\n");
mouse_cpi = 200;
} }
// Extended Mouse Protocol // Extended Mouse Protocol
@ -225,6 +217,7 @@ detect_again:
} }
} }
// Kensington Turbo Mouse 5: setup
if (mouse_handler == ADB_HANDLER_TURBO_MOUSE) { if (mouse_handler == ADB_HANDLER_TURBO_MOUSE) {
xprintf("TM5: ext\n"); xprintf("TM5: ext\n");
@ -241,7 +234,7 @@ detect_again:
} }
// Move all mouses to a address after init to be polled // Move to address 10 for mouse polling
adb_host_flush(addr); adb_host_flush(addr);
adb_host_listen(addr, ADB_REG_3, ((reg3 >> 8) & 0xF0) | ADB_ADDR_MOUSE_POLL, 0xFE); adb_host_listen(addr, ADB_REG_3, ((reg3 >> 8) & 0xF0) | ADB_ADDR_MOUSE_POLL, 0xFE);
adb_host_flush(ADB_ADDR_MOUSE_POLL); adb_host_flush(ADB_ADDR_MOUSE_POLL);
@ -253,9 +246,6 @@ detect_again:
} }
goto again; goto again;
// dmprintf("handler: %d\n", mouse_handler);
// dmprintf("cpi: %d\n", mouse_cpi);
} }
#ifdef MAX #ifdef MAX
@ -305,6 +295,7 @@ void adb_mouse_task(void)
mouseacc = 1; mouseacc = 1;
return; return;
}; };
dmprintf("[%02X %02X %02X %02X %02X]\n", buf[0], buf[1], buf[2], buf[3], buf[4]);
// Store off-buttons and 0-movements in unused bytes // Store off-buttons and 0-movements in unused bytes
bool xneg = false; bool xneg = false;
@ -351,12 +342,7 @@ void adb_mouse_task(void)
mouse_report.x = -MAX(-MAX(x, -127), -127); mouse_report.x = -MAX(-MAX(x, -127), -127);
mouse_report.y = -MAX(-MAX(y, -127), -127); mouse_report.y = -MAX(-MAX(y, -127), -127);
if (debug_mouse) { dmprintf("[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: [");
for (int8_t i = 0; i < len; i++) xprintf("%02X ", buf[i]);
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);
}
// Send result by usb. // Send result by usb.
host_mouse_send(&mouse_report); host_mouse_send(&mouse_report);