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/merge/um70 | |
| parent | ace372d90de13dafc815df5d8049497cb351b69b (diff) | |
Move matrix config to info.json, part 7 (#20020)
Diffstat (limited to 'keyboards/merge/um70')
| -rw-r--r-- | keyboards/merge/um70/config.h | 6 | ||||
| -rw-r--r-- | keyboards/merge/um70/info.json | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h index c249a1816a..4ee40b4071 100644 --- a/keyboards/merge/um70/config.h +++ b/keyboards/merge/um70/config.h @@ -16,12 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_USB_DETECT #define MASTER_LEFT #define SPLIT_MODS_ENABLE diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json index e548d63151..a8816d8dd0 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/info.json @@ -8,6 +8,11 @@ "pid": "0x3222", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} |