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/merge/uc1/config.h | 6 ------ keyboards/merge/uc1/info.json | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'keyboards/merge/uc1') diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h index 9dcfb6e074..dec57f0dbd 100644 --- a/keyboards/merge/uc1/config.h +++ b/keyboards/merge/uc1/config.h @@ -16,9 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { B1, B2 } -#define MATRIX_COL_PINS { B3, B4 } - #define RGB_DI_PIN B5 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING @@ -36,6 +33,3 @@ #define RGBLIGHT_VAL_STEP 10 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_SLEEP - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json index 55b68a4510..983d4e61fc 100644 --- a/keyboards/merge/uc1/info.json +++ b/keyboards/merge/uc1/info.json @@ -8,6 +8,11 @@ "pid": "0x5543", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B4"], + "rows": ["B1", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"} -- cgit v1.2.3