X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fgh60%2Fmatrix.c;h=451e541a4f3e1480652268ba400828c71d0612c5;hb=bb955a819af89e74843743e268aa7b4ceb06cc4e;hp=09a051aa666b037135f8a305c9b19d063f03f12b;hpb=48433a5e9988647a737234c11dd9db4080fd4a4e;p=max%2Ftmk_keyboard.git
diff --git a/keyboard/gh60/matrix.c b/keyboard/gh60/matrix.c
index 09a051aa..451e541a 100644
--- a/keyboard/gh60/matrix.c
+++ b/keyboard/gh60/matrix.c
@@ -25,39 +25,27 @@ along with this program. If not, see .
#include "print.h"
#include "debug.h"
#include "util.h"
+#include "timer.h"
#include "matrix.h"
#ifndef DEBOUNCE
# define DEBOUNCE 5
#endif
-static uint8_t debouncing = DEBOUNCE;
+static bool debouncing = false;
+static uint16_t debouncing_time = 0;
+
/* 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[MATRIX_ROWS];
+static matrix_row_t matrix_debouncing[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);
-inline
-uint8_t matrix_rows(void)
-{
- return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
- return MATRIX_COLS;
-}
-
void matrix_init(void)
{
// initialize row and col
@@ -65,92 +53,49 @@ void matrix_init(void)
init_cols();
// initialize matrix state: all keys off
- matrix = matrix0;
- matrix_debouncing = matrix1;
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
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();
+ _delay_us(1); // delay for settling
+ matrix_row_t cols = read_cols();
if (matrix_debouncing[i] != cols) {
- matrix_debouncing[i] = cols;
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;
- is_modified = false;
+ matrix_debouncing[i] = cols;
+ debouncing = true;
+ debouncing_time = timer_read();
}
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 && timer_elapsed(debouncing_time) >= DEBOUNCE) {
+ for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+ matrix[i] = matrix_debouncing[i];
+ }
+ debouncing = false;
}
return 1;
}
-bool matrix_is_modified(void)
-{
- return is_modified;
-}
-
inline
-bool matrix_has_ghost(void)
-{
- return false;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
- return (matrix[row] & ((matrix_row_t)1<