From 4394fc35ea0af6b30aae5dc244281388903b9aa9 Mon Sep 17 00:00:00 2001 From: Zach White Date: Wed, 6 Jan 2021 10:42:37 -0800 Subject: [PATCH] change matrix/m20add to use non-standard names for non-standard pins --- keyboards/matrix/m20add/config.h | 6 ++++-- keyboards/matrix/m20add/matrix.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h index 8c3f922ab..316434649 100644 --- a/keyboards/matrix/m20add/config.h +++ b/keyboards/matrix/m20add/config.h @@ -45,7 +45,8 @@ #define COL15_MASK 0x04 #define COL16_MASK 0x02 -#define MATRIX_ROW_PINS { \ +// Note: MATRIX_ROW_PINS only works with standard pin names. +#define MATRIX_M20_ROW_PINS { \ DEF_PIN(TCA6424_PORT2, 7), \ DEF_PIN(TCA6424_PORT2, 6), \ DEF_PIN(TCA6424_PORT2, 0), \ @@ -53,7 +54,8 @@ DEF_PIN(TCA6424_PORT2, 4), \ DEF_PIN(TCA6424_PORT2, 5) } -#define MATRIX_COL_PINS { \ +// Note: MATRIX_COL_PINS only works with standard pin names. +#define MATRIX_M20_COL_PINS { \ DEF_PIN(TCA6424_PORT2, 1), \ DEF_PIN(TCA6424_PORT1, 7), \ DEF_PIN(TCA6424_PORT1, 6), \ diff --git a/keyboards/matrix/m20add/matrix.c b/keyboards/matrix/m20add/matrix.c index b17643fea..e9ddbdff6 100644 --- a/keyboards/matrix/m20add/matrix.c +++ b/keyboards/matrix/m20add/matrix.c @@ -10,7 +10,7 @@ #include "tca6424.h" #include "m20add.h" -static const uint16_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; +static const uint16_t col_pins[MATRIX_COLS] = MATRIX_M20_COL_PINS; void matrix_init_custom(void) {