diff options
Diffstat (limited to 'keyboard/gh60')
| -rw-r--r-- | keyboard/gh60/matrix.c | 44 |
1 files changed, 17 insertions, 27 deletions
diff --git a/keyboard/gh60/matrix.c b/keyboard/gh60/matrix.c index 09a051aa6..3ba6801fb 100644 --- a/keyboard/gh60/matrix.c +++ b/keyboard/gh60/matrix.c @@ -34,13 +34,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. static uint8_t debouncing = DEBOUNCE; /* matrix state(1:on, 0:off) */ -static uint16_t *matrix; -static uint16_t *matrix_debouncing; -static uint16_t matrix0[MATRIX_ROWS]; -static uint16_t matrix1[MATRIX_ROWS]; -static bool is_modified; +static matrix_row_t *matrix; +static matrix_row_t *matrix_debouncing; +static matrix_row_t matrix0[MATRIX_ROWS]; +static matrix_row_t matrix1[MATRIX_ROWS]; -static uint16_t read_cols(void); +static matrix_row_t read_cols(void); static void init_cols(void); static void unselect_rows(void); static void select_row(uint8_t row); @@ -71,36 +70,32 @@ void matrix_init(void) matrix[i] = 0; matrix_debouncing[i] = 0; } - is_modified = false; } uint8_t matrix_scan(void) { for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - //unselect_rows(); select_row(i); _delay_us(30); // without this wait read unstable value. - uint16_t cols = read_cols(); + matrix_row_t cols = read_cols(); if (matrix_debouncing[i] != cols) { matrix_debouncing[i] = cols; if (debouncing) { debug("bounce!: "); debug_hex(debouncing); debug("\n"); } debouncing = DEBOUNCE; - is_modified = false; } unselect_rows(); } - //unselect_rows(); if (debouncing) { - debouncing--; - _delay_ms(1); - } else { - uint16_t *tmp = matrix; - matrix = matrix_debouncing; - matrix_debouncing = tmp; - is_modified = true; + if (--debouncing) { + _delay_ms(1); + } else { + matrix_row_t *tmp = matrix; + matrix = matrix_debouncing; + matrix_debouncing = tmp; + } } return 1; @@ -108,13 +103,8 @@ uint8_t matrix_scan(void) bool matrix_is_modified(void) { - return is_modified; -} - -inline -bool matrix_has_ghost(void) -{ - return false; + if (debouncing) return false; + return true; } inline @@ -124,7 +114,7 @@ bool matrix_is_on(uint8_t row, uint8_t col) } inline -uint16_t matrix_get_row(uint8_t row) +matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; } @@ -167,7 +157,7 @@ static void init_cols(void) PORTB |= (1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0); } -static uint16_t read_cols(void) +static matrix_row_t read_cols(void) { return (PINF&(1<<0) ? 0 : (1<<0)) | (PINF&(1<<1) ? 0 : (1<<1)) | |