diff options
| author | QMK Bot <hello@qmk.fm> | 2021-11-11 19:02:36 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-11-11 19:02:36 +0000 |
| commit | 38d071d662387aab9d82e991cacb3f92ea0abb3e (patch) | |
| tree | 6de96aec80f65c51239863d0c9663cb05f279f71 /keyboards/matrix | |
| parent | bfa72721bb673ae6be148e0988bcfd959f3d7ab6 (diff) | |
| parent | 0b2bc8955949e21e40f5dbc888d785dcd370ca07 (diff) | |
| download | qmk_firmware-38d071d662387aab9d82e991cacb3f92ea0abb3e.tar.gz qmk_firmware-38d071d662387aab9d82e991cacb3f92ea0abb3e.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/matrix')
| -rw-r--r-- | keyboards/matrix/abelx/config.h | 4 | ||||
| -rw-r--r-- | keyboards/matrix/abelx/matrix.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/matrix/abelx/config.h b/keyboards/matrix/abelx/config.h index 145bb30993..d3c6a569b1 100644 --- a/keyboards/matrix/abelx/config.h +++ b/keyboards/matrix/abelx/config.h @@ -34,7 +34,7 @@ #define GET_PORT(pp) (((pp) >> 8) & 0xFF) #define GET_PIN(pp) ((pp) & 0xFF) -#define MATRIX_ROW_PINS { \ +#define CUSTOM_MATRIX_ROW_PINS { \ DEF_PIN(TCA6424_PORT2, 7), \ DEF_PIN(TCA6424_PORT2, 6), \ DEF_PIN(TCA6424_PORT2, 0), \ @@ -42,7 +42,7 @@ DEF_PIN(TCA6424_PORT2, 4), \ DEF_PIN(TCA6424_PORT2, 5) } -#define MATRIX_COL_PINS { \ +#define CUSTOM_MATRIX_COL_PINS { \ DEF_PIN(TCA6424_PORT2, 1), \ DEF_PIN(TCA6424_PORT1, 7), \ DEF_PIN(TCA6424_PORT1, 6), \ diff --git a/keyboards/matrix/abelx/matrix.c b/keyboards/matrix/abelx/matrix.c index 56129bd0b5..d8d87b7d89 100644 --- a/keyboards/matrix/abelx/matrix.c +++ b/keyboards/matrix/abelx/matrix.c @@ -25,7 +25,7 @@ #include "tca6424.h" #include "abelx.h" -static const uint16_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; +static const uint16_t col_pins[MATRIX_COLS] = CUSTOM_MATRIX_COL_PINS; void matrix_init_custom(void) { |