From caa8c81086a806ea048c91ba142d424dc6a49f50 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:39:56 +1100 Subject: Move matrix config to info.json, part 7 (#20020) --- keyboards/misonoworks/chocolatebar/config.h | 8 -------- keyboards/misonoworks/chocolatebar/info.json | 5 +++++ keyboards/misonoworks/karina/config.h | 8 -------- keyboards/misonoworks/karina/info.json | 5 +++++ 4 files changed, 10 insertions(+), 16 deletions(-) (limited to 'keyboards/misonoworks') diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h index e5768a480d..dd6c07768b 100644 --- a/keyboards/misonoworks/chocolatebar/config.h +++ b/keyboards/misonoworks/chocolatebar/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B7, D2, D3 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO #define RGB_DI_PIN B1 diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json index bc577e22fe..fd64d9fa14 100644 --- a/keyboards/misonoworks/chocolatebar/info.json +++ b/keyboards/misonoworks/chocolatebar/info.json @@ -8,6 +8,11 @@ "pid": "0xC456", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B3", "B2"], + "rows": ["B0", "B7", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h index 2c71926b81..e38f18b40a 100644 --- a/keyboards/misonoworks/karina/config.h +++ b/keyboards/misonoworks/karina/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -// pins -#define MATRIX_ROW_PINS { D2, D3, D5, F0 } -#define MATRIX_COL_PINS { B3, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6} - -// diode mode -#define DIODE_DIRECTION COL2ROW - #define FORCE_NKRO #define MK_3_SPEED #define TERMINAL_HELP diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json index 922e4117e6..c7cb97c0b3 100644 --- a/keyboards/misonoworks/karina/info.json +++ b/keyboards/misonoworks/karina/info.json @@ -8,6 +8,11 @@ "pid": "0xC456", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"], + "rows": ["D2", "D3", "D5", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B1", "resolution": 3}, -- cgit v1.2.3