summaryrefslogtreecommitdiff
path: root/keyboards/cantor
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-02-14 18:39:41 +1100
committerGitHub <noreply@github.com>2023-02-14 00:39:41 -0700
commit2cdf99ae950a82e233482347651b7689c4896827 (patch)
treef26def8c2fd844dad22095d5223fb539b7413ad0 /keyboards/cantor
parent0b796b91a352c6084ed0b4c0f5aa99cc9d2fa07c (diff)
Migrate `DIRECT_PINS` to data driven (#19826)
Diffstat (limited to 'keyboards/cantor')
-rw-r--r--keyboards/cantor/config.h14
-rw-r--r--keyboards/cantor/info.json20
2 files changed, 20 insertions, 14 deletions
diff --git a/keyboards/cantor/config.h b/keyboards/cantor/config.h
index f002d87b1f..1cb680ac41 100644
--- a/keyboards/cantor/config.h
+++ b/keyboards/cantor/config.h
@@ -3,20 +3,6 @@
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
-
-#define DIRECT_PINS {{B1, B10, A8, B15, B14, B13}, \
- {B9, B8, B5, B4, B3, A15}, \
- {A3, A4, A5, A6, A7, B0}, \
- {A2, A1, A0, NO_PIN, NO_PIN, NO_PIN}}
-#define DIRECT_PINS_RIGHT {{B13, B14, B15, A8, B10, B1}, \
- {A15, B3, B4, B5, B8, B9}, \
- {B0, A7, A6, A5, A4, A3}, \
- {A0, A1, A2, NO_PIN, NO_PIN, NO_PIN}}
-
#define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode.
#define SERIAL_USART_TX_PIN B6 // USART TX pin
#define SERIAL_USART_RX_PIN B7 // USART RX pin
diff --git a/keyboards/cantor/info.json b/keyboards/cantor/info.json
index 6d599f4300..b2067508a0 100644
--- a/keyboards/cantor/info.json
+++ b/keyboards/cantor/info.json
@@ -19,6 +19,26 @@
"pid": "0x0000",
"vid": "0xFEED"
},
+ "matrix_pins": {
+ "direct": [
+ ["B1", "B10", "A8", "B15", "B14", "B13"],
+ ["B9", "B8", "B5", "B4", "B3", "A15"],
+ ["A3", "A4", "A5", "A6", "A7", "B0"],
+ ["A2", "A1", "A0", null, null, null]
+ ]
+ },
+ "split": {
+ "matrix_pins": {
+ "right": {
+ "direct": [
+ ["B13", "B14", "B15", "A8", "B10", "B1"],
+ ["A15", "B3", "B4", "B5", "B8", "B9"],
+ ["B0", "A7", "A6", "A5", "A4", "A3"],
+ ["A0", "A1", "A2", null, null, null]
+ ]
+ }
+ }
+ },
"community_layouts": ["split_3x6_3"],
"layouts": {
"LAYOUT_split_3x6_3": {