From 23c365b023e409885e6f201f12df56e5145dde47 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Mar 2023 09:53:52 +1100 Subject: Move matrix config to info.json, part 1 (#19985) --- keyboards/yandrstudio/buff67v3/config.h | 8 -------- keyboards/yandrstudio/buff67v3/info.json | 5 +++++ keyboards/yandrstudio/eau87/config.h | 22 ---------------------- keyboards/yandrstudio/eau87/info.json | 5 +++++ keyboards/yandrstudio/eau_r2/config.h | 6 ------ keyboards/yandrstudio/eau_r2/info.json | 5 +++++ keyboards/yandrstudio/nightstar75/config.h | 6 ------ keyboards/yandrstudio/nightstar75/info.json | 5 +++++ keyboards/yandrstudio/nz64/config.h | 7 ------- keyboards/yandrstudio/nz64/info.json | 5 +++++ keyboards/yandrstudio/nz67v2/config.h | 8 -------- keyboards/yandrstudio/nz67v2/info.json | 5 +++++ keyboards/yandrstudio/tg67/config.h | 7 ------- keyboards/yandrstudio/tg67/info.json | 5 +++++ keyboards/yandrstudio/yr6095/config.h | 7 ------- keyboards/yandrstudio/yr6095/info.json | 5 +++++ keyboards/yandrstudio/zhou65/config.h | 8 -------- keyboards/yandrstudio/zhou65/info.json | 5 +++++ 18 files changed, 45 insertions(+), 79 deletions(-) delete mode 100644 keyboards/yandrstudio/eau87/config.h (limited to 'keyboards/yandrstudio') diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h index fe7045efad..22610f4518 100644 --- a/keyboards/yandrstudio/buff67v3/config.h +++ b/keyboards/yandrstudio/buff67v3/config.h @@ -15,14 +15,6 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_COL_PINS { B5, B6, B7, B8, B9, C13, C14, B0, B1, B2, B10, B11, B12, A15, B3 } -#define MATRIX_ROW_PINS { A3, A4, A5, A7, C15 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN B4 diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json index 07f7dbbe30..6178272b17 100644 --- a/keyboards/yandrstudio/buff67v3/info.json +++ b/keyboards/yandrstudio/buff67v3/info.json @@ -6,6 +6,11 @@ "pid": "0xAA88", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B5", "B6", "B7", "B8", "B9", "C13", "C14", "B0", "B1", "B2", "B10", "B11", "B12", "A15", "B3"], + "rows": ["A3", "A4", "A5", "A7", "C15"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/eau87/config.h b/keyboards/yandrstudio/eau87/config.h deleted file mode 100644 index 328e3e3852..0000000000 --- a/keyboards/yandrstudio/eau87/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B11, B10, B2, B1, B0, A7, A6, A5, A3, A15, B3 } -#define MATRIX_ROW_PINS { B12, B5, B4, A4, B7, B6 } diff --git a/keyboards/yandrstudio/eau87/info.json b/keyboards/yandrstudio/eau87/info.json index f09f55c76b..9477067805 100644 --- a/keyboards/yandrstudio/eau87/info.json +++ b/keyboards/yandrstudio/eau87/info.json @@ -6,6 +6,11 @@ "pid": "0xAAEB", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "A15", "B3"], + "rows": ["B12", "B5", "B4", "A4", "B7", "B6"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h index d1405b2bbf..878ac47bbc 100644 --- a/keyboards/yandrstudio/eau_r2/config.h +++ b/keyboards/yandrstudio/eau_r2/config.h @@ -15,12 +15,6 @@ */ #pragma once -#define MATRIX_COL_PINS { B7, A6, B6, B5, B4, B3, A5, A10, B1, B0, A7, A9, B11, B10, B2, A15, B15 } -#define MATRIX_ROW_PINS { A3, B9, B8, A4, C14, C13 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN A8 diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json index 74f5dd6e86..4865cecb0b 100644 --- a/keyboards/yandrstudio/eau_r2/info.json +++ b/keyboards/yandrstudio/eau_r2/info.json @@ -6,6 +6,11 @@ "pid": "0xAACD", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B7", "A6", "B6", "B5", "B4", "B3", "A5", "A10", "B1", "B0", "A7", "A9", "B11", "B10", "B2", "A15", "B15"], + "rows": ["A3", "B9", "B8", "A4", "C14", "C13"] + }, + "diode_direction": "COL2ROW", "debounce": 8, "layouts": { "LAYOUT": { diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h index 79f37b9bde..0c091e17af 100644 --- a/keyboards/yandrstudio/nightstar75/config.h +++ b/keyboards/yandrstudio/nightstar75/config.h @@ -15,12 +15,6 @@ */ #pragma once -#define MATRIX_COL_PINS { C13, C14, C15, A3, A4, A5, A6, B12, B13, B14, B15, A8, A9, A10, B8 } -#define MATRIX_ROW_PINS { B0, B1, B2, B10, B11, B9 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN A7 diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json index 4f8105fae8..9c0195618d 100644 --- a/keyboards/yandrstudio/nightstar75/info.json +++ b/keyboards/yandrstudio/nightstar75/info.json @@ -6,6 +6,11 @@ "pid": "0xAA87", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["C13", "C14", "C15", "A3", "A4", "A5", "A6", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "B8"], + "rows": ["B0", "B1", "B2", "B10", "B11", "B9"] + }, + "diode_direction": "ROW2COL", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h index 06de2f5680..b3bb28e7ae 100644 --- a/keyboards/yandrstudio/nz64/config.h +++ b/keyboards/yandrstudio/nz64/config.h @@ -15,13 +15,6 @@ */ #pragma once - -#define MATRIX_COL_PINS { A15, B3, B4, B6, B7, B5, C13, A5, A4, B14, B15, A8, A9, A10 } -#define MATRIX_ROW_PINS { C14, B13, B12, C15, A3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Fix VIA RGB_light */ #define VIA_HAS_BROKEN_KEYCODES diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json index 5aa0c2ae68..c924055e4e 100644 --- a/keyboards/yandrstudio/nz64/info.json +++ b/keyboards/yandrstudio/nz64/info.json @@ -4,6 +4,11 @@ "pid": "0xAAAF", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A15", "B3", "B4", "B6", "B7", "B5", "C13", "A5", "A4", "B14", "B15", "A8", "A9", "A10"], + "rows": ["C14", "B13", "B12", "C15", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index a3d9bb74c5..9a23a64ae2 100644 --- a/keyboards/yandrstudio/nz67v2/config.h +++ b/keyboards/yandrstudio/nz67v2/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_COL_PINS { B9, A3, A4, A5, A6, A7, B0, B2, B10, B11, B12, B13, B14, B15, A8 } -#define MATRIX_ROW_PINS { B3, B4, B6, B7, B8 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 15 /* RGB Matrix */ diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/info.json index ed06374976..90ef04d125 100644 --- a/keyboards/yandrstudio/nz67v2/info.json +++ b/keyboards/yandrstudio/nz67v2/info.json @@ -6,6 +6,11 @@ "pid": "0xAA83", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B9", "A3", "A4", "A5", "A6", "A7", "B0", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8"], + "rows": ["B3", "B4", "B6", "B7", "B8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A9", "pin_b": "A10"} diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h index d52452e0a2..84c1c2ae8f 100644 --- a/keyboards/yandrstudio/tg67/config.h +++ b/keyboards/yandrstudio/tg67/config.h @@ -15,13 +15,6 @@ */ #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_COL_PINS { B2, B10, B11, A8, A9, A10, B5, A15, B3, A2, A3, B4, A4, A5, A6 } -#define MATRIX_ROW_PINS { B0, B6, B1, B7, A1 } - /* RGB Matrix */ #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json index d48809128f..7bc7ea4142 100644 --- a/keyboards/yandrstudio/tg67/info.json +++ b/keyboards/yandrstudio/tg67/info.json @@ -6,6 +6,11 @@ "pid": "0xAA8D", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B2", "B10", "B11", "A8", "A9", "A10", "B5", "A15", "B3", "A2", "A3", "B4", "A4", "A5", "A6"], + "rows": ["B0", "B6", "B1", "B7", "A1"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h index ec02b66c19..46c0d6005d 100644 --- a/keyboards/yandrstudio/yr6095/config.h +++ b/keyboards/yandrstudio/yr6095/config.h @@ -15,13 +15,6 @@ */ #pragma once - -#define MATRIX_COL_PINS { B6, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4 } -#define MATRIX_ROW_PINS { A1, A3, A8, A9, A10 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN B5 diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json index 20a1e86cf4..5fbc7ecf33 100644 --- a/keyboards/yandrstudio/yr6095/info.json +++ b/keyboards/yandrstudio/yr6095/info.json @@ -6,6 +6,11 @@ "pid": "0xAA0C", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B6", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4"], + "rows": ["A1", "A3", "A8", "A9", "A10"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT_60_tsangan_split_rshift": { "layout": [ diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h index 2fa940c63a..66ec91c510 100644 --- a/keyboards/yandrstudio/zhou65/config.h +++ b/keyboards/yandrstudio/zhou65/config.h @@ -15,13 +15,5 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { A2, A1, B8, B7, C15 } -#define MATRIX_COL_PINS { B9, B6, B5, B4, B3, B1, B0, A7, A6, A5, A4, A3, A8, B15, B14 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* enable the nkro when using the VIA. */ #define FORCE_NKRO diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json index d3c36ca852..7a4754cf29 100644 --- a/keyboards/yandrstudio/zhou65/info.json +++ b/keyboards/yandrstudio/zhou65/info.json @@ -4,6 +4,11 @@ "pid": "0xAAAD", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B9", "B6", "B5", "B4", "B3", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A8", "B15", "B14"], + "rows": ["A2", "A1", "B8", "B7", "C15"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "A15", "on_state": 0 -- cgit v1.2.3