1
0
Fork 0

Fix debouncing and add legacy keymap support

This commit is contained in:
tmk 2013-03-12 16:05:50 +09:00
parent c4ab832be0
commit 30f9baf898
10 changed files with 127 additions and 165 deletions

View file

@ -26,8 +26,8 @@ static uint8_t debouncing = DEBOUNCE;
// bit array of key state(1:on, 0:off)
static matrix_row_t *matrix;
static matrix_row_t *matrix_debounced;
static matrix_row_t _matrix0[MATRIX_ROWS];
static matrix_row_t _matrix1[MATRIX_ROWS];
static matrix_row_t matrix0[MATRIX_ROWS];
static matrix_row_t matrix1[MATRIX_ROWS];
#define _DDRA (uint8_t *const)&DDRA
@ -164,20 +164,16 @@ void matrix_init(void)
setup_leds();
// initialize matrix state: all keys off
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_debounced = _matrix1;
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
matrix0[i] = 0;
matrix1[i] = 0;
}
matrix = matrix0;
matrix_debounced = matrix1;
}
uint8_t matrix_scan(void)
{
if (!debouncing) {
matrix_row_t *tmp = matrix_debounced;
matrix_debounced = matrix;
matrix = tmp;
}
for (uint8_t col = 0; col < MATRIX_COLS; col++) { // 0-16
pull_column(col); // output hi on theline
_delay_us(3); // without this wait it won't read stable value.
@ -196,7 +192,13 @@ uint8_t matrix_scan(void)
}
if (debouncing) {
debouncing--;
if (--debouncing) {
_delay_ms(1);
} else {
matrix_row_t *tmp = matrix_debounced;
matrix_debounced = matrix;
matrix = tmp;
}
}
return 1;
@ -208,12 +210,6 @@ bool matrix_is_modified(void)
return true;
}
inline
bool matrix_has_ghost(void)
{
return false;
}
inline
bool matrix_is_on(uint8_t row, uint8_t col)
{