diff options
Diffstat (limited to 'keyboards/knobgoblin')
| -rw-r--r-- | keyboards/knobgoblin/config.h | 8 | ||||
| -rw-r--r-- | keyboards/knobgoblin/info.json | 51 | ||||
| -rw-r--r-- | keyboards/knobgoblin/knobgoblin.c | 2 | ||||
| -rw-r--r-- | keyboards/knobgoblin/knobgoblin.h | 32 |
4 files changed, 28 insertions, 65 deletions
diff --git a/keyboards/knobgoblin/config.h b/keyboards/knobgoblin/config.h index 435c727db5..101faa7619 100644 --- a/keyboards/knobgoblin/config.h +++ b/keyboards/knobgoblin/config.h @@ -16,12 +16,4 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, B6, B2, B3, B1 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } - #define OLED_TIMEOUT 180000 - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/knobgoblin/info.json b/keyboards/knobgoblin/info.json index c0d8de34e9..bdf826777d 100644 --- a/keyboards/knobgoblin/info.json +++ b/keyboards/knobgoblin/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["D4", "B6", "B2", "B3", "B1"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F7", "pin_b": "F6"}, @@ -23,34 +28,32 @@ "layouts": { "LAYOUT_ortho": { "layout": [ - - {"label": "F17", "x": 1, "y": 0}, - {"label": "F18", "x": 2, "y": 0}, - {"label": "F19", "x": 3, "y": 0}, - {"label": "F20", "x": 4, "y": 0}, - - {"label": "F13", "x": 1, "y": 1}, - {"label": "F14", "x": 2, "y": 1}, - {"label": "F15", "x": 3, "y": 1}, - {"label": "F16", "x": 4, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, - {"label": "F9", "x": 1, "y": 2}, - {"label": "F10", "x": 2, "y": 2}, - {"label": "F11", "x": 3, "y": 2}, - {"label": "F12", "x": 4, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, - {"label": "K2", "x": 0, "y": 3}, - {"label": "F5", "x": 1, "y": 3}, - {"label": "F6", "x": 2, "y": 3}, - {"label": "F7", "x": 3, "y": 3}, - {"label": "F8", "x": 4, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, - {"label": "K1", "x": 0, "y": 4}, - {"label": "F1", "x": 1, "y": 4}, - {"label": "F2", "x": 2, "y": 4}, - {"label": "F3", "x": 3, "y": 4}, - {"label": "F4", "x": 4, "y": 4} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4} ] } } diff --git a/keyboards/knobgoblin/knobgoblin.c b/keyboards/knobgoblin/knobgoblin.c index fcf86a3a40..55112847df 100644 --- a/keyboards/knobgoblin/knobgoblin.c +++ b/keyboards/knobgoblin/knobgoblin.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "knobgoblin.h" +#include "quantum.h" #ifdef ENCODER_ENABLE /* assign keycodes to the encoder rotation */ diff --git a/keyboards/knobgoblin/knobgoblin.h b/keyboards/knobgoblin/knobgoblin.h deleted file mode 100644 index b5b2cf7e5f..0000000000 --- a/keyboards/knobgoblin/knobgoblin.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2020 MrT1ddl3s - * - * 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 -#include "quantum.h" - -#define LAYOUT_ortho( \ - K01, K02, K03, K04, \ - K11, K12, K13, K14, \ - K21, K22, K23, K24, \ - K30, K31, K32, K33, K34, \ - K40, K41, K42, K43, K44 \ -) { \ - { KC_NO, K01, K02, K03, K04 }, \ - { KC_NO, K11, K12, K13, K14 }, \ - { KC_NO, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, K34 }, \ - { K40, K41, K42, K43, K44 } \ -} |