diff options
| author | tmk <nobody@nowhere> | 2013-06-22 02:52:14 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-06-22 02:52:14 +0900 |
| commit | 2593ae132812414f02e7cf483bb141cd2c78595c (patch) | |
| tree | b2b158516bbdc71b2e63117be3d65f25776983ae /converter/x68k_usb/matrix.c | |
| parent | bebbe15562b45aeb911952b0765cd9c732d34306 (diff) | |
| parent | ff47a5613875a9cc719ef7f026d99bb637e662f0 (diff) | |
| download | firmware-2593ae132812414f02e7cf483bb141cd2c78595c.tar.gz firmware-2593ae132812414f02e7cf483bb141cd2c78595c.tar.bz2 firmware-2593ae132812414f02e7cf483bb141cd2c78595c.zip | |
Merge branch 'x68k_led'
Diffstat (limited to 'converter/x68k_usb/matrix.c')
| -rw-r--r-- | converter/x68k_usb/matrix.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/converter/x68k_usb/matrix.c b/converter/x68k_usb/matrix.c index 954e7ef12..2d5a1e116 100644 --- a/converter/x68k_usb/matrix.c +++ b/converter/x68k_usb/matrix.c @@ -21,8 +21,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <util/delay.h> #include "print.h" #include "util.h" -#include "x68k.h" +#include "serial.h" #include "matrix.h" +#include "debug.h" /* @@ -63,7 +64,7 @@ uint8_t matrix_cols(void) void matrix_init(void) { - x68k_init(); + serial_init(); // initialize matrix state: all keys off for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00; @@ -75,13 +76,13 @@ uint8_t matrix_scan(void) { is_modified = false; - uint8_t code; - code = x68k_recv(); - if (code == 0) { + uint16_t code; + code = serial_recv2(); + if (code == -1) { return 0; } - phex(code); print(" "); + dprintf("%02X\n", code); if (code&0x80) { // break code if (matrix_is_on(ROW(code), COL(code))) { |