diff options
Diffstat (limited to 'keyboards/tkw/stoutgat')
-rw-r--r-- | keyboards/tkw/stoutgat/v1/config.h | 5 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v1/info.json | 5 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v1/v1.c | 17 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v2/config.h | 6 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v2/info.json | 36 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v2/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/tkw/stoutgat/v2/v2.c | 16 |
7 files changed, 27 insertions, 59 deletions
diff --git a/keyboards/tkw/stoutgat/v1/config.h b/keyboards/tkw/stoutgat/v1/config.h index 1eda8feab4..b168318aa0 100644 --- a/keyboards/tkw/stoutgat/v1/config.h +++ b/keyboards/tkw/stoutgat/v1/config.h @@ -18,8 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAP_CODE_DELAY 10 - -#define MATRIX_ROW_PINS { D1, D0, A0, A1, A2 } -#define MATRIX_COL_PINS { D6, D5, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json index e94e896858..038fbc3ca5 100644 --- a/keyboards/tkw/stoutgat/v1/info.json +++ b/keyboards/tkw/stoutgat/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x7811", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D5", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4"], + "rows": ["D1", "D0", "A0", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B3"}, diff --git a/keyboards/tkw/stoutgat/v1/v1.c b/keyboards/tkw/stoutgat/v1/v1.c deleted file mode 100644 index 10c82fd9f9..0000000000 --- a/keyboards/tkw/stoutgat/v1/v1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Thys de Wet - * - * 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 QMK_KEYBOARD_H diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h index 8161a873e5..a102a34946 100644 --- a/keyboards/tkw/stoutgat/v2/config.h +++ b/keyboards/tkw/stoutgat/v2/config.h @@ -15,12 +15,6 @@ */ #pragma once - -#define MATRIX_COL_PINS { B0, A7, A6, A5, A4, A3, A1, A0, C15, C14, C13, A15, B3, B4, B5} -#define MATRIX_ROW_PINS { B6, A2, B7, B9, B8 } -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define MATRIX_IO_DELAY 5 #define TAP_CODE_DELAY 10 diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json index 0b0877b38b..928dd8acd7 100644 --- a/keyboards/tkw/stoutgat/v2/info.json +++ b/keyboards/tkw/stoutgat/v2/info.json @@ -8,6 +8,14 @@ "pid": "0x7811", "device_version": "0.0.2" }, + "ws2812": { + "driver": "pwm" + }, + "matrix_pins": { + "cols": ["B0", "A7", "A6", "A5", "A4", "A3", "A1", "A0", "C15", "C14", "C13", "A15", "B3", "B4", "B5"], + "rows": ["B6", "A2", "B7", "B9", "B8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B14", "pin_b": "B15"}, @@ -50,19 +58,19 @@ {"x": 16.25, "y": 1}, {"x": 1.25, "y": 2, "w": 1.75}, - {"x": 3.0, "y": 2}, - {"x": 4.0, "y": 2}, - {"x": 5.0, "y": 2}, - {"x": 6.0, "y": 2}, - {"x": 7.0, "y": 2}, - {"x": 8.0, "y": 2}, - {"x": 9.0, "y": 2}, - {"x": 10.0, "y": 2}, - {"x": 11.0, "y": 2}, - {"x": 12.0, "y": 2}, - {"x": 13.0, "y": 2}, - {"x": 14.0, "y": 2}, - {"x": 15.0, "y": 1, "w": 1.25, "h": 2}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2}, + {"x": 5, "y": 2}, + {"x": 6, "y": 2}, + {"x": 7, "y": 2}, + {"x": 8, "y": 2}, + {"x": 9, "y": 2}, + {"x": 10, "y": 2}, + {"x": 11, "y": 2}, + {"x": 12, "y": 2}, + {"x": 13, "y": 2}, + {"x": 14, "y": 2}, + {"x": 15, "y": 1, "w": 1.25, "h": 2}, {"x": 16.25, "y": 2}, {"x": 0, "y": 3}, @@ -86,7 +94,7 @@ {"x": 1.25, "y": 4, "w": 1.25}, {"x": 2.5, "y": 4, "w": 1.25}, {"x": 3.75, "y": 4, "w": 1.25}, - {"x": 5.0, "y": 4, "w": 6.25}, + {"x": 5, "y": 4, "w": 6.25}, {"x": 11.25, "y": 4}, {"x": 12.25, "y": 4}, {"x": 13.25, "y": 4}, diff --git a/keyboards/tkw/stoutgat/v2/rules.mk b/keyboards/tkw/stoutgat/v2/rules.mk index 6dc2e4a634..477d680add 100644 --- a/keyboards/tkw/stoutgat/v2/rules.mk +++ b/keyboards/tkw/stoutgat/v2/rules.mk @@ -13,7 +13,6 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow ENCODER_ENABLE = yes # Enable rotary encoder support AUDIO_ENABLE = no # Audio output -WS2812_DRIVER = pwm OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE DEFAULT_FOLDER = tkw/stoutgat/v2/f411 diff --git a/keyboards/tkw/stoutgat/v2/v2.c b/keyboards/tkw/stoutgat/v2/v2.c deleted file mode 100644 index 030f056abf..0000000000 --- a/keyboards/tkw/stoutgat/v2/v2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Thys de Wet - * - * 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 "v2.h" |