diff options
author | Ryan <fauxpark@gmail.com> | 2023-03-11 00:00:24 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-11 00:00:24 +1100 |
commit | 9e64300e67720a5468c2585391250ca5579b311b (patch) | |
tree | d8c471bb33cd5d0e38e90d925d69b3c6b3cb2d59 /keyboards/basekeys | |
parent | dd086a51d82a574a55eb3b89e8943301d72296f3 (diff) |
Move matrix config to info.json, part 4 (#20001)
Diffstat (limited to 'keyboards/basekeys')
-rw-r--r-- | keyboards/basekeys/slice/rev1/config.h | 6 | ||||
-rw-r--r-- | keyboards/basekeys/slice/rev1/info.json | 5 | ||||
-rw-r--r-- | keyboards/basekeys/slice/rev1_rgb/config.h | 6 | ||||
-rw-r--r-- | keyboards/basekeys/slice/rev1_rgb/info.json | 5 | ||||
-rw-r--r-- | keyboards/basekeys/trifecta/config.h | 10 | ||||
-rw-r--r-- | keyboards/basekeys/trifecta/info.json | 5 |
6 files changed, 15 insertions, 22 deletions
diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h index 6e0065c062..c1008da9b8 100644 --- a/keyboards/basekeys/slice/rev1/config.h +++ b/keyboards/basekeys/slice/rev1/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 } - -#define DIODE_DIRECTION COL2ROW - /* Select hand configuration */ //#define EE_HANDS #define MASTER_LEFT diff --git a/keyboards/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/info.json index fac0bf3682..d2dbd00a3d 100644 --- a/keyboards/basekeys/slice/rev1/info.json +++ b/keyboards/basekeys/slice/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0xEC17", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h index a19d676b29..783d097ad0 100644 --- a/keyboards/basekeys/slice/rev1_rgb/config.h +++ b/keyboards/basekeys/slice/rev1_rgb/config.h @@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 } - -#define DIODE_DIRECTION COL2ROW - /* Select hand configuration */ //#define EE_HANDS #define MASTER_LEFT diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json index fb6a19bc2f..dfbdde65d6 100644 --- a/keyboards/basekeys/slice/rev1_rgb/info.json +++ b/keyboards/basekeys/slice/rev1_rgb/info.json @@ -8,6 +8,11 @@ "pid": "0xEC15", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h index c06395545d..36f691da43 100644 --- a/keyboards/basekeys/trifecta/config.h +++ b/keyboards/basekeys/trifecta/config.h @@ -16,16 +16,6 @@ #pragma once - -/* key matrix pins */ - -#define MATRIX_ROW_PINS { B0, B7, F7, B1, B6, C6, C7, B5, F6, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, D1, B2, D0, B3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - - #define RGB_DI_PIN E6 #define RGB_MATRIX_LED_COUNT 80 diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json index 8743e3aad1..dfe5b680c9 100644 --- a/keyboards/basekeys/trifecta/info.json +++ b/keyboards/basekeys/trifecta/info.json @@ -8,6 +8,11 @@ "pid": "0xEAF3", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "D1", "B2", "D0", "B3"], + "rows": ["B0", "B7", "F7", "B1", "B6", "C6", "C7", "B5", "F6", "D2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D4", "pin_b": "B4"}, |