From 76cc7fe109d66c1e0ac16b27b2f691e7d55792d3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:32:05 +1100 Subject: Move matrix config to info.json, part 6 (#20019) --- keyboards/chlx/merro60/config.h | 16 ---------------- keyboards/chlx/merro60/info.json | 5 +++++ keyboards/chlx/str_merro60/config.h | 17 ----------------- keyboards/chlx/str_merro60/info.json | 5 +++++ 4 files changed, 10 insertions(+), 33 deletions(-) (limited to 'keyboards/chlx') diff --git a/keyboards/chlx/merro60/config.h b/keyboards/chlx/merro60/config.h index f9f0068b16..18198a8bce 100644 --- a/keyboards/chlx/merro60/config.h +++ b/keyboards/chlx/merro60/config.h @@ -17,22 +17,6 @@ along with this program. If not, see . #pragma once -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, D5, D3, B5, F4 } -#define MATRIX_COL_PINS { B7, D1, D0, B0, B1, E6, B2, B3, D2, D7, B4, B6, C6, C7, D6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/chlx/merro60/info.json b/keyboards/chlx/merro60/info.json index bbb3124868..99308fecde 100644 --- a/keyboards/chlx/merro60/info.json +++ b/keyboards/chlx/merro60/info.json @@ -8,6 +8,11 @@ "pid": "0x0601", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B7", "D1", "D0", "B0", "B1", "E6", "B2", "B3", "D2", "D7", "B4", "B6", "C6", "C7", "D6"], + "rows": ["D4", "D5", "D3", "B5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/chlx/str_merro60/config.h b/keyboards/chlx/str_merro60/config.h index 731309b6fa..5a54a2ab89 100644 --- a/keyboards/chlx/str_merro60/config.h +++ b/keyboards/chlx/str_merro60/config.h @@ -17,23 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { C6, C7, F7, F6, F5, F4, F1, F0, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, E6, B0, B1, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN D3 #ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json index e9ab25aedb..20f8eb6681 100644 --- a/keyboards/chlx/str_merro60/info.json +++ b/keyboards/chlx/str_merro60/info.json @@ -8,6 +8,11 @@ "pid": "0x0602", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "E6", "B0", "B1", "B2"], + "rows": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { -- cgit v1.2.3