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/coarse/cordillera/config.h | 4 ---- keyboards/coarse/cordillera/info.json | 5 +++++ keyboards/coarse/ixora/config.h | 8 -------- keyboards/coarse/ixora/info.json | 5 +++++ keyboards/coarse/vinta/config.h | 8 -------- keyboards/coarse/vinta/info.json | 5 +++++ 6 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 keyboards/coarse/ixora/config.h delete mode 100644 keyboards/coarse/vinta/config.h (limited to 'keyboards/coarse') diff --git a/keyboards/coarse/cordillera/config.h b/keyboards/coarse/cordillera/config.h index e251f6f90d..ef26abfc02 100644 --- a/keyboards/coarse/cordillera/config.h +++ b/keyboards/coarse/cordillera/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 } -#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD1 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/coarse/cordillera/info.json b/keyboards/coarse/cordillera/info.json index 9d84f0dee3..507d499236 100644 --- a/keyboards/coarse/cordillera/info.json +++ b/keyboards/coarse/cordillera/info.json @@ -8,6 +8,11 @@ "pid": "0x1401", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["A13", "B9", "F1", "A10", "A9"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A8", "levels": 6, diff --git a/keyboards/coarse/ixora/config.h b/keyboards/coarse/ixora/config.h deleted file mode 100644 index 1d10a99696..0000000000 --- a/keyboards/coarse/ixora/config.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - - -#define MATRIX_ROW_PINS { A0 } -#define MATRIX_COL_PINS { B4, A15, B3, A1, B6, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/coarse/ixora/info.json b/keyboards/coarse/ixora/info.json index ef7bae5129..c38424ffa7 100644 --- a/keyboards/coarse/ixora/info.json +++ b/keyboards/coarse/ixora/info.json @@ -8,6 +8,11 @@ "pid": "0x0C61", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B4", "A15", "B3", "A1", "B6", "B5"], + "rows": ["A0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "A10", "num_lock": "A9", diff --git a/keyboards/coarse/vinta/config.h b/keyboards/coarse/vinta/config.h deleted file mode 100644 index 629f4b9b16..0000000000 --- a/keyboards/coarse/vinta/config.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - - -#define MATRIX_ROW_PINS { A10, A9, B0, A7, A6 } -#define MATRIX_COL_PINS { A5, A4, A3, A2, A1, A0, F1, F0, B7, B6, B5, B4, B3, A15, A14, A13 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/coarse/vinta/info.json b/keyboards/coarse/vinta/info.json index 8a615aac0d..0caf3a3e33 100644 --- a/keyboards/coarse/vinta/info.json +++ b/keyboards/coarse/vinta/info.json @@ -8,6 +8,11 @@ "pid": "0x0C61", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A13"], + "rows": ["A10", "A9", "B0", "A7", "A6"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F042", "bootloader": "stm32-dfu", "debounce": 0, -- cgit v1.2.3