X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=converter%2Fsun_usb%2Fmatrix.c;h=3126bd33ca4b2bfcd3d3becff57c764d420226ae;hb=0b14b560063ac23de0132da9aae3cade68f7034e;hp=c1e98257d9876efaf082e251c9a24511e080fdc5;hpb=97ee1be59da06063275d315d1ea5fa4f14eee6b0;p=max%2Ftmk_keyboard.git
diff --git a/converter/sun_usb/matrix.c b/converter/sun_usb/matrix.c
index c1e98257..3126bd33 100644
--- a/converter/sun_usb/matrix.c
+++ b/converter/sun_usb/matrix.c
@@ -21,9 +21,9 @@ along with this program. If not, see .
#include
#include "print.h"
#include "util.h"
-#include "serial.h"
#include "matrix.h"
#include "debug.h"
+#include "protocol/serial.h"
/*
@@ -41,39 +41,6 @@ along with this program. If not, see .
* E|70 ... 77|
* F|78 ... 7F|
* +---------+
- *
- * Command From System To Keyboard
- * 0x01 Reset
- * 0x02 Bell On
- * 0x03 Bell Off
- * 0x0A Click On
- * 0x0B Click Off
- * 0x0E LED
- * 0x0F Layout
- *
- * Command From Keyboard To System
- * 0x7F Idle
- * 0xFE Layout Response
- * 0xFF Reset Response(followed by 0x04)
- *
- * bit: 3 2 1 0
- * LED: CapsLk ScrLk Compose NumLk
- *
- * Connector
- * 8Pin mini DIN
- * 8 7 6
- * 5 4 3
- * 2 1
- * receptacle
- *
- * 1: GND
- * 2: GND
- * 3: 5V
- * 4: RX/TX(Mouse)
- * 5: RX
- * 6: TX
- * 7: GND
- * 8: 5V
*/
static uint8_t matrix[MATRIX_ROWS];
#define ROW(code) ((code>>3)&0xF)
@@ -96,14 +63,30 @@ uint8_t matrix_cols(void)
void matrix_init(void)
{
- print_enable = true;
- 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");
return;
}
@@ -113,14 +96,37 @@ uint8_t matrix_scan(void)
uint8_t code;
code = serial_recv();
- if (code == 0) {
- return 0;
+ if (!code) return 0;
+
+ debug_hex(code); debug(" ");
+
+ switch (code) {
+ case 0xFF: // reset success: FF 04
+ print("reset: ");
+ _delay_ms(500);
+ 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;
+ return 0;
}
- phex(code); print("(");
- code = ~code;
- phex(code); print(")");
-return 0;
if (code&0x80) {
// break code
if (matrix_is_on(ROW(code), COL(code))) {