diff options
Diffstat (limited to 'keyboards/gkeyboard')
-rw-r--r-- | keyboards/gkeyboard/gkb_m16/config.h | 17 | ||||
-rw-r--r-- | keyboards/gkeyboard/gkb_m16/gkb_m16.c | 17 | ||||
-rw-r--r-- | keyboards/gkeyboard/gkb_m16/info.json | 5 | ||||
-rw-r--r-- | keyboards/gkeyboard/gpad8_2r/info.json | 20 |
4 files changed, 15 insertions, 44 deletions
diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h index 9589c7887d..036340f2fd 100644 --- a/keyboards/gkeyboard/gkb_m16/config.h +++ b/keyboards/gkeyboard/gkb_m16/config.h @@ -17,23 +17,6 @@ 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 { D4, D5, D6, D7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F1 #ifdef RGB_DI_PIN #define RGBLED_NUM 4 diff --git a/keyboards/gkeyboard/gkb_m16/gkb_m16.c b/keyboards/gkeyboard/gkb_m16/gkb_m16.c deleted file mode 100644 index 5a1f7f13e3..0000000000 --- a/keyboards/gkeyboard/gkb_m16/gkb_m16.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 gkeyboard - * - * 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/>. - */ - -#include "gkb_m16.h" diff --git a/keyboards/gkeyboard/gkb_m16/info.json b/keyboards/gkeyboard/gkb_m16/info.json index ca200a1485..4719f1ee94 100644 --- a/keyboards/gkeyboard/gkb_m16/info.json +++ b/keyboards/gkeyboard/gkb_m16/info.json @@ -8,6 +8,11 @@ "pid": "0x4201", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7"], + "rows": ["D4", "D5", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/info.json index fcc900a35f..ea548c13ba 100644 --- a/keyboards/gkeyboard/gpad8_2r/info.json +++ b/keyboards/gkeyboard/gpad8_2r/info.json @@ -64,16 +64,16 @@ "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "x": 0.0, "y": 0.0 }, - { "matrix": [0, 3], "x": 3.0, "y": 0.0 }, - { "matrix": [1, 0], "x": 0.0, "y": 1.25 }, - { "matrix": [1, 1], "x": 1.0, "y": 1.25 }, - { "matrix": [1, 2], "x": 2.0, "y": 1.25 }, - { "matrix": [1, 3], "x": 3.0, "y": 1.25 }, - { "matrix": [2, 0], "x": 0.0, "y": 2.25 }, - { "matrix": [2, 1], "x": 1.0, "y": 2.25 }, - { "matrix": [2, 2], "x": 2.0, "y": 2.25 }, - { "matrix": [2, 3], "x": 3.0, "y": 2.25 } + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "matrix": [2, 0], "x": 0, "y": 2.25 }, + { "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "matrix": [2, 2], "x": 2, "y": 2.25 }, + { "matrix": [2, 3], "x": 3, "y": 2.25 } ] } } |