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/meletrix | |
| parent | ace372d90de13dafc815df5d8049497cb351b69b (diff) | |
Move matrix config to info.json, part 7 (#20020)
Diffstat (limited to 'keyboards/meletrix')
| -rw-r--r-- | keyboards/meletrix/zoom65/config.h | 6 | ||||
| -rw-r--r-- | keyboards/meletrix/zoom65/info.json | 5 | ||||
| -rw-r--r-- | keyboards/meletrix/zoom65_lite/config.h | 6 | ||||
| -rw-r--r-- | keyboards/meletrix/zoom65_lite/info.json | 5 | ||||
| -rw-r--r-- | keyboards/meletrix/zoom87/config.h | 6 | ||||
| -rw-r--r-- | keyboards/meletrix/zoom87/info.json | 5 |
6 files changed, 15 insertions, 18 deletions
diff --git a/keyboards/meletrix/zoom65/config.h b/keyboards/meletrix/zoom65/config.h index 4c05b1d83b..e5cc1f3e5b 100644 --- a/keyboards/meletrix/zoom65/config.h +++ b/keyboards/meletrix/zoom65/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { F0, E6, D5, F1, F4 } -#define MATRIX_COL_PINS { C7, D3, D2, D1, D0, B7, B3, B2, C6, B6, B5, B4, D7, D6, D4 } - -#define DIODE_DIRECTION COL2ROW - // Note: array is { col, row ) #define ENCODERS_CW_KEY { { 5, 4 } } #define ENCODERS_CCW_KEY { { 3, 4 } } diff --git a/keyboards/meletrix/zoom65/info.json b/keyboards/meletrix/zoom65/info.json index 0968df4794..8c11abe429 100644 --- a/keyboards/meletrix/zoom65/info.json +++ b/keyboards/meletrix/zoom65/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "E6", "D5", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B0", "resolution": 2} diff --git a/keyboards/meletrix/zoom65_lite/config.h b/keyboards/meletrix/zoom65_lite/config.h index 4c05b1d83b..e5cc1f3e5b 100644 --- a/keyboards/meletrix/zoom65_lite/config.h +++ b/keyboards/meletrix/zoom65_lite/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { F0, E6, D5, F1, F4 } -#define MATRIX_COL_PINS { C7, D3, D2, D1, D0, B7, B3, B2, C6, B6, B5, B4, D7, D6, D4 } - -#define DIODE_DIRECTION COL2ROW - // Note: array is { col, row ) #define ENCODERS_CW_KEY { { 5, 4 } } #define ENCODERS_CCW_KEY { { 3, 4 } } diff --git a/keyboards/meletrix/zoom65_lite/info.json b/keyboards/meletrix/zoom65_lite/info.json index d5dcd621ef..97598af127 100644 --- a/keyboards/meletrix/zoom65_lite/info.json +++ b/keyboards/meletrix/zoom65_lite/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["F0", "E6", "D5", "F1", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B0", "resolution": 2} diff --git a/keyboards/meletrix/zoom87/config.h b/keyboards/meletrix/zoom87/config.h index c016ab1f56..fd83302d27 100644 --- a/keyboards/meletrix/zoom87/config.h +++ b/keyboards/meletrix/zoom87/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 } -#define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 20 diff --git a/keyboards/meletrix/zoom87/info.json b/keyboards/meletrix/zoom87/info.json index c60f7f8799..d5824818f9 100644 --- a/keyboards/meletrix/zoom87/info.json +++ b/keyboards/meletrix/zoom87/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"], + "rows": ["B3", "B7", "B2", "F0", "D3", "D0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F6", "on_state": 0 |