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 @@ | |||
| 16 | 16 | ||
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | |||
| 20 | #define MATRIX_ROW_PINS { F0, E6, D5, F1, F4 } | ||
| 21 | #define MATRIX_COL_PINS { C7, D3, D2, D1, D0, B7, B3, B2, C6, B6, B5, B4, D7, D6, D4 } | ||
| 22 | |||
| 23 | #define DIODE_DIRECTION COL2ROW | ||
| 24 | |||
| 25 | // Note: array is { col, row ) | 19 | // Note: array is { col, row ) |
| 26 | #define ENCODERS_CW_KEY { { 5, 4 } } | 20 | #define ENCODERS_CW_KEY { { 5, 4 } } |
| 27 | #define ENCODERS_CCW_KEY { { 3, 4 } } | 21 | #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 @@ | |||
| 8 | "pid": "0x0004", | 8 | "pid": "0x0004", |
| 9 | "device_version": "0.0.1" | 9 | "device_version": "0.0.1" |
| 10 | }, | 10 | }, |
| 11 | "matrix_pins": { | ||
| 12 | "cols": ["C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], | ||
| 13 | "rows": ["F0", "E6", "D5", "F1", "F4"] | ||
| 14 | }, | ||
| 15 | "diode_direction": "COL2ROW", | ||
| 11 | "encoder": { | 16 | "encoder": { |
| 12 | "rotary": [ | 17 | "rotary": [ |
| 13 | {"pin_a": "B1", "pin_b": "B0", "resolution": 2} | 18 | {"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 @@ | |||
| 16 | 16 | ||
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | |||
| 20 | #define MATRIX_ROW_PINS { F0, E6, D5, F1, F4 } | ||
| 21 | #define MATRIX_COL_PINS { C7, D3, D2, D1, D0, B7, B3, B2, C6, B6, B5, B4, D7, D6, D4 } | ||
| 22 | |||
| 23 | #define DIODE_DIRECTION COL2ROW | ||
| 24 | |||
| 25 | // Note: array is { col, row ) | 19 | // Note: array is { col, row ) |
| 26 | #define ENCODERS_CW_KEY { { 5, 4 } } | 20 | #define ENCODERS_CW_KEY { { 5, 4 } } |
| 27 | #define ENCODERS_CCW_KEY { { 3, 4 } } | 21 | #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 @@ | |||
| 8 | "pid": "0x0005", | 8 | "pid": "0x0005", |
| 9 | "device_version": "0.0.1" | 9 | "device_version": "0.0.1" |
| 10 | }, | 10 | }, |
| 11 | "matrix_pins": { | ||
| 12 | "cols": ["C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], | ||
| 13 | "rows": ["F0", "E6", "D5", "F1", "F4"] | ||
| 14 | }, | ||
| 15 | "diode_direction": "COL2ROW", | ||
| 11 | "encoder": { | 16 | "encoder": { |
| 12 | "rotary": [ | 17 | "rotary": [ |
| 13 | {"pin_a": "B1", "pin_b": "B0", "resolution": 2} | 18 | {"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 @@ | |||
| 16 | 16 | ||
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | |||
| 20 | #define MATRIX_ROW_PINS { B3, B7, B2, F0, D3, D0 } | ||
| 21 | #define MATRIX_COL_PINS { D6, D7, D1, D5, F7, D4, F5, F4, F1, C7, C6, B6, B5, B4, E6, B1, B0 } | ||
| 22 | |||
| 23 | #define DIODE_DIRECTION COL2ROW | ||
| 24 | |||
| 25 | #define RGB_DI_PIN D2 | 19 | #define RGB_DI_PIN D2 |
| 26 | #ifdef RGB_DI_PIN | 20 | #ifdef RGB_DI_PIN |
| 27 | #define RGBLED_NUM 20 | 21 | #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 @@ | |||
| 8 | "pid": "0x0007", | 8 | "pid": "0x0007", |
| 9 | "device_version": "0.0.1" | 9 | "device_version": "0.0.1" |
| 10 | }, | 10 | }, |
| 11 | "matrix_pins": { | ||
| 12 | "cols": ["D6", "D7", "D1", "D5", "F7", "D4", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "E6", "B1", "B0"], | ||
| 13 | "rows": ["B3", "B7", "B2", "F0", "D3", "D0"] | ||
| 14 | }, | ||
| 15 | "diode_direction": "COL2ROW", | ||
| 11 | "indicators": { | 16 | "indicators": { |
| 12 | "caps_lock": "F6", | 17 | "caps_lock": "F6", |
| 13 | "on_state": 0 | 18 | "on_state": 0 |
