summaryrefslogtreecommitdiff
path: root/keyboards/matrix
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/matrix')
-rw-r--r--keyboards/matrix/m20add/config.h6
-rw-r--r--keyboards/matrix/m20add/matrix.c2
-rw-r--r--keyboards/matrix/noah/info.json6
3 files changed, 8 insertions, 6 deletions
diff --git a/keyboards/matrix/m20add/config.h b/keyboards/matrix/m20add/config.h
index 8c3f922ab9..3164346495 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 b17643fea8..e9ddbdff62 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)
{
diff --git a/keyboards/matrix/noah/info.json b/keyboards/matrix/noah/info.json
index 69fc0fccfc..bb06a16d7c 100644
--- a/keyboards/matrix/noah/info.json
+++ b/keyboards/matrix/noah/info.json
@@ -84,7 +84,7 @@
"y": 0
},
{
- "Label": "Ins",
+ "label": "Ins",
"x": 15,
"y": 0
},
@@ -440,7 +440,7 @@
"y": 0
},
{
- "Label": "Ins",
+ "label": "Ins",
"x": 15,
"y": 0
},
@@ -807,7 +807,7 @@
"y": 0
},
{
- "Label": "Ins",
+ "label": "Ins",
"x": 15,
"y": 0
},