summaryrefslogtreecommitdiff
path: root/keyboards/zvecr
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-03-06 09:53:52 +1100
committerGitHub <noreply@github.com>2023-03-05 22:53:52 +0000
commit23c365b023e409885e6f201f12df56e5145dde47 (patch)
tree062e72be726939d5f6ddda944facb423bbf386cf /keyboards/zvecr
parentb34d51d08d7083fc790db2562a4d39890f34886f (diff)
Move matrix config to info.json, part 1 (#19985)
Diffstat (limited to 'keyboards/zvecr')
-rw-r--r--keyboards/zvecr/split_blackpill/config.h19
-rw-r--r--keyboards/zvecr/split_blackpill/info.json11
-rw-r--r--keyboards/zvecr/zv48/config.h19
-rw-r--r--keyboards/zvecr/zv48/info.json11
4 files changed, 22 insertions, 38 deletions
diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h
index 2f8984f51a..cda1688944 100644
--- a/keyboards/zvecr/split_blackpill/config.h
+++ b/keyboards/zvecr/split_blackpill/config.h
@@ -15,25 +15,6 @@
*/
#pragma once
-
-/*
- * 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 MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6 }
-#define MATRIX_ROW_PINS { B15, B14, B13, B12 }
-#define MATRIX_COL_PINS_RIGHT { B12, B13, B14, B15, A8, A9 }
-#define MATRIX_ROW_PINS_RIGHT { B0, B1, B10, B11 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define MATRIX_IO_DELAY 5
#define SPLIT_HAND_PIN B3
diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json
index d8245be308..dff0282f16 100644
--- a/keyboards/zvecr/split_blackpill/info.json
+++ b/keyboards/zvecr/split_blackpill/info.json
@@ -8,10 +8,21 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B1", "B0", "A7", "A6"],
+ "rows": ["B15", "B14", "B13", "B12"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "B6",
"bootmagic": {
"matrix": [4, 0]
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["B12", "B13", "B14", "B15", "A8", "A9"],
+ "rows": ["B0", "B1", "B10", "B11"]
+ }
}
},
"processor": "STM32F103",
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index 97b0393aab..c643ca5d31 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/config.h
@@ -15,25 +15,6 @@
*/
#pragma once
-
-/*
- * 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 MATRIX_COL_PINS { B15, B10, B0, A5, A4, A3 }
-#define MATRIX_ROW_PINS { A10, A15, B3, B4 }
-#define MATRIX_COL_PINS_RIGHT { B10, B15, A10, A15, B3, B4 }
-#define MATRIX_ROW_PINS_RIGHT { B0, A5, A4, A3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define MATRIX_IO_DELAY 5
#define SPLIT_HAND_PIN B9
diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json
index f3519b94f4..4206a3fa6e 100644
--- a/keyboards/zvecr/zv48/info.json
+++ b/keyboards/zvecr/zv48/info.json
@@ -8,6 +8,11 @@
"pid": "0x0048",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B15", "B10", "B0", "A5", "A4", "A3"],
+ "rows": ["A10", "A15", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "A2"}
@@ -17,6 +22,12 @@
"soft_serial_pin": "B6",
"bootmagic": {
"matrix": [4, 0]
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["B10", "B15", "A10", "A15", "B3", "B4"],
+ "rows": ["B0", "A5", "A4", "A3"]
+ }
}
},
"community_layouts": ["ortho_4x12"],