X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=converter%2Fps2_usb%2Fmatrix.c;h=c441a89b0f1c19b258c6fa1984a939f0423c95ec;hb=eeb596b28351db5c3389127c0298b41d97eb459e;hp=45cf2a4a90fa87e2305bf5622e26a4d2f6bba5b0;hpb=1a02ebcc612e9a9c0d87e02295c7258de3a70ccc;p=max%2Ftmk_keyboard.git
diff --git a/converter/ps2_usb/matrix.c b/converter/ps2_usb/matrix.c
index 45cf2a4a..c441a89b 100644
--- a/converter/ps2_usb/matrix.c
+++ b/converter/ps2_usb/matrix.c
@@ -22,15 +22,13 @@ along with this program. If not, see .
#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);
-static void matrix_clear(void);
-#ifdef MATRIX_HAS_GHOST
-static bool matrix_has_ghost_in_row(uint8_t row);
-#endif
/*
@@ -69,18 +67,6 @@ 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;
@@ -215,6 +201,12 @@ uint8_t matrix_scan(void)
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);
@@ -390,23 +382,6 @@ 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)
{
@@ -419,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("