X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=converter%2Fps2_usb%2Fmatrix.c;h=c441a89b0f1c19b258c6fa1984a939f0423c95ec;hb=eeb596b28351db5c3389127c0298b41d97eb459e;hp=aa0c38c68d56067094e1122364d8efdac334f8ba;hpb=9d26053f1c14da79336a64f800305660d1a71180;p=max%2Ftmk_keyboard.git
diff --git a/converter/ps2_usb/matrix.c b/converter/ps2_usb/matrix.c
index aa0c38c6..c441a89b 100644
--- a/converter/ps2_usb/matrix.c
+++ b/converter/ps2_usb/matrix.c
@@ -17,21 +17,18 @@ along with this program. If not, see .
#include
#include
-#include
-#include
#include "action.h"
#include "print.h"
#include "util.h"
#include "debug.h"
#include "ps2.h"
+#include "host.h"
+#include "led.h"
#include "matrix.h"
static void matrix_make(uint8_t code);
static void matrix_break(uint8_t code);
-#ifdef MATRIX_HAS_GHOST
-static bool matrix_has_ghost_in_row(uint8_t row);
-#endif
/*
@@ -70,20 +67,9 @@ static uint8_t matrix[MATRIX_ROWS];
static bool is_modified = false;
-inline
-uint8_t matrix_rows(void)
-{
- return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
- return MATRIX_COLS;
-}
-
void matrix_init(void)
{
+ debug_enable = true;
ps2_host_init();
// initialize matrix state: all keys off
@@ -187,6 +173,7 @@ uint8_t matrix_scan(void)
}
uint8_t code = ps2_host_recv();
+ if (code) xprintf("%i\r\n", code);
if (!ps2_error) {
switch (state) {
case INIT:
@@ -209,16 +196,24 @@ uint8_t matrix_scan(void)
state = INIT;
break;
case 0x00: // Overrun [3]p.25
- print("Overrun\n");
+ matrix_clear();
clear_keyboard();
+ print("Overrun\n");
+ state = INIT;
+ break;
+ case 0xAA: // Self-test passed
+ case 0xFC: // Self-test failed
+ printf("BAT %s\n", (code == 0xAA) ? "OK" : "NG");
+ led_set(host_keyboard_leds());
state = INIT;
break;
default: // normal key make
if (code < 0x80) {
matrix_make(code);
} else {
- xprintf("unexpected scan code at INIT: %02X\n", code);
+ matrix_clear();
clear_keyboard();
+ xprintf("unexpected scan code at INIT: %02X\n", code);
}
state = INIT;
}
@@ -239,8 +234,9 @@ uint8_t matrix_scan(void)
if (code < 0x80) {
matrix_make(code|0x80);
} else {
- xprintf("unexpected scan code at E0: %02X\n", code);
+ matrix_clear();
clear_keyboard();
+ xprintf("unexpected scan code at E0: %02X\n", code);
}
state = INIT;
}
@@ -255,12 +251,18 @@ uint8_t matrix_scan(void)
matrix_break(PRINT_SCREEN);
state = INIT;
break;
+ case 0xF0:
+ matrix_clear();
+ clear_keyboard();
+ xprintf("unexpected scan code at F0: F0(clear and cont.)\n");
+ break;
default:
if (code < 0x80) {
matrix_break(code);
} else {
- xprintf("unexpected scan code at F0: %02X\n", code);
+ matrix_clear();
clear_keyboard();
+ xprintf("unexpected scan code at F0: %02X\n", code);
}
state = INIT;
}
@@ -275,8 +277,9 @@ uint8_t matrix_scan(void)
if (code < 0x80) {
matrix_break(code|0x80);
} else {
- xprintf("unexpected scan code at E0_F0: %02X\n", code);
+ matrix_clear();
clear_keyboard();
+ xprintf("unexpected scan code at E0_F0: %02X\n", code);
}
state = INIT;
}
@@ -369,30 +372,16 @@ uint8_t matrix_scan(void)
}
}
- if (ps2_error > PS2_ERR_STARTBIT3) {
+ // TODO: request RESEND when error occurs?
+/*
+ if (PS2_IS_FAILED(ps2_error)) {
uint8_t ret = ps2_host_send(PS2_RESEND);
xprintf("Resend: %02X\n", ret);
}
+*/
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)
{
@@ -405,21 +394,6 @@ uint8_t matrix_get_row(uint8_t row)
return matrix[row];
}
-void matrix_print(void)
-{
- print("\nr/c 01234567\n");
- for (uint8_t row = 0; row < matrix_rows(); row++) {
- phex(row); print(": ");
- pbin_reverse(matrix_get_row(row));
-#ifdef MATRIX_HAS_GHOST
- if (matrix_has_ghost_in_row(row)) {
- print("