Skip to content

Commit

Permalink
preonic/rev3_drop: Fix old custom matrix code (qmk#14857)
Browse files Browse the repository at this point in the history
The old custom matrix code for Preonic rev3 was relying on the
`matrix_col_t` type, because the code actually reads the row pins and
assembles the state for whole columns, and then transposes the matrix in
the custom debouncing code.  Restore that type (which is no longer
defined by the core QMK code) to make the custom matrix code work
properly (when `matrix_row_t` was used instead of `matrix_col_t`, the
state of two electrical rows was lost, and those electrical rows
corresponded to the bottom physical row, which did not work).
  • Loading branch information
sigprof authored and 0xcharly committed Oct 25, 2021
1 parent 0972995 commit 7f90594
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions keyboards/preonic/rev3_drop/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -66,15 +68,15 @@ 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();
}

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) {
Expand Down

0 comments on commit 7f90594

Please sign in to comment.