X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fmacway%2Fmatrix.c;h=3d10b304d477ecb8f8614794fef20dd11aa22325;hb=3ee5f565ae98cc68b6dff24225b6f8f069f6e20d;hp=0f57bfeae70e870bd5da48387ff56f0fe847021e;hpb=b78c654693014c60ced089648c29f46939d23437;p=max%2Ftmk_keyboard.git
diff --git a/keyboard/macway/matrix.c b/keyboard/macway/matrix.c
index 0f57bfea..3d10b304 100644
--- a/keyboard/macway/matrix.c
+++ b/keyboard/macway/matrix.c
@@ -28,29 +28,19 @@ along with this program. If not, see .
#include "matrix.h"
-#if (MATRIX_COLS > 16)
-# error "MATRIX_COLS must not exceed 16"
-#endif
-#if (MATRIX_ROWS > 255)
-# error "MATRIX_ROWS must not exceed 255"
-#endif
-
-
#ifndef DEBOUNCE
# define DEBOUNCE 5
#endif
static uint8_t debouncing = DEBOUNCE;
-// matrix state buffer(1:on, 0:off)
-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];
+/* matrix state(1:on, 0:off) */
+static matrix_row_t matrix[MATRIX_ROWS];
+static matrix_row_t matrix_debouncing[MATRIX_ROWS];
#ifdef MATRIX_HAS_GHOST
static bool matrix_has_ghost_in_row(uint8_t row);
#endif
-static matrix_row_t read_col(void);
+static matrix_row_t read_cols(void);
static void unselect_rows(void);
static void select_row(uint8_t row);
@@ -77,36 +67,34 @@ void matrix_init(void)
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
- matrix0[i] = 0;
- matrix1[i] = 0;
+ matrix[i] = 0;
+ matrix_debouncing[i] = 0;
}
- matrix = matrix0;
- matrix_debouncing = matrix1;
}
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.
- if (matrix[i] != read_col()) {
- matrix[i] = read_col();
+ matrix_row_t cols = read_cols();
+ if (matrix_debouncing[i] != cols) {
+ matrix_debouncing[i] = cols;
if (debouncing) {
- debug("bounce!: "); debug_hex(debouncing); print("\n");
+ debug("bounce!: "); debug_hex(debouncing); debug("\n");
}
debouncing = DEBOUNCE;
}
+ unselect_rows();
}
- unselect_rows();
if (debouncing) {
if (--debouncing) {
_delay_ms(1);
} else {
- matrix_row_t *tmp = matrix;
- matrix = matrix_debouncing;
- matrix_debouncing = tmp;
+ for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+ matrix[i] = matrix_debouncing[i];
+ }
}
}
@@ -123,7 +111,7 @@ bool matrix_is_modified(void)
inline
bool matrix_is_on(uint8_t row, uint8_t col)
{
- return (matrix[row] & (1<