X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=inline;f=converter%2Fadb_usb%2Fmatrix.c;h=566592c93f7a83270835d51beeae83c420d09dda;hb=e93188021c0b1578ffbb6e0fadcd94e1e5132dcf;hp=18e71aa49786aca2c06ce4d848995b87675d867f;hpb=fce750a1767ed86e0967eacf075a9cd59cbf306c;p=max%2Ftmk_keyboard.git
diff --git a/converter/adb_usb/matrix.c b/converter/adb_usb/matrix.c
index 18e71aa4..566592c9 100644
--- a/converter/adb_usb/matrix.c
+++ b/converter/adb_usb/matrix.c
@@ -25,8 +25,6 @@ along with this program. If not, see .
#include "print.h"
#include "util.h"
#include "debug.h"
-#include "host.h"
-#include "led.h"
#include "adb.h"
#include "matrix.h"
@@ -38,8 +36,6 @@ along with this program. If not, see .
# error "MATRIX_ROWS must not exceed 255"
#endif
-#define ADB_CAPS_UP (ADB_CAPS | 0x80)
-
static bool is_modified = false;
@@ -75,7 +71,6 @@ void matrix_init(void)
// 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;
@@ -90,6 +85,7 @@ uint8_t matrix_scan(void)
uint8_t key0, key1;
is_modified = false;
+ _delay_ms(16); // delay for preventing overload of poor ADB keyboard controller
codes = adb_host_kbd_recv();
key0 = codes>>8;
key1 = codes&0xFF;
@@ -98,12 +94,6 @@ uint8_t matrix_scan(void)
print("adb_host_kbd_recv: "); phex16(codes); print("\n");
}
-#ifdef MATRIX_HAS_LOCKING_CAPS
- // Send Caps key up event
- if (matrix_is_on(MATRIX_ROW(ADB_CAPS), MATRIX_COL(ADB_CAPS))) {
- register_key(ADB_CAPS_UP);
- }
-#endif
if (codes == 0) { // no keys
return 0;
} else if (codes == 0x7F7F) { // power key press
@@ -111,28 +101,9 @@ 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(%02X)\n", codes);
return key1;
} else {
-#ifdef MATRIX_HAS_LOCKING_CAPS
- if (host_keyboard_leds() & (1<