From ace372d90de13dafc815df5d8049497cb351b69b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:34:34 +1100 Subject: Move matrix config to info.json, part 3 (#19991) Co-authored-by: Nick Brassel --- keyboards/rmi_kb/aelith/config.h | 17 --------------- keyboards/rmi_kb/aelith/info.json | 5 +++++ keyboards/rmi_kb/chevron/config.h | 17 --------------- keyboards/rmi_kb/chevron/info.json | 5 +++++ keyboards/rmi_kb/herringbone/pro/config.h | 17 --------------- keyboards/rmi_kb/herringbone/pro/info.json | 5 +++++ keyboards/rmi_kb/herringbone/v1/config.h | 17 --------------- keyboards/rmi_kb/herringbone/v1/info.json | 5 +++++ keyboards/rmi_kb/mona/v1/config.h | 17 --------------- keyboards/rmi_kb/mona/v1/info.json | 5 +++++ keyboards/rmi_kb/mona/v1_1/config.h | 35 ------------------------------ keyboards/rmi_kb/mona/v1_1/info.json | 5 +++++ keyboards/rmi_kb/mona/v32a/config.h | 35 ------------------------------ keyboards/rmi_kb/mona/v32a/info.json | 5 +++++ keyboards/rmi_kb/squishy65/config.h | 4 ---- keyboards/rmi_kb/squishy65/info.json | 5 +++++ keyboards/rmi_kb/squishyfrl/config.h | 18 --------------- keyboards/rmi_kb/squishyfrl/info.json | 5 +++++ keyboards/rmi_kb/squishytkl/config.h | 18 --------------- keyboards/rmi_kb/squishytkl/info.json | 5 +++++ keyboards/rmi_kb/tkl_ff/config.h | 17 --------------- keyboards/rmi_kb/tkl_ff/info.json | 5 +++++ keyboards/rmi_kb/wete/v1/config.h | 4 ---- keyboards/rmi_kb/wete/v1/info.json | 5 +++++ keyboards/rmi_kb/wete/v2/config.h | 17 --------------- keyboards/rmi_kb/wete/v2/info.json | 5 +++++ 26 files changed, 65 insertions(+), 233 deletions(-) delete mode 100644 keyboards/rmi_kb/mona/v1_1/config.h delete mode 100644 keyboards/rmi_kb/mona/v32a/config.h (limited to 'keyboards/rmi_kb') diff --git a/keyboards/rmi_kb/aelith/config.h b/keyboards/rmi_kb/aelith/config.h index 3456e2618a..d5f4fd90db 100644 --- a/keyboards/rmi_kb/aelith/config.h +++ b/keyboards/rmi_kb/aelith/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 { D5, D1, D0, D6, A7 } -#define MATRIX_COL_PINS { D7, C0, C1, C2, C3, C4, C5, C6, C7, A6, A5, A0, A1, A2, A3, A4 } - -/* 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/rmi_kb/aelith/info.json b/keyboards/rmi_kb/aelith/info.json index 87c491a7bd..1fc94b0d72 100644 --- a/keyboards/rmi_kb/aelith/info.json +++ b/keyboards/rmi_kb/aelith/info.json @@ -8,6 +8,11 @@ "pid": "0xE460", "device_version": "0.1.2" }, + "matrix_pins": { + "cols": ["D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A6", "A5", "A0", "A1", "A2", "A3", "A4"], + "rows": ["D5", "D1", "D0", "D6", "A7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", "community_layouts": ["alice", "alice_split_bs"], diff --git a/keyboards/rmi_kb/chevron/config.h b/keyboards/rmi_kb/chevron/config.h index cd4c43391b..77ef2c19b8 100644 --- a/keyboards/rmi_kb/chevron/config.h +++ b/keyboards/rmi_kb/chevron/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 { D5, D6, C0, D7, NO_PIN } -#define MATRIX_COL_PINS { A5, A6, A7, C7, C6, C5, C4, C3, C2, C1, A4, A3, A2, B4 } - -/* 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/rmi_kb/chevron/info.json b/keyboards/rmi_kb/chevron/info.json index bdca6506f1..796fc0702f 100644 --- a/keyboards/rmi_kb/chevron/info.json +++ b/keyboards/rmi_kb/chevron/info.json @@ -8,6 +8,11 @@ "pid": "0xC4EE", "device_version": "0.1.2" }, + "matrix_pins": { + "cols": ["A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "A4", "A3", "A2", "B4"], + "rows": ["D5", "D6", "C0", "D7", null] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "A1"} diff --git a/keyboards/rmi_kb/herringbone/pro/config.h b/keyboards/rmi_kb/herringbone/pro/config.h index ddf1d3199d..06c118b1b6 100644 --- a/keyboards/rmi_kb/herringbone/pro/config.h +++ b/keyboards/rmi_kb/herringbone/pro/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 { C4, C5, C6, C7, A7, A6, NO_PIN } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 } - -/* 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/rmi_kb/herringbone/pro/info.json b/keyboards/rmi_kb/herringbone/pro/info.json index 5eebdf3b79..8545cfc95d 100644 --- a/keyboards/rmi_kb/herringbone/pro/info.json +++ b/keyboards/rmi_kb/herringbone/pro/info.json @@ -8,6 +8,11 @@ "pid": "0x440B", "device_version": "0.1.2" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"], + "rows": ["C4", "C5", "C6", "C7", "A7", "A6", null] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C3", "pin_b": "C2"} diff --git a/keyboards/rmi_kb/herringbone/v1/config.h b/keyboards/rmi_kb/herringbone/v1/config.h index f5ea6b0f4e..06c118b1b6 100644 --- a/keyboards/rmi_kb/herringbone/v1/config.h +++ b/keyboards/rmi_kb/herringbone/v1/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 { C4, C5, C6, C7, A7, A6 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, D6, D5, D1, B0, B1, B2, B3, B4, D7 } - -/* 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/rmi_kb/herringbone/v1/info.json b/keyboards/rmi_kb/herringbone/v1/info.json index 2e12362994..f81f47813a 100644 --- a/keyboards/rmi_kb/herringbone/v1/info.json +++ b/keyboards/rmi_kb/herringbone/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x04E5", "device_version": "0.1.2" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "D6", "D5", "D1", "B0", "B1", "B2", "B3", "B4", "D7"], + "rows": ["C4", "C5", "C6", "C7", "A7", "A6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/rmi_kb/mona/v1/config.h b/keyboards/rmi_kb/mona/v1/config.h index fb03ca121c..b53bfc1554 100644 --- a/keyboards/rmi_kb/mona/v1/config.h +++ b/keyboards/rmi_kb/mona/v1/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 { D1, D5, B7, F0, F1 } -#define MATRIX_COL_PINS { D0, D3, D2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* 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/rmi_kb/mona/v1/info.json b/keyboards/rmi_kb/mona/v1/info.json index 84ed48762d..58f34b1677 100644 --- a/keyboards/rmi_kb/mona/v1/info.json +++ b/keyboards/rmi_kb/mona/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x404A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D3", "D2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["D1", "D5", "B7", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/rmi_kb/mona/v1_1/config.h b/keyboards/rmi_kb/mona/v1_1/config.h deleted file mode 100644 index d73274fb1c..0000000000 --- a/keyboards/rmi_kb/mona/v1_1/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Ramon Imbao - -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 - - -/* - * 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 { D1, D5, B7, F0, F1 } -#define MATRIX_COL_PINS { D0, D3, D2, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rmi_kb/mona/v1_1/info.json b/keyboards/rmi_kb/mona/v1_1/info.json index f59541cd83..ebf76b88d3 100644 --- a/keyboards/rmi_kb/mona/v1_1/info.json +++ b/keyboards/rmi_kb/mona/v1_1/info.json @@ -8,6 +8,11 @@ "pid": "0x404B", "device_version": "0.1.1" }, + "matrix_pins": { + "cols": ["D0", "D3", "D2", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["D1", "D5", "B7", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B3" }, diff --git a/keyboards/rmi_kb/mona/v32a/config.h b/keyboards/rmi_kb/mona/v32a/config.h deleted file mode 100644 index 2593026a78..0000000000 --- a/keyboards/rmi_kb/mona/v32a/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Ramon Imbao - -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 - - -/* - * 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 { C2, C3, D6, D1, A6 } -#define MATRIX_COL_PINS { B4, B3, B2, B1, B0, A0, A1, A2, A5, A4, A3, A7, D5, C7, C6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/rmi_kb/mona/v32a/info.json b/keyboards/rmi_kb/mona/v32a/info.json index 03d2dfa9f6..d7695d15bb 100644 --- a/keyboards/rmi_kb/mona/v32a/info.json +++ b/keyboards/rmi_kb/mona/v32a/info.json @@ -8,6 +8,11 @@ "pid": "0x4032", "device_version": "0.1.1" }, + "matrix_pins": { + "cols": ["B4", "B3", "B2", "B1", "B0", "A0", "A1", "A2", "A5", "A4", "A3", "A7", "D5", "C7", "C6"], + "rows": ["C2", "C3", "D6", "D1", "A6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C1" }, diff --git a/keyboards/rmi_kb/squishy65/config.h b/keyboards/rmi_kb/squishy65/config.h index ab44a877f7..463de85aa1 100644 --- a/keyboards/rmi_kb/squishy65/config.h +++ b/keyboards/rmi_kb/squishy65/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { A9, B9, B7, B6, B5, B4, B2, B1, B0, A7, A6, A5, A4, A10, A3, A2 } -#define MATRIX_ROW_PINS { A15, B3, A0, B10, B11 } -#define DIODE_DIRECTION COL2ROW - // RGB B4 #define RGB_DI_PIN B15 #define RGBLED_NUM 18 diff --git a/keyboards/rmi_kb/squishy65/info.json b/keyboards/rmi_kb/squishy65/info.json index 6e374d5f2b..9b00b9387a 100644 --- a/keyboards/rmi_kb/squishy65/info.json +++ b/keyboards/rmi_kb/squishy65/info.json @@ -8,6 +8,11 @@ "pid": "0x10B5", "device_version": "0.6.5" }, + "matrix_pins": { + "cols": ["A9", "B9", "B7", "B6", "B5", "B4", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A10", "A3", "A2"], + "rows": ["A15", "B3", "A0", "B10", "B11"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h index e84edd8c87..f7cae14b1b 100644 --- a/keyboards/rmi_kb/squishyfrl/config.h +++ b/keyboards/rmi_kb/squishyfrl/config.h @@ -17,24 +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 { B9, B8, A0, A1, A9, A8, B11, A6, A5} -#define MATRIX_COL_PINS { A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 } - - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C15 #ifdef RGB_DI_PIN # define RGBLED_NUM 16 diff --git a/keyboards/rmi_kb/squishyfrl/info.json b/keyboards/rmi_kb/squishyfrl/info.json index f2dc2ebd24..541ec06731 100644 --- a/keyboards/rmi_kb/squishyfrl/info.json +++ b/keyboards/rmi_kb/squishyfrl/info.json @@ -8,6 +8,11 @@ "pid": "0x4BE5", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"], + "rows": ["B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h index 20e98b3d53..f7cae14b1b 100644 --- a/keyboards/rmi_kb/squishytkl/config.h +++ b/keyboards/rmi_kb/squishytkl/config.h @@ -17,24 +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 { B3, B4, B5, C13, B9, B8, A0, A1, A9, A8, B11, A6, A5, C0 } -#define MATRIX_COL_PINS { A15, C10, C11, C12, D2, A7, C4, C5, B0, B1, B2, B10, B12, B13, B14, B15, C6, C9, C7, C8, A10, A4, C14, A3, A2, C3 } - - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN C15 #ifdef RGB_DI_PIN # define RGBLED_NUM 16 diff --git a/keyboards/rmi_kb/squishytkl/info.json b/keyboards/rmi_kb/squishytkl/info.json index 17236053ca..f8a33eea8e 100644 --- a/keyboards/rmi_kb/squishytkl/info.json +++ b/keyboards/rmi_kb/squishytkl/info.json @@ -8,6 +8,11 @@ "pid": "0x00B1", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["A15", "C10", "C11", "C12", "D2", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B12", "B13", "B14", "B15", "C6", "C9", "C7", "C8", "A10", "A4", "C14", "A3", "A2", "C3"], + "rows": ["B3", "B4", "B5", "C13", "B9", "B8", "A0", "A1", "A9", "A8", "B11", "A6", "A5", "C0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B6", "pin_b": "B7", "resolution": 1} diff --git a/keyboards/rmi_kb/tkl_ff/config.h b/keyboards/rmi_kb/tkl_ff/config.h index a2939dda1e..656deab55a 100644 --- a/keyboards/rmi_kb/tkl_ff/config.h +++ b/keyboards/rmi_kb/tkl_ff/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 { B2, B3, B7, D6, D3, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D5, B0, B1, D1 } - -/* 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/rmi_kb/tkl_ff/info.json b/keyboards/rmi_kb/tkl_ff/info.json index 5f263352ac..739178173c 100644 --- a/keyboards/rmi_kb/tkl_ff/info.json +++ b/keyboards/rmi_kb/tkl_ff/info.json @@ -7,6 +7,11 @@ "vid": "0xB16B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D5", "B0", "B1", "D1"], + "rows": ["B2", "B3", "B7", "D6", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/rmi_kb/wete/v1/config.h b/keyboards/rmi_kb/wete/v1/config.h index 4fa5e6e18b..758a6fabfe 100644 --- a/keyboards/rmi_kb/wete/v1/config.h +++ b/keyboards/rmi_kb/wete/v1/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_COL_PINS { B13, B14, B15, A8, B0, A7, A5, A4, A3, B9, C13, C14, C15, F0, F1, A0, A1, A2, B8, B7 } -#define MATRIX_ROW_PINS { A9, B12, B11, B10, B2, B1 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 diff --git a/keyboards/rmi_kb/wete/v1/info.json b/keyboards/rmi_kb/wete/v1/info.json index cf17e5966d..c2d2f03271 100644 --- a/keyboards/rmi_kb/wete/v1/info.json +++ b/keyboards/rmi_kb/wete/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x00B5", "device_version": "0.1.2" }, + "matrix_pins": { + "cols": ["B13", "B14", "B15", "A8", "B0", "A7", "A5", "A4", "A3", "B9", "C13", "C14", "C15", "F0", "F1", "A0", "A1", "A2", "B8", "B7"], + "rows": ["A9", "B12", "B11", "B10", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 24, diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h index baf134e5e9..475cb25078 100644 --- a/keyboards/rmi_kb/wete/v2/config.h +++ b/keyboards/rmi_kb/wete/v2/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 { B3, B2, B6, C6, C7, E6, F7, F6, F5, F4, F1, F0, NO_PIN } -#define MATRIX_COL_PINS { B1, B0, B7, B5, B4, D7, D6, D4, D5, D3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/rmi_kb/wete/v2/info.json b/keyboards/rmi_kb/wete/v2/info.json index c477304658..e110a7ff9e 100644 --- a/keyboards/rmi_kb/wete/v2/info.json +++ b/keyboards/rmi_kb/wete/v2/info.json @@ -8,6 +8,11 @@ "pid": "0x00B3", "device_version": "35.0.0" }, + "matrix_pins": { + "cols": ["B1", "B0", "B7", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["B3", "B2", "B6", "C6", "C7", "E6", "F7", "F6", "F5", "F4", "F1", "F0", null] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D1"} -- cgit v1.2.3