diff options
author | tmk <nobody@nowhere> | 2011-01-06 15:18:55 +0900 |
---|---|---|
committer | tmk <nobody@nowhere> | 2011-01-06 15:33:08 +0900 |
commit | fd49c69d1a173b9d273b2b53eb6a22eda920223a (patch) | |
tree | 46c6a012a5ecba881fbd78ad7ccb9051e493340e /hhkb/matrix.c | |
parent | 590235d4bc92d1de4c17b96ae54f4daee8c3db2a (diff) |
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.
Diffstat (limited to 'hhkb/matrix.c')
-rw-r--r-- | hhkb/matrix.c | 106 |
1 files changed, 85 insertions, 21 deletions
diff --git a/hhkb/matrix.c b/hhkb/matrix.c index dd4440d9e3..15633d53da 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<<col)) { @@ -98,7 +118,7 @@ int matrix_scan(void) bool matrix_is_modified(void) { - for (int i = 0; i < MATRIX_ROWS; i++) { + for (uint8_t i = 0; i < MATRIX_ROWS; i++) { if (matrix[i] != matrix_prev[i]) return true; } @@ -108,36 +128,80 @@ bool matrix_is_modified(void) inline bool matrix_has_ghost(void) { +#ifdef MATRIX_HAS_GHOST + for (uint8_t i = 0; i < MATRIX_ROWS; i++) { + if (matrix_has_ghost_in_row(i)) + return true; + } +#endif return false; } inline -bool matrix_is_on(int row, int col) +bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & (1<<col)); } inline -uint16_t matrix_get_row(int row) +#if (MATRIX_COLS <= 8) +uint8_t matrix_get_row(uint8_t row) +#else +uint16_t matrix_get_row(uint8_t row) +#endif { return matrix[row]; } void matrix_print(void) { +#if (MATRIX_COLS <= 8) print("\nr/c 01234567\n"); - for (int row = 0; row < matrix_rows(); row++) { +#else + print("\nr/c 0123456789ABCDEF\n"); +#endif + for (uint8_t row = 0; row < matrix_rows(); row++) { phex(row); print(": "); +#if (MATRIX_COLS <= 8) pbin_reverse(matrix_get_row(row)); +#else + pbin_reverse16(matrix_get_row(row)); +#endif +#ifdef MATRIX_HAS_GHOST + if (matrix_has_ghost_in_row(row)) { + print(" <ghost"); + } +#endif print("\n"); } } -int matrix_key_count(void) +uint8_t matrix_key_count(void) { - int count = 0; - for (int i = 0; i < MATRIX_ROWS; i++) { + uint8_t count = 0; + for (uint8_t i = 0; i < MATRIX_ROWS; i++) { +#if (MATRIX_COLS <= 8) count += bitpop(matrix[i]); +#else + count += bitpop16(matrix[i]); +#endif } return count; } + +#ifdef MATRIX_HAS_GHOST +inline +static bool matrix_has_ghost_in_row(uint8_t row) +{ + // no ghost exists in case less than 2 keys on + if (((matrix[row] - 1) & matrix[row]) == 0) + return false; + + // ghost exists in case same state as other row + for (uint8_t i=0; i < MATRIX_ROWS; i++) { + if (i != row && (matrix[i] & matrix[row]) == matrix[row]) + return true; + } + return false; +} +#endif |