summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-18 00:10:09 +0000
committerQMK Bot <hello@qmk.fm>2021-10-18 00:10:09 +0000
commit1a63b24548cf0891621e54772320a5fec04186cb (patch)
tree3015bda6770e0cc41c26d5599f99ea8c24eea8c9 /keyboards
parentad2b017ee63ca3719ce1051b0878b7aba8fcbc92 (diff)
parent587f7508fca50b48578e61c8fb1e1972b56381e1 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/preonic/rev3_drop/matrix.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/keyboards/preonic/rev3_drop/matrix.c b/keyboards/preonic/rev3_drop/matrix.c
index 392997e0a5..07171a39e9 100644
--- a/keyboards/preonic/rev3_drop/matrix.c
+++ b/keyboards/preonic/rev3_drop/matrix.c
@@ -24,13 +24,15 @@
#include "debug.h"
#include "matrix.h"
+typedef uint16_t matrix_col_t;
+
/*
* col: { B11, B10, B2, B1, A7, B0 }
* row: { A10, A9, A8, B15, C13, C14, C15, A2 }
*/
/* matrix state(1:on, 0:off) */
static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_COLS];
+static matrix_col_t matrix_debouncing[MATRIX_COLS];
static bool debouncing = false;
static uint16_t debouncing_time = 0;
@@ -66,7 +68,7 @@ void matrix_init(void) {
palSetPadMode(GPIOA, 6, PAL_MODE_INPUT_PULLDOWN);
memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
- memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t));
+ memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_col_t));
matrix_init_quantum();
}
@@ -74,7 +76,7 @@ void matrix_init(void) {
uint8_t matrix_scan(void) {
// actual matrix
for (int col = 0; col < MATRIX_COLS; col++) {
- matrix_row_t data = 0;
+ matrix_col_t data = 0;
// strobe col { B11, B10, B2, B1, A7, B0 }
switch (col) {