summaryrefslogtreecommitdiff
path: root/keyboards/handwired
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/handwired
parent0b796b91a352c6084ed0b4c0f5aa99cc9d2fa07c (diff)
Migrate `DIRECT_PINS` to data driven (#19826)
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/aball/config.h7
-rw-r--r--keyboards/handwired/aball/info.json5
-rw-r--r--keyboards/handwired/bdn9_ble/config.h12
-rw-r--r--keyboards/handwired/bdn9_ble/info.json7
-rw-r--r--keyboards/handwired/bento/rev1/config.h11
-rw-r--r--keyboards/handwired/bento/rev1/info.json6
-rw-r--r--keyboards/handwired/dc/mc/001/config.h13
-rw-r--r--keyboards/handwired/dc/mc/001/info.json5
-rw-r--r--keyboards/handwired/lemonpad/config.h21
-rw-r--r--keyboards/handwired/lemonpad/info.json6
-rw-r--r--keyboards/handwired/stream_cheap/2x3/config.h8
-rw-r--r--keyboards/handwired/stream_cheap/2x3/info.json6
-rw-r--r--keyboards/handwired/stream_cheap/2x4/config.h11
-rw-r--r--keyboards/handwired/stream_cheap/2x4/info.json6
-rw-r--r--keyboards/handwired/stream_cheap/2x5/config.h8
-rw-r--r--keyboards/handwired/stream_cheap/2x5/info.json6
16 files changed, 47 insertions, 91 deletions
diff --git a/keyboards/handwired/aball/config.h b/keyboards/handwired/aball/config.h
index 32d16d82f9..cbe0c8b33e 100644
--- a/keyboards/handwired/aball/config.h
+++ b/keyboards/handwired/aball/config.h
@@ -17,12 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-#define DIRECT_PINS {{NO_PIN}}
-
#define ADNS9800_CS_PIN F7
#define POINTING_DEVICE_INVERT_X
diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json
index cb34aa7034..84d277c136 100644
--- a/keyboards/handwired/aball/info.json
+++ b/keyboards/handwired/aball/info.json
@@ -10,6 +10,11 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "matrix_pins": {
+ "direct": [
+ [null]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/bdn9_ble/config.h b/keyboards/handwired/bdn9_ble/config.h
index 32d082a00b..2dc8bb5327 100644
--- a/keyboards/handwired/bdn9_ble/config.h
+++ b/keyboards/handwired/bdn9_ble/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 { \
- { D1, D0, C6 }, \
- { D7, B5, B6 }, \
- { B7, D6, F7 } \
-}
-
#define BACKLIGHT_PIN F6
#define BACKLIGHT_LEVELS 5
diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json
index 3d37d12d75..359939713a 100644
--- a/keyboards/handwired/bdn9_ble/info.json
+++ b/keyboards/handwired/bdn9_ble/info.json
@@ -10,6 +10,13 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["D1", "D0", "C6"],
+ ["D7", "B5", "B6"],
+ ["B7", "D6", "F7"]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h
index 995a6e4239..497a2deb16 100644
--- a/keyboards/handwired/bento/rev1/config.h
+++ b/keyboards/handwired/bento/rev1/config.h
@@ -16,17 +16,6 @@
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-/* Keyboard Matrix Assignments */
-#define DIRECT_PINS { \
- { D7, B1, D2 }, \
- { E6, B4, B2 } \
-}
-
#define ENCODERS_PAD_A { D1 }
#define ENCODERS_PAD_B { D0 }
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
index 2f09b8820c..2b3012b399 100644
--- a/keyboards/handwired/bento/rev1/info.json
+++ b/keyboards/handwired/bento/rev1/info.json
@@ -10,6 +10,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["D7", "B1", "D2"],
+ ["E6", "B4", "B2"]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/dc/mc/001/config.h b/keyboards/handwired/dc/mc/001/config.h
index 9f381ca798..ecc1bc9c52 100644
--- a/keyboards/handwired/dc/mc/001/config.h
+++ b/keyboards/handwired/dc/mc/001/config.h
@@ -17,19 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- BUTTON_MUTE = _BV(4),
- BUTTON_STOP = _BV(0),
- BUTTON_TRACK_PREVIOUS = _BV(1),
- BUTTON_TRACK_NEXT = _BV(2),
- BUTTON_PLAY_PAUSE = _BV(3),
-*/
-#define DIRECT_PINS \
- { \
- { B4, B0, B1, B2, B3 } \
- }
-
/*
RE_CHANNEL_A = _BV(6),
RE_CHANNEL_B = _BV(5),
diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/info.json
index 114c0f2f35..2bcd5ffd92 100644
--- a/keyboards/handwired/dc/mc/001/info.json
+++ b/keyboards/handwired/dc/mc/001/info.json
@@ -10,6 +10,11 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["B4", "B0", "B1", "B2", "B3"]
+ ]
+ },
"debounce": 50,
"layouts": {
"LAYOUT": {
diff --git a/keyboards/handwired/lemonpad/config.h b/keyboards/handwired/lemonpad/config.h
index 2d978f8931..d1e992c215 100644
--- a/keyboards/handwired/lemonpad/config.h
+++ b/keyboards/handwired/lemonpad/config.h
@@ -16,27 +16,6 @@
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define DIRECT_PINS { \
- { E6, D7, C6 }, \
- { B4, B5, D4 } \
-}
-
//#define RGB_DI_PIN E2
//#ifdef RGB_DI_PIN
//# define RGBLED_NUM 16
diff --git a/keyboards/handwired/lemonpad/info.json b/keyboards/handwired/lemonpad/info.json
index 40e3296fd2..9cbcf4f4f7 100644
--- a/keyboards/handwired/lemonpad/info.json
+++ b/keyboards/handwired/lemonpad/info.json
@@ -10,6 +10,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["E6", "D7", "C6"],
+ ["B4", "B5", "D4"]
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/stream_cheap/2x3/config.h b/keyboards/handwired/stream_cheap/2x3/config.h
index 1ac58c88de..5f36081323 100644
--- a/keyboards/handwired/stream_cheap/2x3/config.h
+++ b/keyboards/handwired/stream_cheap/2x3/config.h
@@ -1,13 +1,5 @@
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-/* define direct pins used */
-#define DIRECT_PINS { { D1,C6,B4}, { D0,D4,D7} }
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json
index 8754226f1c..555d9540af 100644
--- a/keyboards/handwired/stream_cheap/2x3/info.json
+++ b/keyboards/handwired/stream_cheap/2x3/info.json
@@ -10,6 +10,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["D1", "C6", "B4"],
+ ["D0", "D4", "D7"]
+ ]
+ },
"community_layouts": ["ortho_2x3"],
"layouts": {
"LAYOUT_ortho_2x3": {
diff --git a/keyboards/handwired/stream_cheap/2x4/config.h b/keyboards/handwired/stream_cheap/2x4/config.h
index 65701e8d49..5f36081323 100644
--- a/keyboards/handwired/stream_cheap/2x4/config.h
+++ b/keyboards/handwired/stream_cheap/2x4/config.h
@@ -1,16 +1,5 @@
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-/* define direct pins used */
-#define DIRECT_PINS \
- { \
- {D1, D0, D4, C6}, { D7, E6, B4, B5 } \
- }
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json
index ae7e361a4d..d298a30c14 100644
--- a/keyboards/handwired/stream_cheap/2x4/info.json
+++ b/keyboards/handwired/stream_cheap/2x4/info.json
@@ -10,6 +10,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["D1", "D0", "D4", "C6"],
+ ["D7", "E6", "B4", "B5"]
+ ]
+ },
"layouts": {
"LAYOUT_ortho_2x4": {
"layout": [
diff --git a/keyboards/handwired/stream_cheap/2x5/config.h b/keyboards/handwired/stream_cheap/2x5/config.h
index f33fc0f7c2..5f36081323 100644
--- a/keyboards/handwired/stream_cheap/2x5/config.h
+++ b/keyboards/handwired/stream_cheap/2x5/config.h
@@ -1,13 +1,5 @@
#pragma once
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 5
-
-/* define direct pins used */
-#define DIRECT_PINS { { D1,C6,B4,B5,B2}, { D0,D4,D7,E6,B6} }
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json
index b8a4623b64..3a81177f31 100644
--- a/keyboards/handwired/stream_cheap/2x5/info.json
+++ b/keyboards/handwired/stream_cheap/2x5/info.json
@@ -10,6 +10,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["D1", "C6", "B4", "B5", "B2"],
+ ["D0", "D4", "D7", "E6", "B6"]
+ ]
+ },
"layouts": {
"LAYOUT_ortho_2x5": {
"layout": [