diff options
Diffstat (limited to 'keyboards/tkw')
| -rw-r--r-- | keyboards/tkw/grandiceps/config.h | 9 | ||||
| -rw-r--r-- | keyboards/tkw/grandiceps/grandiceps.c | 16 | ||||
| -rw-r--r-- | keyboards/tkw/grandiceps/grandiceps.h | 38 | ||||
| -rw-r--r-- | keyboards/tkw/grandiceps/info.json | 91 | ||||
| -rw-r--r-- | keyboards/tkw/grandiceps/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/tkw/stoutgat/v1/config.h | 5 | ||||
| -rw-r--r-- | keyboards/tkw/stoutgat/v1/info.json | 301 | ||||
| -rw-r--r-- | keyboards/tkw/stoutgat/v1/v1.c | 17 | ||||
| -rw-r--r-- | keyboards/tkw/stoutgat/v1/v1.h | 71 | ||||
| -rw-r--r-- | keyboards/tkw/stoutgat/v2/config.h | 7 | ||||
| -rw-r--r-- | keyboards/tkw/stoutgat/v2/info.json | 386 | ||||
| -rw-r--r-- | keyboards/tkw/stoutgat/v2/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/tkw/stoutgat/v2/v2.c | 16 | ||||
| -rw-r--r-- | keyboards/tkw/stoutgat/v2/v2.h | 75 |
14 files changed, 626 insertions, 408 deletions
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h index 16d91b69a2..b6fc3a66a2 100644 --- a/keyboards/tkw/grandiceps/config.h +++ b/keyboards/tkw/grandiceps/config.h @@ -15,20 +15,11 @@ */ #pragma once - -#define MATRIX_COL_PINS { B0, A7, A3, A5, A4, A2 } -#define MATRIX_ROW_PINS { B12, A6, B13, B9, B8 } -#define MATRIX_COL_PINS_RIGHT { B0, A7, A3, A5, A4, A2 } -#define MATRIX_ROW_PINS_RIGHT { B12, A6, B13, B9, B8 } - -#define DIODE_DIRECTION COL2ROW - #define SELECT_SOFT_SERIAL_SPEED 1 #define MATRIX_IO_DELAY 5 #define TAP_CODE_DELAY 10 -#define RGB_DI_PIN B1 #define RGBLED_NUM 16 #define RGBLED_SPLIT { 8,8 } #define RGBLIGHT_LIMIT_VAL 120 diff --git a/keyboards/tkw/grandiceps/grandiceps.c b/keyboards/tkw/grandiceps/grandiceps.c deleted file mode 100644 index bfb67dfc2c..0000000000 --- a/keyboards/tkw/grandiceps/grandiceps.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 "grandiceps.h" diff --git a/keyboards/tkw/grandiceps/grandiceps.h b/keyboards/tkw/grandiceps/grandiceps.h deleted file mode 100644 index ecb92fd39a..0000000000 --- a/keyboards/tkw/grandiceps/grandiceps.h +++ /dev/null @@ -1,38 +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/>. - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index 4d91a00c84..c5467142a5 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -6,13 +6,28 @@ "vid": "0xFEED", "pid": "0x7812" }, + "ws2812": { + "pin": "B1", + "driver": "pwm" + }, + "matrix_pins": { + "cols": ["B0", "A7", "A3", "A5", "A4", "A2"], + "rows": ["B12", "A6", "B13", "B9", "B8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B14", "pin_b": "B15"} ] }, "split": { - "soft_serial_pin": "A15" + "soft_serial_pin": "A15", + "matrix_pins": { + "right": { + "cols": ["B0", "A7", "A3", "A5", "A4", "A2"], + "rows": ["B12", "A6", "B13", "B9", "B8"] + } + } }, "processor": "STM32F411", "bootloader": "stm32-dfu", @@ -20,11 +35,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5}, - {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5}, - {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5}, - {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5}, - {"x":1, "y":4.375}, {"x":2, "y":4.125}, {"x":3, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12.5, "y":4.15}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375} + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 10.5, "y": 0.25}, + {"matrix": [5, 4], "x": 11.5, "y": 0.125}, + {"matrix": [5, 3], "x": 12.5, "y": 0}, + {"matrix": [5, 2], "x": 13.5, "y": 0.125}, + {"matrix": [5, 1], "x": 14.5, "y": 0.375}, + {"matrix": [5, 0], "x": 15.5, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 10.5, "y": 1.25}, + {"matrix": [6, 4], "x": 11.5, "y": 1.125}, + {"matrix": [6, 3], "x": 12.5, "y": 1}, + {"matrix": [6, 2], "x": 13.5, "y": 1.125}, + {"matrix": [6, 1], "x": 14.5, "y": 1.375}, + {"matrix": [6, 0], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 10.5, "y": 2.25}, + {"matrix": [7, 4], "x": 11.5, "y": 2.125}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 2], "x": 13.5, "y": 2.125}, + {"matrix": [7, 1], "x": 14.5, "y": 2.375}, + {"matrix": [7, 0], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 5], "x": 6, "y": 2.75}, + + {"matrix": [9, 5], "x": 9.5, "y": 2.75}, + {"matrix": [8, 5], "x": 10.5, "y": 3.25}, + {"matrix": [8, 4], "x": 11.5, "y": 3.125}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 2], "x": 13.5, "y": 3.125}, + {"matrix": [8, 1], "x": 14.5, "y": 3.375}, + {"matrix": [8, 0], "x": 15.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 1, "y": 4.375}, + {"matrix": [4, 1], "x": 2, "y": 4.125}, + {"matrix": [4, 2], "x": 3, "y": 4.15}, + {"matrix": [4, 3], "x": 4.5, "y": 4.25}, + {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5}, + + {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5}, + {"matrix": [9, 3], "x": 11, "y": 4.25}, + {"matrix": [9, 2], "x": 12.5, "y": 4.15}, + {"matrix": [9, 1], "x": 13.5, "y": 4.125}, + {"matrix": [9, 0], "x": 14.5, "y": 4.375} ] } } diff --git a/keyboards/tkw/grandiceps/rules.mk b/keyboards/tkw/grandiceps/rules.mk index 1b481a9e1e..2565f116a1 100644 --- a/keyboards/tkw/grandiceps/rules.mk +++ b/keyboards/tkw/grandiceps/rules.mk @@ -17,7 +17,6 @@ SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart OLED_ENABLE = yes OLED_DRIVER = SSD1306 -WS2812_DRIVER = pwm OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE DEFAULT_FOLDER = tkw/grandiceps/rev1 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..eda564e4ed 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"}, @@ -18,84 +23,238 @@ "bootloader": "usbasploader", "community_layouts": ["65_iso", "65_ansi"], "layouts": { + "LAYOUT_65_ansi": { + "layout": [ + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0}, + + {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 16, "y": 0}, + {"label": "K12", "matrix": [1, 2], "x": 17, "y": 0}, + {"label": "K13", "matrix": [1, 3], "x": 18, "y": 0}, + {"label": "K14", "matrix": [1, 4], "x": 19, "y": 0}, + {"label": "K15", "matrix": [1, 5], "x": 20, "y": 0}, + {"label": "K16", "matrix": [1, 6], "x": 21, "y": 0}, + {"label": "K17", "matrix": [1, 7], "x": 22, "y": 0}, + {"label": "K18", "matrix": [1, 8], "x": 23, "y": 0}, + {"label": "K19", "matrix": [1, 9], "x": 24, "y": 0}, + {"label": "K1A", "matrix": [1, 10], "x": 25, "y": 0}, + {"label": "K1B", "matrix": [1, 11], "x": 26, "y": 0}, + {"label": "K1C", "matrix": [1, 12], "x": 27, "y": 0}, + {"label": "K1D", "matrix": [1, 13], "x": 28, "y": 0}, + {"label": "K1E", "matrix": [1, 14], "x": 29, "y": 0}, + + {"label": "K20", "matrix": [2, 0], "x": 30, "y": 0}, + {"label": "K21", "matrix": [2, 1], "x": 31, "y": 0}, + {"label": "K22", "matrix": [2, 2], "x": 32, "y": 0}, + {"label": "K23", "matrix": [2, 3], "x": 33, "y": 0}, + {"label": "K24", "matrix": [2, 4], "x": 34, "y": 0}, + {"label": "K25", "matrix": [2, 5], "x": 35, "y": 0}, + {"label": "K26", "matrix": [2, 6], "x": 36, "y": 0}, + {"label": "K27", "matrix": [2, 7], "x": 37, "y": 0}, + {"label": "K28", "matrix": [2, 8], "x": 38, "y": 0}, + {"label": "K29", "matrix": [2, 9], "x": 39, "y": 0}, + {"label": "K2A", "matrix": [2, 10], "x": 40, "y": 0}, + {"label": "K2B", "matrix": [2, 11], "x": 41, "y": 0}, + {"label": "K2D", "matrix": [2, 13], "x": 42, "y": 0}, + {"label": "K2E", "matrix": [2, 14], "x": 43, "y": 0}, + + {"label": "K30", "matrix": [3, 0], "x": 44, "y": 0}, + {"label": "K32", "matrix": [3, 2], "x": 45, "y": 0}, + {"label": "K33", "matrix": [3, 3], "x": 46, "y": 0}, + {"label": "K34", "matrix": [3, 4], "x": 47, "y": 0}, + {"label": "K35", "matrix": [3, 5], "x": 48, "y": 0}, + {"label": "K36", "matrix": [3, 6], "x": 49, "y": 0}, + {"label": "K37", "matrix": [3, 7], "x": 50, "y": 0}, + {"label": "K38", "matrix": [3, 8], "x": 51, "y": 0}, + {"label": "K39", "matrix": [3, 9], "x": 52, "y": 0}, + {"label": "K3A", "matrix": [3, 10], "x": 53, "y": 0}, + {"label": "K3B", "matrix": [3, 11], "x": 54, "y": 0}, + {"label": "K3C", "matrix": [3, 12], "x": 55, "y": 0}, + {"label": "K3D", "matrix": [3, 13], "x": 56, "y": 0}, + {"label": "K3E", "matrix": [3, 14], "x": 57, "y": 0}, + + {"label": "K40", "matrix": [4, 0], "x": 58, "y": 0}, + {"label": "K41", "matrix": [4, 1], "x": 59, "y": 0}, + {"label": "K42", "matrix": [4, 2], "x": 60, "y": 0}, + {"label": "K46", "matrix": [4, 6], "x": 61, "y": 0}, + {"label": "K49", "matrix": [4, 9], "x": 62, "y": 0}, + {"label": "K4A", "matrix": [4, 10], "x": 63, "y": 0}, + {"label": "K4B", "matrix": [4, 11], "x": 64, "y": 0}, + {"label": "K4C", "matrix": [4, 12], "x": 65, "y": 0}, + {"label": "K4D", "matrix": [4, 13], "x": 66, "y": 0}, + {"label": "K4E", "matrix": [4, 14], "x": 67, "y": 0} + ] + }, + "LAYOUT_65_iso": { + "layout": [ + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0}, + + {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 16, "y": 0}, + {"label": "K12", "matrix": [1, 2], "x": 17, "y": 0}, + {"label": "K13", "matrix": [1, 3], "x": 18, "y": 0}, + {"label": "K14", "matrix": [1, 4], "x": 19, "y": 0}, + {"label": "K15", "matrix": [1, 5], "x": 20, "y": 0}, + {"label": "K16", "matrix": [1, 6], "x": 21, "y": 0}, + {"label": "K17", "matrix": [1, 7], "x": 22, "y": 0}, + {"label": "K18", "matrix": [1, 8], "x": 23, "y": 0}, + {"label": "K19", "matrix": [1, 9], "x": 24, "y": 0}, + {"label": "K1A", "matrix": [1, 10], "x": 25, "y": 0}, + {"label": "K1B", "matrix": [1, 11], "x": 26, "y": 0}, + {"label": "K1C", "matrix": [1, 12], "x": 27, "y": 0}, + {"label": "K1E", "matrix": [1, 14], "x": 28, "y": 0}, + + {"label": "K20", "matrix": [2, 0], "x": 29, "y": 0}, + {"label": "K21", "matrix": [2, 1], "x": 30, "y": 0}, + {"label": "K22", "matrix": [2, 2], "x": 31, "y": 0}, + {"label": "K23", "matrix": [2, 3], "x": 32, "y": 0}, + {"label": "K24", "matrix": [2, 4], "x": 33, "y": 0}, + {"label": "K25", "matrix": [2, 5], "x": 34, "y": 0}, + {"label": "K26", "matrix": [2, 6], "x": 35, "y": 0}, + {"label": "K27", "matrix": [2, 7], "x": 36, "y": 0}, + {"label": "K28", "matrix": [2, 8], "x": 37, "y": 0}, + {"label": "K29", "matrix": [2, 9], "x": 38, "y": 0}, + {"label": "K2A", "matrix": [2, 10], "x": 39, "y": 0}, + {"label": "K2B", "matrix": [2, 11], "x": 40, "y": 0}, + {"label": "K2D", "matrix": [2, 13], "x": 41, "y": 0}, + {"label": "K1D", "matrix": [1, 13], "x": 42, "y": 0}, + {"label": "K2E", "matrix": [2, 14], "x": 43, "y": 0}, + + {"label": "K30", "matrix": [3, 0], "x": 44, "y": 0}, + {"label": "K31", "matrix": [3, 1], "x": 45, "y": 0}, + {"label": "K32", "matrix": [3, 2], "x": 46, "y": 0}, + {"label": "K33", "matrix": [3, 3], "x": 47, "y": 0}, + {"label": "K34", "matrix": [3, 4], "x": 48, "y": 0}, + {"label": "K35", "matrix": [3, 5], "x": 49, "y": 0}, + {"label": "K36", "matrix": [3, 6], "x": 50, "y": 0}, + {"label": "K37", "matrix": [3, 7], "x": 51, "y": 0}, + {"label": "K38", "matrix": [3, 8], "x": 52, "y": 0}, + {"label": "K39", "matrix": [3, 9], "x": 53, "y": 0}, + {"label": "K3A", "matrix": [3, 10], "x": 54, "y": 0}, + {"label": "K3B", "matrix": [3, 11], "x": 55, "y": 0}, + {"label": "K3C", "matrix": [3, 12], "x": 56, "y": 0}, + {"label": "K3D", "matrix": [3, 13], "x": 57, "y": 0}, + {"label": "K3E", "matrix": [3, 14], "x": 58, "y": 0}, + + {"label": "K40", "matrix": [4, 0], "x": 59, "y": 0}, + {"label": "K41", "matrix": [4, 1], "x": 60, "y": 0}, + {"label": "K42", "matrix": [4, 2], "x": 61, "y": 0}, + {"label": "K46", "matrix": [4, 6], "x": 62, "y": 0}, + {"label": "K49", "matrix": [4, 9], "x": 63, "y": 0}, + {"label": "K4A", "matrix": [4, 10], "x": 64, "y": 0}, + {"label": "K4B", "matrix": [4, 11], "x": 65, "y": 0}, + {"label": "K4C", "matrix": [4, 12], "x": 66, "y": 0}, + {"label": "K4D", "matrix": [4, 13], "x": 67, "y": 0}, + {"label": "K4E", "matrix": [4, 14], "x": 68, "y": 0} + ] + }, "LAYOUT_encoder": { "layout": [ - {"x": 1,"y": 0}, - {"x": 14,"y": 0}, + {"label": "K44", "matrix": [4, 4], "x": 1, "y": 0}, + + {"label": "K48", "matrix": [4, 8], "x": 14, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1, "w": 2}, - {"x": 15, "y": 1}, + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 1}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 1}, + {"label": "K02", "matrix": [0, 2], "x": 2, "y": 1}, + {"label": "K03", "matrix": [0, 3], "x": 3, "y": 1}, + {"label": "K04", "matrix": [0, 4], "x": 4, "y": 1}, + {"label": "K05", "matrix": [0, 5], "x": 5, "y": 1}, + {"label": "K06", "matrix": [0, 6], "x": 6, "y": 1}, + {"label": "K07", "matrix": [0, 7], "x": 7, "y": 1}, + {"label": "K08", "matrix": [0, 8], "x": 8, "y": 1}, + {"label": "K09", "matrix": [0, 9], "x": 9, "y": 1}, + {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 1}, + {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 1}, + {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 1}, + {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 1, "w": 2}, + {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 1}, - {"x": 0, "y": 2, "w": 1.5}, - {"x": 1.5, "y": 2}, - {"x": 2.5, "y": 2}, - {"x": 3.5, "y": 2}, - {"x": 4.5, "y": 2}, - {"x": 5.5, "y": 2}, - {"x": 6.5, "y": 2}, - {"x": 7.5, "y": 2}, - {"x": 8.5, "y": 2}, - {"x": 9.5, "y": 2}, - {"x": 10.5, "y": 2}, - {"x": 11.5, "y": 2}, - {"x": 12.5, "y": 2}, - {"x": 15, "y": 2}, + {"label": "K10", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5}, + {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 2}, + {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 2}, + {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 2}, + {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 2}, + {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 2}, + {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 2}, + {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 2}, + {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 2}, + {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 2}, + {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 2}, + {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 2}, + {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 2}, + {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 2}, - {"x": 0, "y": 3, "w": 1.75}, - {"x": 1.75, "y": 3}, - {"x": 2.75, "y": 3}, - {"x": 3.75, "y": 3}, - {"x": 4.75, "y": 3}, - {"x": 5.75, "y": 3}, - {"x": 6.75, "y": 3}, - {"x": 7.75, "y": 3}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 3}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3}, - {"x": 13.75, "y": 2, "w": 1.25, "h": 2}, - {"x": 15, "y": 3}, + {"label": "K20", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75}, + {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 3}, + {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 3}, + {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 3}, + {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 3}, + {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 3}, + {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 3}, + {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 3}, + {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 3}, + {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 3}, + {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 3}, + {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 3}, + {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 3}, + {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4}, - {"x": 2.25, "y": 4}, - {"x": 3.25, "y": 4}, - {"x": 4.25, "y": 4}, - {"x": 5.25, "y": 4}, - {"x": 6.25, "y": 4}, - {"x": 7.25, "y": 4}, - {"x": 8.25, "y": 4}, - {"x": 9.25, "y": 4}, - {"x": 10.25, "y": 4}, - {"x": 11.25, "y": 4}, - {"x": 12.25, "y": 4, "w": 1.75}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4}, + {"label": "K30", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 4}, + {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 4}, + {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 4}, + {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 4}, + {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 4}, + {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 4}, + {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 4}, + {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 4}, + {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 4}, + {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 4}, + {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 4}, + {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 4}, + {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 4}, - {"x": 0, "y": 5, "w": 1.25}, - {"x": 1.25, "y": 5, "w": 1.25}, - {"x": 2.5, "y": 5, "w": 1.25}, - {"x": 3.75, "y": 5, "w": 6.25}, - {"x": 10, "y": 5}, - {"x": 11, "y": 5}, - {"x": 12, "y": 5}, - {"x": 13, "y": 5}, - {"x": 14, "y": 5}, - {"x": 15, "y": 5} + {"label": "K40", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25}, + {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"label": "K49", "matrix": [4, 9], "x": 10, "y": 5}, + {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 5}, + {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 5}, + {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 5}, + {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 5}, + {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 5} ] } } 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/v1/v1.h b/keyboards/tkw/stoutgat/v1/v1.h deleted file mode 100644 index 7c8c715748..0000000000 --- a/keyboards/tkw/stoutgat/v1/v1.h +++ /dev/null @@ -1,71 +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/>. - */ - -#pragma once -#include "quantum.h" - -#define _x_ KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_encoder( \ - K44, K48, \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, K4E \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \ -{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ -{ K40, K41, K42, _x_, K44, _x_, K46, _x_, K48, K49, K4A, K4B, K4C, K4D, K4E } \ -} - -#define LAYOUT_65_iso( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, K4E \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \ -{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ -{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E } \ -} - -#define LAYOUT_65_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, K4E \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \ -{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ -{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \ -} diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h index 8161a873e5..b6a0586598 100644 --- a/keyboards/tkw/stoutgat/v2/config.h +++ b/keyboards/tkw/stoutgat/v2/config.h @@ -15,16 +15,9 @@ */ #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 -#define RGB_DI_PIN B1 #define RGBLED_NUM 13 #define RGBLIGHT_LIMIT_VAL 120 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json index 0b0877b38b..5cc58677d5 100644 --- a/keyboards/tkw/stoutgat/v2/info.json +++ b/keyboards/tkw/stoutgat/v2/info.json @@ -8,6 +8,15 @@ "pid": "0x7811", "device_version": "0.0.2" }, + "ws2812": { + "pin": "B1", + "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"}, @@ -16,83 +25,310 @@ }, "community_layouts": ["65_iso", "65_ansi"], "layouts": { + "LAYOUT_65_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"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}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 15, "y": 0}, + {"matrix": [1, 1], "x": 16, "y": 0}, + {"matrix": [1, 2], "x": 17, "y": 0}, + {"matrix": [1, 3], "x": 18, "y": 0}, + {"matrix": [1, 4], "x": 19, "y": 0}, + {"matrix": [1, 5], "x": 20, "y": 0}, + {"matrix": [1, 6], "x": 21, "y": 0}, + {"matrix": [1, 7], "x": 22, "y": 0}, + {"matrix": [1, 8], "x": 23, "y": 0}, + {"matrix": [1, 9], "x": 24, "y": 0}, + {"matrix": [1, 10], "x": 25, "y": 0}, + {"matrix": [1, 11], "x": 26, "y": 0}, + {"matrix": [1, 12], "x": 27, "y": 0}, + {"matrix": [1, 13], "x": 28, "y": 0}, + {"matrix": [1, 14], "x": 29, "y": 0}, + + {"matrix": [2, 0], "x": 30, "y": 0}, + {"matrix": [2, 1], "x": 31, "y": 0}, + {"matrix": [2, 2], "x": 32, "y": 0}, + {"matrix": [2, 3], "x": 33, "y": 0}, + {"matrix": [2, 4], "x": 34, "y": 0}, + {"matrix": [2, 5], "x": 35, "y": 0}, + {"matrix": [2, 6], "x": 36, "y": 0}, + {"matrix": [2, 7], "x": 37, "y": 0}, + {"matrix": [2, 8], "x": 38, "y": 0}, + {"matrix": [2, 9], "x": 39, "y": 0}, + {"matrix": [2, 10], "x": 40, "y": 0}, + {"matrix": [2, 11], "x": 41, "y": 0}, + {"matrix": [2, 13], "x": 42, "y": 0}, + {"matrix": [2, 14], "x": 43, "y": 0}, + + {"matrix": [3, 0], "x": 44, "y": 0}, + {"matrix": [3, 2], "x": 45, "y": 0}, + {"matrix": [3, 3], "x": 46, "y": 0}, + {"matrix": [3, 4], "x": 47, "y": 0}, + {"matrix": [3, 5], "x": 48, "y": 0}, + {"matrix": [3, 6], "x": 49, "y": 0}, + {"matrix": [3, 7], "x": 50, "y": 0}, + {"matrix": [3, 8], "x": 51, "y": 0}, + {"matrix": [3, 9], "x": 52, "y": 0}, + {"matrix": [3, 10], "x": 53, "y": 0}, + {"matrix": [3, 11], "x": 54, "y": 0}, + {"matrix": [3, 12], "x": 55, "y": 0}, + {"matrix": [3, 13], "x": 56, "y": 0}, + {"matrix": [3, 14], "x": 57, "y": 0}, + + {"matrix": [4, 0], "x": 58, "y": 0}, + {"matrix": [4, 1], "x": 59, "y": 0}, + {"matrix": [4, 2], "x": 60, "y": 0}, + {"matrix": [4, 6], "x": 61, "y": 0}, + {"matrix": [4, 9], "x": 62, "y": 0}, + {"matrix": [4, 10], "x": 63, "y": 0}, + {"matrix": [4, 11], "x": 64, "y": 0}, + {"matrix": [4, 12], "x": 65, "y": 0}, + {"matrix": [4, 13], "x": 66, "y": 0}, + {"matrix": [4, 14], "x": 67, "y": 0} + ] + }, + "LAYOUT_65_ansi_blocker": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"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}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 15, "y": 0}, + {"matrix": [1, 1], "x": 16, "y": 0}, + {"matrix": [1, 2], "x": 17, "y": 0}, + {"matrix": [1, 3], "x": 18, "y": 0}, + {"matrix": [1, 4], "x": 19, "y": 0}, + {"matrix": [1, 5], "x": 20, "y": 0}, + {"matrix": [1, 6], "x": 21, "y": 0}, + {"matrix": [1, 7], "x": 22, "y": 0}, + {"matrix": [1, 8], "x": 23, "y": 0}, + {"matrix": [1, 9], "x": 24, "y": 0}, + {"matrix": [1, 10], "x": 25, "y": 0}, + {"matrix": [1, 11], "x": 26, "y": 0}, + {"matrix": [1, 12], "x": 27, "y": 0}, + {"matrix": [1, 13], "x": 28, "y": 0}, + {"matrix": [1, 14], "x": 29, "y": 0}, + + {"matrix": [2, 0], "x": 30, "y": 0}, + {"matrix": [2, 1], "x": 31, "y": 0}, + {"matrix": [2, 2], "x": 32, "y": 0}, + {"matrix": [2, 3], "x": 33, "y": 0}, + {"matrix": [2, 4], "x": 34, "y": 0}, + {"matrix": [2, 5], "x": 35, "y": 0}, + {"matrix": [2, 6], "x": 36, "y": 0}, + {"matrix": [2, 7], "x": 37, "y": 0}, + {"matrix": [2, 8], "x": 38, "y": 0}, + {"matrix": [2, 9], "x": 39, "y": 0}, + {"matrix": [2, 10], "x": 40, "y": 0}, + {"matrix": [2, 11], "x": 41, "y": 0}, + {"matrix": [2, 12], "x": 42, "y": 0}, + {"matrix": [2, 14], "x": 43, "y": 0}, + + {"matrix": [3, 0], "x": 44, "y": 0}, + {"matrix": [3, 2], "x": 45, "y": 0}, + {"matrix": [3, 3], "x": 46, "y": 0}, + {"matrix": [3, 4], "x": 47, "y": 0}, + {"matrix": [3, 5], "x": 48, "y": 0}, + {"matrix": [3, 6], "x": 49, "y": 0}, + {"matrix": [3, 7], "x": 50, "y": 0}, + {"matrix": [3, 8], "x": 51, "y": 0}, + {"matrix": [3, 9], "x": 52, "y": 0}, + {"matrix": [3, 10], "x": 53, "y": 0}, + {"matrix": [3, 11], "x": 54, "y": 0}, + {"matrix": [3, 12], "x": 55, "y": 0}, + {"matrix": [3, 13], "x": 56, "y": 0}, + {"matrix": [3, 14], "x": 57, "y": 0}, + + {"matrix": [4, 0], "x": 58, "y": 0}, + {"matrix": [4, 1], "x": 59, "y": 0}, + {"matrix": [4, 2], "x": 60, "y": 0}, + {"matrix": [4, 6], "x": 61, "y": 0}, + {"matrix": [4, 9], "x": 62, "y": 0}, + {"matrix": [4, 11], "x": 63, "y": 0}, + {"matrix": [4, 12], "x": 64, "y": 0}, + {"matrix": [4, 13], "x": 65, "y": 0}, + {"matrix": [4, 14], "x": 66, "y": 0} + ] + }, + "LAYOUT_65_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"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}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 15, "y": 0}, + {"matrix": [1, 1], "x": 16, "y": 0}, + {"matrix": [1, 2], "x": 17, "y": 0}, + {"matrix": [1, 3], "x": 18, "y": 0}, + {"matrix": [1, 4], "x": 19, "y": 0}, + {"matrix": [1, 5], "x": 20, "y": 0}, + {"matrix": [1, 6], "x": 21, "y": 0}, + {"matrix": [1, 7], "x": 22, "y": 0}, + {"matrix": [1, 8], "x": 23, "y": 0}, + {"matrix": [1, 9], "x": 24, "y": 0}, + {"matrix": [1, 10], "x": 25, "y": 0}, + {"matrix": [1, 11], "x": 26, "y": 0}, + {"matrix": [1, 12], "x": 27, "y": 0}, + {"matrix": [1, 14], "x": 28, "y": 0}, + + {"matrix": [2, 0], "x": 29, "y": 0}, + {"matrix": [2, 1], "x": 30, "y": 0}, + {"matrix": [2, 2], "x": 31, "y": 0}, + {"matrix": [2, 3], "x": 32, "y": 0}, + {"matrix": [2, 4], "x": 33, "y": 0}, + {"matrix": [2, 5], "x": 34, "y": 0}, + {"matrix": [2, 6], "x": 35, "y": 0}, + {"matrix": [2, 7], "x": 36, "y": 0}, + {"matrix": [2, 8], "x": 37, "y": 0}, + {"matrix": [2, 9], "x": 38, "y": 0}, + {"matrix": [2, 10], "x": 39, "y": 0}, + {"matrix": [2, 11], "x": 40, "y": 0}, + {"matrix": [2, 12], "x": 41, "y": 0}, + {"matrix": [1, 13], "x": 42, "y": 0}, + {"matrix": [2, 14], "x": 43, "y": 0}, + + {"matrix": [3, 0], "x": 44, "y": 0}, + {"matrix": [3, 1], "x": 45, "y": 0}, + {"matrix": [3, 2], "x": 46, "y": 0}, + {"matrix": [3, 3], "x": 47, "y": 0}, + {"matrix": [3, 4], "x": 48, "y": 0}, + {"matrix": [3, 5], "x": 49, "y": 0}, + {"matrix": [3, 6], "x": 50, "y": 0}, + {"matrix": [3, 7], "x": 51, "y": 0}, + {"matrix": [3, 8], "x": 52, "y": 0}, + {"matrix": [3, 9], "x": 53, "y": 0}, + {"matrix": [3, 10], "x": 54, "y": 0}, + {"matrix": [3, 11], "x": 55, "y": 0}, + {"matrix": [3, 12], "x": 56, "y": 0}, + {"matrix": [3, 13], "x": 57, "y": 0}, + {"matrix": [3, 14], "x": 58, "y": 0}, + + {"matrix": [4, 0], "x": 59, "y": 0}, + {"matrix": [4, 1], "x": 60, "y": 0}, + {"matrix": [4, 2], "x": 61, "y": 0}, + {"matrix": [4, 6], "x": 62, "y": 0}, + {"matrix": [4, 9], "x": 63, "y": 0}, + {"matrix": [4, 10], "x": 64, "y": 0}, + {"matrix": [4, 11], "x": 65, "y": 0}, + {"matrix": [4, 12], "x": 66, "y": 0}, + {"matrix": [4, 13], "x": 67, "y": 0}, + {"matrix": [4, 14], "x": 68, "y": 0} + ] + }, "LAYOUT_encoder": { "layout": [ - {"x": 1.25, "y": 0}, - {"x": 2.25, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - {"x": 5.25, "y": 0}, - {"x": 6.25, "y": 0}, - {"x": 7.25, "y": 0}, - {"x": 8.25, "y": 0}, - {"x": 9.25, "y": 0}, - {"x": 10.25, "y": 0}, - {"x": 11.25, "y": 0}, - {"x": 12.25, "y": 0}, - {"x": 13.25, "y": 0}, - {"x": 14.25, "y": 0, "w": 2}, - {"x": 16.25, "y": 0}, - - {"x": 1.25, "y": 1, "w": 1.5}, - {"x": 2.75, "y": 1}, - {"x": 3.75, "y": 1}, - {"x": 4.75, "y": 1}, - {"x": 5.75, "y": 1}, - {"x": 6.75, "y": 1}, - {"x": 7.75, "y": 1}, - {"x": 8.75, "y": 1}, - {"x": 9.75, "y": 1}, - {"x": 10.75, "y": 1}, - {"x": 11.75, "y": 1}, - {"x": 12.75, "y": 1}, - {"x": 13.75, "y": 1}, - {"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": 16.25, "y": 2}, - - {"x": 0, "y": 3}, - - {"x": 1.25, "y": 3, "w": 1.25}, - {"x": 2.5, "y": 3}, - {"x": 3.5, "y": 3}, - {"x": 4.5, "y": 3}, - {"x": 5.5, "y": 3}, - {"x": 6.5, "y": 3}, - {"x": 7.5, "y": 3}, - {"x": 8.5, "y": 3}, - {"x": 9.5, "y": 3}, - {"x": 10.5, "y": 3}, - {"x": 11.5, "y": 3}, - {"x": 12.5, "y": 3}, - {"x": 13.5, "y": 3, "w": 1.75}, - {"x": 15.25, "y": 3}, - {"x": 16.25, "y": 3}, - - {"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": 11.25, "y": 4}, - {"x": 12.25, "y": 4}, - {"x": 13.25, "y": 4}, - {"x": 14.25, "y": 4}, - {"x": 15.25, "y": 4}, - {"x": 16.25, "y": 4} + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0}, + {"matrix": [0, 5], "x": 6.25, "y": 0}, + {"matrix": [0, 6], "x": 7.25, "y": 0}, + {"matrix": [0, 7], "x": 8.25, "y": 0}, + {"matrix": [0, 8], "x": 9.25, "y": 0}, + {"matrix": [0, 9], "x": 10.25, "y": 0}, + {"matrix": [0, 10], "x": 11.25, "y": 0}, + {"matrix": [0, 11], "x": 12.25, "y": 0}, + {"matrix": [0, 12], "x": 13.25, "y": 0}, + {"matrix": [0, 13], "x": 14.25, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 16.25, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2.75, "y": 1}, + {"matrix": [1, 2], "x": 3.75, "y": 1}, + {"matrix": [1, 3], "x": 4.75, "y": 1}, + {"matrix": [1, 4], "x": 5.75, "y": 1}, + {"matrix": [1, 5], "x": 6.75, "y": 1}, + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + {"matrix": [1, 10], "x": 11.75, "y": 1}, + {"matrix": [1, 11], "x": 12.75, "y": 1}, + {"matrix": [1, 12], "x": 13.75, "y": 1}, + {"matrix": [1, 14], "x": 16.25, "y": 1}, + + {"matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [2, 3], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 6, "y": 2}, + {"matrix": [2, 5], "x": 7, "y": 2}, + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2}, + {"matrix": [2, 11], "x": 13, "y": 2}, + {"matrix": [2, 12], "x": 14, "y": 2}, + {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 14], "x": 16.25, "y": 2}, + + {"matrix": [4, 4], "x": 0, "y": 3}, + {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 2.5, "y": 3}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 8.5, "y": 3}, + {"matrix": [3, 8], "x": 9.5, "y": 3}, + {"matrix": [3, 9], "x": 10.5, "y": 3}, + {"matrix": [3, 10], "x": 11.5, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3}, + {"matrix": [3, 12], "x": 13.5, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 15.25, "y": 3}, + {"matrix": [3, 14], "x": 16.25, "y": 3}, + + {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 5, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 11.25, "y": 4}, + {"matrix": [4, 10], "x": 12.25, "y": 4}, + {"matrix": [4, 11], "x": 13.25, "y": 4}, + {"matrix": [4, 12], "x": 14.25, "y": 4}, + {"matrix": [4, 13], "x": 15.25, "y": 4}, + {"matrix": [4, 14], "x": 16.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" diff --git a/keyboards/tkw/stoutgat/v2/v2.h b/keyboards/tkw/stoutgat/v2/v2.h deleted file mode 100644 index ff44742ff5..0000000000 --- a/keyboards/tkw/stoutgat/v2/v2.h +++ /dev/null @@ -1,75 +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/>. - */ -#pragma once - -#define _x_ KC_NO - -#include "quantum.h" - -#define LAYOUT_encoder( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \ - K44, K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, K4E \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, _x_, K2E }, \ -{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ -{ K40, K41, K42, _x_, K44, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E } \ -} -#define LAYOUT_65_iso( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, K4E \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, _x_, K2E }, \ -{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ -{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E } \ -} - -#define LAYOUT_65_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, K4E \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \ -{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ -{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \ -} - -#define LAYOUT_65_ansi_blocker( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K49, K4B, K4C, K4D, K4E \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, _x_, K2E }, \ -{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ -{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, _x_, K4B, K4C, K4D, K4E} \ -} |