diff options
author | Ryan <fauxpark@gmail.com> | 2023-03-06 09:53:52 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-05 22:53:52 +0000 |
commit | 23c365b023e409885e6f201f12df56e5145dde47 (patch) | |
tree | 062e72be726939d5f6ddda944facb423bbf386cf /keyboards/ggkeyboards | |
parent | b34d51d08d7083fc790db2562a4d39890f34886f (diff) |
Move matrix config to info.json, part 1 (#19985)
Diffstat (limited to 'keyboards/ggkeyboards')
-rw-r--r-- | keyboards/ggkeyboards/genesis/hotswap/config.h | 35 | ||||
-rw-r--r-- | keyboards/ggkeyboards/genesis/hotswap/info.json | 5 | ||||
-rw-r--r-- | keyboards/ggkeyboards/genesis/solder/config.h | 33 | ||||
-rw-r--r-- | keyboards/ggkeyboards/genesis/solder/info.json | 5 |
4 files changed, 10 insertions, 68 deletions
diff --git a/keyboards/ggkeyboards/genesis/hotswap/config.h b/keyboards/ggkeyboards/genesis/hotswap/config.h deleted file mode 100644 index b2d8ee9014..0000000000 --- a/keyboards/ggkeyboards/genesis/hotswap/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 Steven Phillips (Spooknik) - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#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 \ - { C5, C4, C3, C2, C1, C0 } -#define MATRIX_COL_PINS \ - { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ggkeyboards/genesis/hotswap/info.json b/keyboards/ggkeyboards/genesis/hotswap/info.json index 35b52cb9c4..8963434bd9 100644 --- a/keyboards/ggkeyboards/genesis/hotswap/info.json +++ b/keyboards/ggkeyboards/genesis/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0xD4D3", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C6", "C7"], + "rows": ["C5", "C4", "C3", "C2", "C1", "C0"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/ggkeyboards/genesis/solder/config.h b/keyboards/ggkeyboards/genesis/solder/config.h deleted file mode 100644 index 6bdd3cc57c..0000000000 --- a/keyboards/ggkeyboards/genesis/solder/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Steven Phillips (Spooknik) - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#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 { C5, C4, C3, C2, C1, C0 } -#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C6, C7 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ggkeyboards/genesis/solder/info.json b/keyboards/ggkeyboards/genesis/solder/info.json index ebc309987c..27b1d36847 100644 --- a/keyboards/ggkeyboards/genesis/solder/info.json +++ b/keyboards/ggkeyboards/genesis/solder/info.json @@ -8,6 +8,11 @@ "pid": "0xD4D2", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C6", "C7"], + "rows": ["C5", "C4", "C3", "C2", "C1", "C0"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layout_aliases": { |