X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fsun_usb%2Fmatrix.c;h=0cea3700c6e185a8c413f554cc245eb2701f774b;hb=965daf9dac5b8a7f09938b8cda07b7aac6916970;hp=a61e3a2d3439a9245fb37b44005eb64f9ec9fb93;hpb=dcfae0beb5d601b1a9dc9e12974814558f854cef;p=max%2Ftmk_keyboard.git
diff --git a/converter/sun_usb/matrix.c b/converter/sun_usb/matrix.c
index a61e3a2d..0cea3700 100644
--- a/converter/sun_usb/matrix.c
+++ b/converter/sun_usb/matrix.c
@@ -24,6 +24,8 @@ along with this program. If not, see .
#include "matrix.h"
#include "debug.h"
#include "protocol/serial.h"
+#include "led.h"
+#include "host.h"
/*
@@ -46,37 +48,40 @@ static uint8_t matrix[MATRIX_ROWS];
#define ROW(code) ((code>>3)&0xF)
#define COL(code) (code&0x07)
-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;
+ DDRD |= (1<<6);
+ PORTD |= (1<<6);
+ //debug_enable = true;
serial_init();
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
+ // wait for keyboard coming up
+ // otherwise LED status update fails
+ print("Reseting ");
+ while (1) {
+ print(".");
+ while (serial_recv());
+ serial_send(0x01);
+ _delay_ms(500);
+ if (serial_recv() == 0xFF) {
+ _delay_ms(500);
+ if (serial_recv() == 0x04)
+ break;
+ }
+ }
+ print(" Done\n");
+
+ PORTD &= ~(1<<6);
return;
}
uint8_t matrix_scan(void)
{
- is_modified = false;
-
uint8_t code;
code = serial_recv();
if (!code) return 0;
@@ -84,15 +89,26 @@ uint8_t matrix_scan(void)
debug_hex(code); debug(" ");
switch (code) {
- case 0x7E: // reset fail
- case 0xFE: // layout
- case 0xFF: // reset success
+ case 0xFF: // reset success: FF 04
+ print("reset: ");
_delay_ms(500);
- // ignore response byte
- debug("(response ignored:");
- while ((code = serial_recv())) { debug(" "); debug_hex(code); }
- debug(") ");
- // FALL THROUGH
+ code = serial_recv();
+ xprintf("%02X\n", code);
+ if (code == 0x04) {
+ // LED status
+ led_set(host_keyboard_leds());
+ }
+ return 0;
+ case 0xFE: // layout: FE
+ print("layout: ");
+ _delay_ms(500);
+ xprintf("%02X\n", serial_recv());
+ return 0;
+ case 0x7E: // reset fail: 7E 01
+ print("reset fail: ");
+ _delay_ms(500);
+ xprintf("%02X\n", serial_recv());
+ return 0;
case 0x7F:
// all keys up
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
@@ -103,56 +119,18 @@ uint8_t matrix_scan(void)
// break code
if (matrix_is_on(ROW(code), COL(code))) {
matrix[ROW(code)] &= ~(1<