X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fadb_usb%2Fmatrix.c;h=83f460411122e21e77dc056dae00f419f3db2066;hb=965daf9dac5b8a7f09938b8cda07b7aac6916970;hp=6857e692ab93b2d6fe6cbc1afd749848b479c1bc;hpb=f43a2df7614503708818c258439d3a7c90d65e95;p=max%2Ftmk_keyboard.git
diff --git a/converter/adb_usb/matrix.c b/converter/adb_usb/matrix.c
index 6857e692..83f46041 100644
--- a/converter/adb_usb/matrix.c
+++ b/converter/adb_usb/matrix.c
@@ -29,55 +29,44 @@ along with this program. If not, see .
#include "matrix.h"
#include "report.h"
#include "host.h"
+#include "led.h"
-#if (MATRIX_COLS > 16)
-# error "MATRIX_COLS must not exceed 16"
-#endif
-#if (MATRIX_ROWS > 255)
-# error "MATRIX_ROWS must not exceed 255"
-#endif
+static bool has_media_keys = false;
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)
-static uint8_t matrix[MATRIX_ROWS];
-#else
-static uint16_t matrix[MATRIX_ROWS];
-#endif
+static matrix_row_t matrix[MATRIX_ROWS];
-#ifdef MATRIX_HAS_GHOST
-static bool matrix_has_ghost_in_row(uint8_t row);
-#endif
static void register_key(uint8_t key);
-inline
-uint8_t matrix_rows(void)
-{
- return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
- return MATRIX_COLS;
-}
-
void matrix_init(void)
{
+ // LED on
+ DDRD |= (1<<6); PORTD |= (1<<6);
+
adb_host_init();
// wait for keyboard to boot up and receive command
- _delay_ms(1000);
+ _delay_ms(2000);
+
+ // device scan
+ xprintf("Before init:\n");
+ for (uint8_t addr = 1; addr < 16; addr++) {
+ uint16_t reg3 = adb_host_talk(addr, ADB_REG_3);
+ if (reg3) {
+ xprintf("Scan: addr:%d, reg3:%04X\n", addr, reg3);
+ }
+ _delay_ms(20);
+ }
- // Determine ISO keyboard by handle id
+ // Determine ISO keyboard by handler 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) {
+ uint8_t handler_id = (uint8_t) adb_host_talk(ADB_ADDR_KEYBOARD, ADB_REG_3);
+ switch (handler_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:
@@ -88,29 +77,41 @@ void matrix_init(void)
break;
}
+ // Adjustable keyboard media keys: address=0x07 and handlerID=0x02
+ has_media_keys = (0x02 == (adb_host_talk(ADB_ADDR_APPLIANCE, ADB_REG_3) & 0xff));
+ if (has_media_keys) {
+ xprintf("Found: media keys\n");
+ }
+
// 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);
+ // Listen Register3
+ // upper byte: reserved bits 0000, keyboard address 0010
+ // lower byte: device handler 00000011
+ adb_host_listen(ADB_ADDR_KEYBOARD, ADB_REG_3, ADB_ADDR_KEYBOARD, ADB_HANDLER_EXTENDED_PROTOCOL);
+
+ // device scan
+ xprintf("After init:\n");
+ for (uint8_t addr = 1; addr < 16; addr++) {
+ uint16_t reg3 = adb_host_talk(addr, ADB_REG_3);
+ if (reg3) {
+ xprintf("Scan: addr:%d, reg3:%04X\n", addr, reg3);
+ }
+ _delay_ms(20);
+ }
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
+ led_set(host_keyboard_leds());
+
debug_enable = 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);
+ // LED off
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;
}
@@ -184,15 +185,56 @@ uint8_t matrix_scan(void)
uint16_t codes;
uint8_t key0, key1;
- is_modified = false;
-
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();
+ codes = adb_host_kbd_recv(ADB_ADDR_KEYBOARD);
+
+ // Adjustable keybaord media keys
+ if (codes == 0 && has_media_keys &&
+ (codes = adb_host_kbd_recv(ADB_ADDR_APPLIANCE))) {
+ // key1
+ switch (codes & 0x7f ) {
+ case 0x00: // Mic
+ codes = (codes & ~0x007f) | 0x42;
+ break;
+ case 0x01: // Mute
+ codes = (codes & ~0x007f) | 0x4a;
+ break;
+ case 0x02: // Volume down
+ codes = (codes & ~0x007f) | 0x49;
+ break;
+ case 0x03: // Volume Up
+ codes = (codes & ~0x007f) | 0x48;
+ break;
+ case 0x7F: // no code
+ break;
+ default:
+ xprintf("ERROR: media key1\n");
+ return 0x11;
+ }
+ // key0
+ switch ((codes >> 8) & 0x7f ) {
+ case 0x00: // Mic
+ codes = (codes & ~0x7f00) | (0x42 << 8);
+ break;
+ case 0x01: // Mute
+ codes = (codes & ~0x7f00) | (0x4a << 8);
+ break;
+ case 0x02: // Volume down
+ codes = (codes & ~0x7f00) | (0x49 << 8);
+ break;
+ case 0x03: // Volume Up
+ codes = (codes & ~0x7f00) | (0x48 << 8);
+ break;
+ default:
+ xprintf("ERROR: media key0\n");
+ return 0x10;
+ }
+ }
}
key0 = codes>>8;
key1 = codes&0xFF;
@@ -209,9 +251,12 @@ uint8_t matrix_scan(void)
register_key(0xFF);
} else if (key0 == 0xFF) { // error
xprintf("adb_host_kbd_recv: ERROR(%d)\n", codes);
+ // something wrong or plug-in
+ matrix_init();
return key1;
} else {
/* Swap codes for ISO keyboard
+ * https://github.com/tmk/tmk_keyboard/issues/35
*
* ANSI
* ,----------- ----------.
@@ -244,10 +289,10 @@ uint8_t matrix_scan(void)
* *c 0x2A 0x2A 0x31 0x31(or 0x32)
*/
if (is_iso_layout) {
- if (key0 == 0x32) {
- key0 = 0x0A;
- } else if (key0 == 0x0A) {
- key0 = 0x32;
+ if ((key0 & 0x7F) == 0x32) {
+ key0 = (key0 & 0x80) | 0x0A;
+ } else if ((key0 & 0x7F) == 0x0A) {
+ key0 = (key0 & 0x80) | 0x32;
}
}
register_key(key0);
@@ -258,93 +303,12 @@ uint8_t matrix_scan(void)
return 1;
}
-bool matrix_is_modified(void)
-{
- return is_modified;
-}
-
inline
-bool matrix_has_ghost(void)
-{
-#ifdef MATRIX_HAS_GHOST
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- if (matrix_has_ghost_in_row(i))
- return true;
- }
-#endif
- return false;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
- return (matrix[row] & (1<