X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fadb_usb%2Fmatrix.c;h=abcc0cc9c3c645615a5a72d5fb2090e1b4539dff;hb=3fe8e1c238fc8e15dacda1b03c0c1745a7b8e8e7;hp=9b26a2a18762955762017d4fb60dcbdddbbf41df;hpb=c4ab832be0f110a127b20e8df2b5223bceb8dcd1;p=max%2Ftmk_keyboard.git
diff --git a/converter/adb_usb/matrix.c b/converter/adb_usb/matrix.c
index 9b26a2a1..abcc0cc9 100644
--- a/converter/adb_usb/matrix.c
+++ b/converter/adb_usb/matrix.c
@@ -27,6 +27,8 @@ along with this program. If not, see .
#include "debug.h"
#include "adb.h"
#include "matrix.h"
+#include "report.h"
+#include "host.h"
#if (MATRIX_COLS > 16)
@@ -37,7 +39,9 @@ along with this program. If not, see .
#endif
+static bool is_iso_layout = false;
static bool is_modified = false;
+static report_mouse_t mouse_report = {};
// matrix state buffer(1:on, 0:off)
#if (MATRIX_COLS <= 8)
@@ -67,26 +71,129 @@ uint8_t matrix_cols(void)
void matrix_init(void)
{
adb_host_init();
+ // wait for keyboard to boot up and receive command
+ _delay_ms(1000);
+
+ // Determine ISO keyboard by handle id
+ // http://lxr.free-electrons.com/source/drivers/macintosh/adbhid.c?v=4.4#L815
+ uint16_t handle_id = adb_host_talk(ADB_ADDR_KEYBOARD, 3);
+ switch (handle_id) {
+ case 0x04: case 0x05: case 0x07: case 0x09: case 0x0D:
+ case 0x11: case 0x14: case 0x19: case 0x1D: case 0xC1:
+ case 0xC4: case 0xC7:
+ is_iso_layout = true;
+ break;
+ default:
+ is_iso_layout = false;
+ break;
+ }
+
+ // Enable keyboard left/right modifier distinction
+ // Addr:Keyboard(0010), Cmd:Listen(10), Register3(11)
+ // upper byte: reserved bits 0000, device address 0010
+ // lower byte: device handler 00000011
+ adb_host_listen(0x2B,0x02,0x03);
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
- print_enable = true;
debug_enable = true;
- debug_matrix = true;
- debug_keyboard = true;
- debug_mouse = true;
+ //debug_matrix = true;
+ //debug_keyboard = true;
+ //debug_mouse = true;
print("debug enabled.\n");
+
+ // LED flash
+ DDRD |= (1<<6); PORTD |= (1<<6);
+ _delay_ms(500);
+ DDRD |= (1<<6); PORTD &= ~(1<<6);
+
+ uint16_t handle_id2 = adb_host_talk(ADB_ADDR_KEYBOARD, 3);
+ xprintf("handle_id: %02X -> %02X\n", handle_id&0xff, handle_id2&0xff);
+
+ return;
+}
+
+#ifdef ADB_MOUSE_ENABLE
+
+#ifdef MAX
+#undef MAX
+#endif
+#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+
+void adb_mouse_task(void)
+{
+ uint16_t codes;
+ int16_t x, y;
+ static int8_t mouseacc;
+ _delay_ms(12); // delay for preventing overload of poor ADB keyboard controller
+ codes = adb_host_mouse_recv();
+ // If nothing received reset mouse acceleration, and quit.
+ if (!codes) {
+ mouseacc = 1;
+ return;
+ };
+ // Bit sixteen is button.
+ if (~codes & (1 << 15))
+ mouse_report.buttons |= MOUSE_BTN1;
+ if (codes & (1 << 15))
+ mouse_report.buttons &= ~MOUSE_BTN1;
+ // lower seven bits are movement, as signed int_7.
+ // low byte is X-axis, high byte is Y.
+ y = (codes>>8 & 0x3F);
+ x = (codes>>0 & 0x3F);
+ // bit seven and fifteen is negative
+ // usb does not use int_8, but int_7 (measuring distance) with sign-bit.
+ if (codes & (1 << 6))
+ x = (x-0x40);
+ if (codes & (1 << 14))
+ y = (y-0x40);
+ // Accelerate mouse. (They weren't meant to be used on screens larger than 320x200).
+ x *= mouseacc;
+ y *= mouseacc;
+ // Cap our two bytes per axis to one byte.
+ // Easier with a MIN-function, but since -MAX(-a,-b) = MIN(a,b)...
+ // I.E. MIN(MAX(x,-127),127) = -MAX(-MAX(x, -127), -127) = MIN(-MIN(-x,127),127)
+ mouse_report.x = -MAX(-MAX(x, -127), -127);
+ mouse_report.y = -MAX(-MAX(y, -127), -127);
+ if (debug_mouse) {
+ print("adb_host_mouse_recv: "); print_bin16(codes); print("\n");
+ print("adb_mouse raw: [");
+ phex(mouseacc); print(" ");
+ phex(mouse_report.buttons); print("|");
+ print_decs(mouse_report.x); print(" ");
+ print_decs(mouse_report.y); print("]\n");
+ }
+ // Send result by usb.
+ host_mouse_send(&mouse_report);
+ // increase acceleration of mouse
+ mouseacc += ( mouseacc < ADB_MOUSE_MAXACC ? 1 : 0 );
return;
}
+#endif
uint8_t matrix_scan(void)
{
+ /* extra_key is volatile and more convoluted than necessary because gcc refused
+ to generate valid code otherwise. Making extra_key uint8_t and constructing codes
+ here via codes = extra_key<<8 | 0xFF; would consistently fail to even LOAD
+ extra_key from memory, and leave garbage in the high byte of codes. I tried
+ dozens of code variations and it kept generating broken assembly output. So
+ beware if attempting to make extra_key code more logical and efficient. */
+ static volatile uint16_t extra_key = 0xFFFF;
uint16_t codes;
uint8_t key0, key1;
is_modified = false;
- codes = adb_host_kbd_recv();
+
+ codes = extra_key;
+ extra_key = 0xFFFF;
+
+ if ( codes == 0xFFFF )
+ {
+ _delay_ms(12); // delay for preventing overload of poor ADB keyboard controller
+ codes = adb_host_kbd_recv();
+ }
key0 = codes>>8;
key1 = codes&0xFF;
@@ -101,14 +208,53 @@ uint8_t matrix_scan(void)
} else if (codes == 0xFFFF) { // power key release
register_key(0xFF);
} else if (key0 == 0xFF) { // error
- if (debug_matrix) print("adb_host_kbd_recv: ERROR(matrix cleared.)\n");
- // clear matrix to unregister all keys
- for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
+ xprintf("adb_host_kbd_recv: ERROR(%d)\n", codes);
+ // something wrong or plug-in
+ matrix_init();
return key1;
} else {
+ /* Swap codes for ISO keyboard
+ *
+ * ANSI
+ * ,----------- ----------.
+ * | *a| 1| 2 =|Backspa|
+ * |----------- ----------|
+ * |Tab | Q| | ]| *c|
+ * |----------- ----------|
+ * |CapsLo| A| '|Return |
+ * |----------- ----------|
+ * |Shift | Shift |
+ * `----------- ----------'
+ *
+ * ISO
+ * ,----------- ----------.
+ * | *a| 1| 2 =|Backspa|
+ * |----------- ----------|
+ * |Tab | Q| | ]|Retur|
+ * |----------- -----` |
+ * |CapsLo| A| '| *c| |
+ * |----------- ----------|
+ * |Shif| *b| Shift |
+ * `----------- ----------'
+ *
+ * ADB scan code USB usage
+ * ------------- ---------
+ * Key ANSI ISO ANSI ISO
+ * ---------------------------------------------
+ * *a 0x32 0x0A 0x35 0x35
+ * *b ---- 0x32 ---- 0x64
+ * *c 0x2A 0x2A 0x31 0x31(or 0x32)
+ */
+ if (is_iso_layout) {
+ if (key0 == 0x32) {
+ key0 = 0x0A;
+ } else if (key0 == 0x0A) {
+ key0 = 0x32;
+ }
+ }
register_key(key0);
if (key1 != 0xFF) // key1 is 0xFF when no second key.
- register_key(key1);
+ extra_key = key1<<8 | 0xFF; // process in a separate call
}
return 1;