From 9e64300e67720a5468c2585391250ca5579b311b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:00:24 +1100 Subject: Move matrix config to info.json, part 4 (#20001) --- keyboards/protozoa/cassini/config.h | 7 ------- keyboards/protozoa/cassini/info.json | 5 +++++ keyboards/protozoa/p01/config.h | 7 ------- keyboards/protozoa/p01/info.json | 5 +++++ 4 files changed, 10 insertions(+), 14 deletions(-) (limited to 'keyboards/protozoa') diff --git a/keyboards/protozoa/cassini/config.h b/keyboards/protozoa/cassini/config.h index ed52fe560d..3c86d94887 100644 --- a/keyboards/protozoa/cassini/config.h +++ b/keyboards/protozoa/cassini/config.h @@ -17,12 +17,5 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 } -#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE diff --git a/keyboards/protozoa/cassini/info.json b/keyboards/protozoa/cassini/info.json index 422bb0ac71..26408ff1af 100644 --- a/keyboards/protozoa/cassini/info.json +++ b/keyboards/protozoa/cassini/info.json @@ -8,6 +8,11 @@ "pid": "0x4341", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"], + "rows": ["A2", "B9", "B8", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B6", "on_state": 0 diff --git a/keyboards/protozoa/p01/config.h b/keyboards/protozoa/p01/config.h index e3f3faca9c..8436b743be 100644 --- a/keyboards/protozoa/p01/config.h +++ b/keyboards/protozoa/p01/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROW_PINS { B1, B2, B10, B11, B12, B13 } -#define MATRIX_COL_PINS { A14, A15, B3, B4, B5, B6, B7, B8, B9, A0, A1, A2, A3, A4, A5, A6, A7, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB Light */ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 2 diff --git a/keyboards/protozoa/p01/info.json b/keyboards/protozoa/p01/info.json index 77e1449458..60d8d0f508 100644 --- a/keyboards/protozoa/p01/info.json +++ b/keyboards/protozoa/p01/info.json @@ -8,6 +8,11 @@ "pid": "0x5031", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], + "rows": ["B1", "B2", "B10", "B11", "B12", "B13"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B15", "pin_b": "B14"} -- cgit v1.2.3