diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-11 00:39:56 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-11 00:39:56 +1100 |
| commit | caa8c81086a806ea048c91ba142d424dc6a49f50 (patch) | |
| tree | 824de64449d9cfaeba176288d379a282c733ae1a /keyboards/malevolti | |
| parent | ace372d90de13dafc815df5d8049497cb351b69b (diff) | |
Move matrix config to info.json, part 7 (#20020)
Diffstat (limited to 'keyboards/malevolti')
| -rw-r--r-- | keyboards/malevolti/lyra/rev1/config.h | 6 | ||||
| -rw-r--r-- | keyboards/malevolti/lyra/rev1/info.json | 5 | ||||
| -rw-r--r-- | keyboards/malevolti/superlyra/rev1/config.h | 6 | ||||
| -rw-r--r-- | keyboards/malevolti/superlyra/rev1/info.json | 5 |
4 files changed, 10 insertions, 12 deletions
diff --git a/keyboards/malevolti/lyra/rev1/config.h b/keyboards/malevolti/lyra/rev1/config.h index 113174ff1e..38a1a09cd3 100644 --- a/keyboards/malevolti/lyra/rev1/config.h +++ b/keyboards/malevolti/lyra/rev1/config.h @@ -15,10 +15,4 @@ */ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 100 diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json index 572e5c118d..2cc916c7cf 100644 --- a/keyboards/malevolti/lyra/rev1/info.json +++ b/keyboards/malevolti/lyra/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x4C43", "device_version": "30.3.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/malevolti/superlyra/rev1/config.h b/keyboards/malevolti/superlyra/rev1/config.h index 4a56b96808..cffc2e9ff2 100644 --- a/keyboards/malevolti/superlyra/rev1/config.h +++ b/keyboards/malevolti/superlyra/rev1/config.h @@ -15,10 +15,4 @@ */ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 } - -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 100 diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json index c45b496c54..1c0e9c72bc 100644 --- a/keyboards/malevolti/superlyra/rev1/info.json +++ b/keyboards/malevolti/superlyra/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x4C53", "device_version": "30.3.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B7", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { |