X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=keyboard%2Fgh60%2Fmatrix.c;h=a61215152c94deec55e494ee7e389174d7ea9386;hb=3eeb7ca9f94e872606a1d14bf1639fbca95c6ab0;hp=6ded8158ff460be2df5d38a41588b12abf3dc111;hpb=8c80deb775ac151001dc1592a2e94e8677b49964;p=max%2Ftmk_keyboard.git
diff --git a/keyboard/gh60/matrix.c b/keyboard/gh60/matrix.c
index 6ded8158..a6121515 100644
--- a/keyboard/gh60/matrix.c
+++ b/keyboard/gh60/matrix.c
@@ -34,13 +34,10 @@ along with this program. If not, see .
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[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);
@@ -65,42 +62,36 @@ 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();
+ 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 {
+ for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+ matrix[i] = matrix_debouncing[i];
+ }
+ }
}
return 1;
@@ -108,30 +99,25 @@ 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
bool matrix_is_on(uint8_t row, uint8_t col)
{
- return (matrix[row] & (1<