summaryrefslogtreecommitdiff
path: root/keyboards/keebio
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/keebio
parent0b796b91a352c6084ed0b4c0f5aa99cc9d2fa07c (diff)
Migrate `DIRECT_PINS` to data driven (#19826)
Diffstat (limited to 'keyboards/keebio')
-rw-r--r--keyboards/keebio/bamfk1/config.h13
-rw-r--r--keyboards/keebio/bamfk1/info.json6
-rw-r--r--keyboards/keebio/bdn9/rev1/config.h12
-rw-r--r--keyboards/keebio/bdn9/rev1/info.json9
-rw-r--r--keyboards/keebio/bdn9/rev2/config.h12
-rw-r--r--keyboards/keebio/bdn9/rev2/info.json9
-rw-r--r--keyboards/keebio/choconum/config.h15
-rw-r--r--keyboards/keebio/choconum/info.json9
-rw-r--r--keyboards/keebio/stick/config.h13
-rw-r--r--keyboards/keebio/stick/info.json5
-rw-r--r--keyboards/keebio/tukey/config.h11
-rw-r--r--keyboards/keebio/tukey/info.json5
12 files changed, 41 insertions, 78 deletions
diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h
index 6836443389..de8b594cec 100644
--- a/keyboards/keebio/bamfk1/config.h
+++ b/keyboards/keebio/bamfk1/config.h
@@ -3,19 +3,6 @@
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-/*
- * Keyboard Matrix Assignments
- */
-
-#define DIRECT_PINS { \
- { E6, B6, D6, NO_PIN }, \
- { NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
-}
#define AUDIO_PIN C6
#ifdef AUDIO_ENABLE
# define STARTUP_SONG SONG(STARTUP_SOUND)
diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json
index fb16f585bb..9390f7d56f 100644
--- a/keyboards/keebio/bamfk1/info.json
+++ b/keyboards/keebio/bamfk1/info.json
@@ -10,6 +10,12 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "matrix_pins": {
+ "direct": [
+ ["E6", "B6", "D6", null],
+ [null, null, null, null]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/keebio/bdn9/rev1/config.h b/keyboards/keebio/bdn9/rev1/config.h
index f075302e87..d34d9756f9 100644
--- a/keyboards/keebio/bdn9/rev1/config.h
+++ b/keyboards/keebio/bdn9/rev1/config.h
@@ -17,18 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
- { D2, D4, F4 }, \
- { D7, B1, B3 }, \
- { E6, B4, B2 } \
-}
-
#define ENCODERS_PAD_A { D0, F6, B6 }
#define ENCODERS_PAD_B { D1, F5, F7 }
diff --git a/keyboards/keebio/bdn9/rev1/info.json b/keyboards/keebio/bdn9/rev1/info.json
index a308d1c87c..e5dea50260 100644
--- a/keyboards/keebio/bdn9/rev1/info.json
+++ b/keyboards/keebio/bdn9/rev1/info.json
@@ -5,5 +5,12 @@
"device_version": "1.0.0"
},
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["D2", "D4", "F4"],
+ ["D7", "B1", "B3"],
+ ["E6", "B4", "B2"]
+ ]
+ }
}
diff --git a/keyboards/keebio/bdn9/rev2/config.h b/keyboards/keebio/bdn9/rev2/config.h
index 7a7f356a2e..f30de7e197 100644
--- a/keyboards/keebio/bdn9/rev2/config.h
+++ b/keyboards/keebio/bdn9/rev2/config.h
@@ -17,18 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
- { B12, B5, B6 }, \
- { B14, B4, B7 }, \
- { A3, F1, F0 } \
-}
-
// Left, Right, Middle
#define ENCODERS_PAD_A { A8, B3, A10 }
#define ENCODERS_PAD_B { A4, A15, A9 }
diff --git a/keyboards/keebio/bdn9/rev2/info.json b/keyboards/keebio/bdn9/rev2/info.json
index 04d22a1936..24eebef1a8 100644
--- a/keyboards/keebio/bdn9/rev2/info.json
+++ b/keyboards/keebio/bdn9/rev2/info.json
@@ -5,5 +5,12 @@
"device_version": "2.0.0"
},
"processor": "STM32F072",
- "bootloader": "stm32-dfu"
+ "bootloader": "stm32-dfu",
+ "matrix_pins": {
+ "direct": [
+ ["B12", "B5", "B6"],
+ ["B14", "B4", "B7"],
+ ["A3", "F1", "F0"]
+ ]
+ }
}
diff --git a/keyboards/keebio/choconum/config.h b/keyboards/keebio/choconum/config.h
index 9419fea3cf..38e745515a 100644
--- a/keyboards/keebio/choconum/config.h
+++ b/keyboards/keebio/choconum/config.h
@@ -17,21 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-#define DIRECT_PINS { \
- { B2, B10, B3, B4 }, \
- { B1, B11, A15, B5 }, \
- { B0, A5, B7, F0 }, \
- { A7, A6, B8, B6 }, \
- { A4, A3, B9, F1 } \
-}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/info.json
index f92da2ad13..b373df4850 100644
--- a/keyboards/keebio/choconum/info.json
+++ b/keyboards/keebio/choconum/info.json
@@ -10,6 +10,15 @@
},
"processor": "STM32F072",
"bootloader": "stm32-dfu",
+ "matrix_pins": {
+ "direct": [
+ ["B2", "B10", "B3", "B4"],
+ ["B1", "B11", "A15", "B5"],
+ ["B0", "A5", "B7", "F0"],
+ ["A7", "A6", "B8", "B6"],
+ ["A4", "A3", "B9", "F1"]
+ ]
+ },
"community_layouts": ["ortho_5x4", "numpad_5x4"],
"layouts": {
"LAYOUT_numpad_5x4": {
diff --git a/keyboards/keebio/stick/config.h b/keyboards/keebio/stick/config.h
index bc4e214c20..807383befc 100644
--- a/keyboards/keebio/stick/config.h
+++ b/keyboards/keebio/stick/config.h
@@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 12
-
-/* key matrix pins */
-#define DIRECT_PINS { \
- { F4, B6, B5, B4, E6, D7, F6, F7, B1, B3, B2, F5 } \
-}
-
#define ENCODERS_PAD_A { D1, D4 }
#define ENCODERS_PAD_B { D0, C6 }
@@ -103,7 +93,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# endif
#endif
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define TAPPING_TERM 200
diff --git a/keyboards/keebio/stick/info.json b/keyboards/keebio/stick/info.json
index c247e3ae99..ff91ee9f24 100644
--- a/keyboards/keebio/stick/info.json
+++ b/keyboards/keebio/stick/info.json
@@ -10,6 +10,11 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["F4", "B6", "B5", "B4", "E6", "D7", "F6", "F7", "B1", "B3", "B2", "F5"]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/keebio/tukey/config.h b/keyboards/keebio/tukey/config.h
index 79e8b254b3..b62aef8a09 100644
--- a/keyboards/keebio/tukey/config.h
+++ b/keyboards/keebio/tukey/config.h
@@ -17,17 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 2
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { { D4, F6 } }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN D3
#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/info.json
index 27a5159c0e..2be3e55e70 100644
--- a/keyboards/keebio/tukey/info.json
+++ b/keyboards/keebio/tukey/info.json
@@ -10,6 +10,11 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["D4", "F6"]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [