From 07b6c1a58c8ccfd6e5d5bc57e34f6c44c24841a8 Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 3 Dec 2012 15:08:23 +0900 Subject: [PATCH] Fix debug pirnt and magic key.(M0110) --- converter/m0110_usb/README.md | 2 +- converter/m0110_usb/config.h | 5 +++-- converter/m0110_usb/matrix.c | 7 ------- protocol/m0110.c | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/converter/m0110_usb/README.md b/converter/m0110_usb/README.md index 0ad3631f7..059b840c3 100644 --- a/converter/m0110_usb/README.md +++ b/converter/m0110_usb/README.md @@ -28,7 +28,7 @@ In this pic: 3. `DATA`(Green) 4. `+5V`(Yellow) -Not that wire colors may vary in your cable. +Note that wire colors may vary in your cable. ### Pinout diff --git a/converter/m0110_usb/config.h b/converter/m0110_usb/config.h index d2e904077..b1b971ec9 100644 --- a/converter/m0110_usb/config.h +++ b/converter/m0110_usb/config.h @@ -36,9 +36,10 @@ along with this program. If not, see . /* Locking Caps Lock support */ //#define MATRIX_HAS_LOCKING_CAPS -/* key combination for command */ +/* Backspace for command key */ +#define BACKSPACE_CODE 0x33 #define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_LGUI)) \ + matrix_is_on((BACKSPACE_CODE>>3)&0x0F, BACKSPACE_CODE&0x07) \ ) diff --git a/converter/m0110_usb/matrix.c b/converter/m0110_usb/matrix.c index 1ca6894c4..c71a4874c 100644 --- a/converter/m0110_usb/matrix.c +++ b/converter/m0110_usb/matrix.c @@ -60,13 +60,6 @@ uint8_t matrix_cols(void) void matrix_init(void) { - print_enable = true; - debug_enable = true; - debug_matrix = false; - debug_keyboard = false; - debug_mouse = false; - print("debug enabled.\n"); - m0110_init(); // initialize matrix state: all keys off for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00; diff --git a/protocol/m0110.c b/protocol/m0110.c index a669c85a4..8bf7cfe4f 100644 --- a/protocol/m0110.c +++ b/protocol/m0110.c @@ -321,7 +321,7 @@ static inline uint8_t instant(void) m0110_send(M0110_INSTANT); uint8_t data = m0110_recv(); if (data != M0110_NULL) { - phex(data); print(" "); + debug_hex(data); debug(" "); } return data; }