summaryrefslogtreecommitdiffstats
path: root/keyboards/adafruit
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/adafruit
parent0b796b91a352c6084ed0b4c0f5aa99cc9d2fa07c (diff)
Migrate `DIRECT_PINS` to data driven (#19826)
Diffstat (limited to 'keyboards/adafruit')
-rw-r--r--keyboards/adafruit/macropad/config.h16
-rw-r--r--keyboards/adafruit/macropad/info.json9
2 files changed, 9 insertions, 16 deletions
diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index d533828dae..7f1170ef37 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@@ -16,22 +16,6 @@
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-// clang-format off
-#define DIRECT_PINS { \
- { NO_PIN, NO_PIN, GP0 }, \
- { GP1, GP2, GP3 }, \
- { GP4, GP5, GP6 }, \
- { GP7, GP8, GP9 }, \
- { GP10, GP11, GP12 } \
-}
-// clang-format on
-
/* OLED SPI Defines */
#define OLED_DISPLAY_128X64
#define OLED_IC OLED_IC_SH1106
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index adb82407ec..588c51b008 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -10,6 +10,15 @@
},
"processor": "RP2040",
"bootloader": "rp2040",
+ "matrix_pins": {
+ "direct": [
+ [null, null, "GP0"],
+ ["GP1", "GP2", "GP3"],
+ ["GP4", "GP5", "GP6"],
+ ["GP7", "GP8", "GP9"],
+ ["GP10", "GP11", "GP12"]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [