diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-11 05:41:58 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-11 05:41:58 +1100 |
| commit | e933e0411f442fa411d3d5ec488180fee241e2ef (patch) | |
| tree | f091f00a1408d752389385ff793c2878ec99e368 /keyboards/splitkb | |
| parent | 1022afa6c24a64c78d1c9be99a695ff5335876f7 (diff) | |
Move matrix config to info.json, part 5 (#20003)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/splitkb')
| -rw-r--r-- | keyboards/splitkb/kyria/rev1/config.h | 9 | ||||
| -rw-r--r-- | keyboards/splitkb/kyria/rev1/info.json | 5 | ||||
| -rw-r--r-- | keyboards/splitkb/kyria/rev2/config.h | 13 | ||||
| -rw-r--r-- | keyboards/splitkb/kyria/rev2/info.json | 11 |
4 files changed, 16 insertions, 22 deletions
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h index 8ca0d50ea6..dc83cf6b86 100644 --- a/keyboards/splitkb/kyria/rev1/config.h +++ b/keyboards/splitkb/kyria/rev1/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring -#define MATRIX_ROW_PINS \ - { B4, E6, D7, D4 } -#define MATRIX_COL_PINS \ - { B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. */ diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json index 895f9283ac..3a2b853eac 100644 --- a/keyboards/splitkb/kyria/rev1/info.json +++ b/keyboards/splitkb/kyria/rev1/info.json @@ -4,6 +4,11 @@ "pid": "0x9D9D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B4", "E6", "D7", "D4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "B5"} diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h index 1799c6aa49..8b878739fe 100644 --- a/keyboards/splitkb/kyria/rev2/config.h +++ b/keyboards/splitkb/kyria/rev2/config.h @@ -17,19 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring -#define MATRIX_ROW_PINS \ - { F6, F7, B1, B3 } -#define MATRIX_COL_PINS \ - { B2, B6, B5, B4, E6, D7, C6, D4 } -#define MATRIX_ROW_PINS_RIGHT \ - { D4, C6, D7, E6 } -#define MATRIX_COL_PINS_RIGHT \ - { B4, B5, B6, B2, B3, B1, F7, F6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - // Side detection // col 4 row 3 on right-hand-side #define SPLIT_HAND_MATRIX_GRID E6, B3 // row first because the board is col2row diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json index d21d820804..c0aa1047c5 100644 --- a/keyboards/splitkb/kyria/rev2/info.json +++ b/keyboards/splitkb/kyria/rev2/info.json @@ -4,6 +4,11 @@ "pid": "0x9D9D", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"], + "rows": ["F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5"} @@ -16,6 +21,12 @@ {"pin_a": "F5", "pin_b": "F4"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], + "rows": ["D4", "C6", "D7", "E6"] + } } }, "layouts": { |