max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

alps64: Change debouncing using timer count

Browse source
This commit is contained in:
tmk 2019-10-03 13:41:48 +09:00
parent 06c7ea297b
commit 1b581bc173
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
keyboard/alps64/matrix.c
View file

@ -25,13 +25,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "print.h" #include "print.h"
#include "debug.h" #include "debug.h"
#include "util.h" #include "util.h"
#include "timer.h"
#include "matrix.h" #include "matrix.h"
#ifndef DEBOUNCE #ifndef DEBOUNCE
# define DEBOUNCE 5 # define DEBOUNCE 5
#endif #endif
static uint8_t debouncing = DEBOUNCE; static bool debouncing = false;
static uint16_t debouncing_time = 0;
/* matrix state(1:on, 0:off) */ /* matrix state(1:on, 0:off) */
static matrix_row_t matrix[MATRIX_ROWS]; static matrix_row_t matrix[MATRIX_ROWS];
@ -70,26 +72,24 @@ uint8_t matrix_scan(void)
{ {
for (uint8_t i = 0; i < MATRIX_ROWS; i++) { for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
select_row(i); select_row(i);
_delay_us(30); // without this wait read unstable value. _delay_us(1); // delay for settling
matrix_row_t cols = read_cols(); matrix_row_t cols = read_cols();
if (matrix_debouncing[i] != cols) { if (matrix_debouncing[i] != cols) {
matrix_debouncing[i] = cols;
if (debouncing) { if (debouncing) {
debug("bounce!: "); debug_hex(debouncing); debug("\n"); dprintf("bounce: %d %d@%02X\n", timer_elapsed(debouncing_time), i, matrix_debouncing[i]^cols);
} }
debouncing = DEBOUNCE; matrix_debouncing[i] = cols;
debouncing = true;
debouncing_time = timer_read();
} }
unselect_rows(); unselect_rows();
} }
if (debouncing) { if (debouncing && timer_elapsed(debouncing_time) >= DEBOUNCE) {
if (--debouncing) { for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
_delay_ms(1); matrix[i] = matrix_debouncing[i];
} else {
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
matrix[i] = matrix_debouncing[i];
}
} }
debouncing = false;
} }
return 1; return 1;