From fd49c69d1a173b9d273b2b53eb6a22eda920223a Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 6 Jan 2011 15:18:55 +0900 Subject: added config option: MATRIX_HAS_GHOST and fixed some on matrix.c ADD: Build option: MATRIX_HAS_GHOST to enable ghost blocking logic. FIX: choose matrix buffer type(uint8_t/uint16_t) automatically depending on column size in matrix.c. FIX: use uint8_t insted of int in matrix.c. --- hhkb/matrix.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 85 insertions(+), 21 deletions(-) (limited to 'hhkb/matrix.c') diff --git a/hhkb/matrix.c b/hhkb/matrix.c index dd4440d9e..15633d53d 100644 --- a/hhkb/matrix.c +++ b/hhkb/matrix.c @@ -9,6 +9,33 @@ #include "util.h" #include "matrix_skel.h" + +#if (MATRIX_COLS > 16) +# error "MATRIX_COLS must not exceed 16" +#endif +#if (MATRIX_ROWS > 255) +# error "MATRIX_ROWS must not exceed 255" +#endif + + +// matrix state buffer(1:on, 0:off) +#if (MATRIX_COLS <= 8) +static uint8_t *matrix; +static uint8_t *matrix_prev; +static uint8_t _matrix0[MATRIX_ROWS]; +static uint8_t _matrix1[MATRIX_ROWS]; +#else +static uint16_t *matrix; +static uint16_t *matrix_prev; +static uint16_t _matrix0[MATRIX_ROWS]; +static uint16_t _matrix1[MATRIX_ROWS]; +#endif + +#ifdef MATRIX_HAS_GHOST +static bool matrix_has_ghost_in_row(uint8_t row); +#endif + + // matrix is active low. (key on: 0/key off: 1) // // HHKB has no ghost and no bounce. @@ -28,26 +55,19 @@ #define KEY_PREV_ON (PORTE |= (1<<7)) #define KEY_PREV_OFF (PORTE &= ~(1<<7)) -// matrix state buffer -static uint8_t *matrix; -static uint8_t *matrix_prev; -static uint8_t _matrix0[MATRIX_ROWS]; -static uint8_t _matrix1[MATRIX_ROWS]; - inline -int matrix_rows(void) +uint8_t matrix_rows(void) { return MATRIX_ROWS; } inline -int matrix_cols(void) +uint8_t matrix_cols(void) { return MATRIX_COLS; } -// this must be called once before matrix_scan. void matrix_init(void) { // row & col output(PB0-6) @@ -59,13 +79,13 @@ void matrix_init(void) PORTE = 0x40; // initialize matrix state: all keys off - for (int i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00; - for (int i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; + for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00; + for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; matrix = _matrix0; matrix_prev = _matrix1; } -int matrix_scan(void) +uint8_t matrix_scan(void) { uint8_t *tmp; @@ -73,8 +93,8 @@ int matrix_scan(void) matrix_prev = matrix; matrix = tmp; - for (int row = 0; row < MATRIX_ROWS; row++) { - for (int col = 0; col < MATRIX_COLS; col++) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { KEY_SELELCT(row, col); _delay_us(40); // from logic analyzer chart if (matrix_prev[row] & (1<