From c79bc7c9094b7bed26450e85040df6ef91239aed Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 22 Jul 2021 04:28:58 +1000 Subject: Fix MATRIX_COLS for peranekofactory/tone (#13632) --- keyboards/peranekofactory/tone/rev1/config.h | 12 +++--------- keyboards/peranekofactory/tone/rev2/config.h | 9 ++------- 2 files changed, 5 insertions(+), 16 deletions(-) (limited to 'keyboards') diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h index 22658c9c78..54a59ed551 100644 --- a/keyboards/peranekofactory/tone/rev1/config.h +++ b/keyboards/peranekofactory/tone/rev1/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . /* key matrix size */ #define MATRIX_ROWS 1 -#define MATRIX_COLS 10 +#define MATRIX_COLS 8 /* * Keyboard Matrix Assignments @@ -42,19 +42,13 @@ along with this program. If not, see . */ #define DIRECT_PINS { \ - { D4, C6, D7, E6, F6, F7, B1, B3 } \ + { D4, C6, D7, E6, F6, F7, B1, B3 } \ } #define UNUSED_PINS -/* -#define MATRIX_ROW_PINS { NO_PIN } -#define MATRIX_COL_PINS { F6,F7,B1,B3,D4,C6,D7,E6 } -#define UNUSED_PINS -*/ - /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW - + /* Rotary encoder define*/ #define ENCODERS_PAD_A { B5 } #define ENCODERS_PAD_B { B4 } diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h index f49c38e4b8..54a59ed551 100644 --- a/keyboards/peranekofactory/tone/rev2/config.h +++ b/keyboards/peranekofactory/tone/rev2/config.h @@ -28,7 +28,7 @@ along with this program. If not, see . /* key matrix size */ #define MATRIX_ROWS 1 -#define MATRIX_COLS 10 +#define MATRIX_COLS 8 /* * Keyboard Matrix Assignments @@ -42,13 +42,8 @@ along with this program. If not, see . */ #define DIRECT_PINS { \ - { D4,C6,D7,E6,F6,F7,B1,B3 } \ + { D4, C6, D7, E6, F6, F7, B1, B3 } \ } - -/* -#define MATRIX_ROW_PINS { NO_PIN } -#define MATRIX_COL_PINS { D4,C6,D7,E6,F6,F7,B1,B3 } -*/ #define UNUSED_PINS /* COL2ROW, ROW2COL */ -- cgit v1.2.1 From b564ba13eef1564c871d062a6ce97c1ccdbbd825 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 22 Jul 2021 04:30:29 +1000 Subject: Fix API generation failure caused by GRS-70EC (#13631) --- keyboards/sekigon/grs_70ec/config.h | 2 +- keyboards/sekigon/grs_70ec/ec_switch_matrix.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'keyboards') diff --git a/keyboards/sekigon/grs_70ec/config.h b/keyboards/sekigon/grs_70ec/config.h index aa740e7775..b1559fcc2f 100644 --- a/keyboards/sekigon/grs_70ec/config.h +++ b/keyboards/sekigon/grs_70ec/config.h @@ -45,7 +45,7 @@ along with this program. If not, see . * */ #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { S2, S1, S0, S3, S5, S7, S6, S4 } +#define MATRIX_COL_CHANNELS { 2, 1, 0, 3, 5, 7, 6, 4 } #define UNUSED_PINS #define DISCHARGE_PIN B1 #define ANALOG_PORT F6 diff --git a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c index 88e9bdabdb..d1c2d85ac8 100644 --- a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c +++ b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c @@ -20,19 +20,9 @@ #include "analog.h" #include "print.h" -// sensing channel definitions -#define S0 0 -#define S1 1 -#define S2 2 -#define S3 3 -#define S4 4 -#define S5 5 -#define S6 6 -#define S7 7 - // pin connections const uint8_t row_pins[] = MATRIX_ROW_PINS; -const uint8_t col_channels[] = MATRIX_COL_PINS; +const uint8_t col_channels[] = MATRIX_COL_CHANNELS; const uint8_t mux_sel_pins[] = MUX_SEL_PINS; _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS"); -- cgit v1.2.1