diff options
Diffstat (limited to 'keyboards/woodkeys')
34 files changed, 522 insertions, 409 deletions
diff --git a/keyboards/woodkeys/bigseries/1key/1key.c b/keyboards/woodkeys/bigseries/1key/1key.c index 6036bd9991..a2ebca4fe0 100755 --- a/keyboards/woodkeys/bigseries/1key/1key.c +++ b/keyboards/woodkeys/bigseries/1key/1key.c @@ -14,7 +14,7 @@ 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 "1key.h" +#include "quantum.h" void matrix_scan_kb(void) { // Looping keyboard code goes here diff --git a/keyboards/woodkeys/bigseries/1key/1key.h b/keyboards/woodkeys/bigseries/1key/1key.h deleted file mode 100755 index 6e5ddcc760..0000000000 --- a/keyboards/woodkeys/bigseries/1key/1key.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2018 Cole Markham - -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( \ - k00 \ -) { \ - { k00 } \ -} diff --git a/keyboards/woodkeys/bigseries/1key/config.h b/keyboards/woodkeys/bigseries/1key/config.h index 32263155ff..eff8d0f47a 100755 --- a/keyboards/woodkeys/bigseries/1key/config.h +++ b/keyboards/woodkeys/bigseries/1key/config.h @@ -17,21 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0 } -#define MATRIX_COL_PINS { B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* key combination for command */ #define IS_COMMAND() ( \ false \ ) #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json index f2f93b63ea..72ac6af4d6 100644 --- a/keyboards/woodkeys/bigseries/1key/info.json +++ b/keyboards/woodkeys/bigseries/1key/info.json @@ -8,13 +8,21 @@ "pid": "0x6071", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["B4"], + "rows": ["B0"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u2", "bootloader": "atmel-dfu", "debounce": 50, "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 4, "h": 4} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4} ] } } diff --git a/keyboards/woodkeys/bigseries/2key/2key.c b/keyboards/woodkeys/bigseries/2key/2key.c index cffb71907e..a2ebca4fe0 100755 --- a/keyboards/woodkeys/bigseries/2key/2key.c +++ b/keyboards/woodkeys/bigseries/2key/2key.c @@ -14,7 +14,7 @@ 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 "2key.h" +#include "quantum.h" void matrix_scan_kb(void) { // Looping keyboard code goes here diff --git a/keyboards/woodkeys/bigseries/2key/2key.h b/keyboards/woodkeys/bigseries/2key/2key.h deleted file mode 100755 index eff82fef93..0000000000 --- a/keyboards/woodkeys/bigseries/2key/2key.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2018 Cole Markham - -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( \ - k00, k01 \ -) { \ - { k00, k01 } \ -} diff --git a/keyboards/woodkeys/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h index 6b40065765..a4a762b232 100755 --- a/keyboards/woodkeys/bigseries/2key/config.h +++ b/keyboards/woodkeys/bigseries/2key/config.h @@ -17,21 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0 } -#define MATRIX_COL_PINS { B4, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* key combination for command */ #define IS_COMMAND() ( \ false \ ) #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json index 5137f4f1d1..1e4d0fe04a 100644 --- a/keyboards/woodkeys/bigseries/2key/info.json +++ b/keyboards/woodkeys/bigseries/2key/info.json @@ -8,14 +8,22 @@ "pid": "0x6071", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["B4", "B3"], + "rows": ["B0"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u2", "bootloader": "atmel-dfu", "debounce": 50, "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 4, "h": 4}, - {"x": 4, "y": 0, "w": 4, "h": 4} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}, + {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4} ] } } diff --git a/keyboards/woodkeys/bigseries/3key/3key.c b/keyboards/woodkeys/bigseries/3key/3key.c index 3735c10543..a2ebca4fe0 100755 --- a/keyboards/woodkeys/bigseries/3key/3key.c +++ b/keyboards/woodkeys/bigseries/3key/3key.c @@ -14,7 +14,7 @@ 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 "3key.h" +#include "quantum.h" void matrix_scan_kb(void) { // Looping keyboard code goes here diff --git a/keyboards/woodkeys/bigseries/3key/3key.h b/keyboards/woodkeys/bigseries/3key/3key.h deleted file mode 100755 index caee1e4551..0000000000 --- a/keyboards/woodkeys/bigseries/3key/3key.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2018 Cole Markham - -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( \ - k00, k01, k02 \ -) { \ - { k00, k01, k02 } \ -} diff --git a/keyboards/woodkeys/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h index 9c81df0835..bc00538fdb 100755 --- a/keyboards/woodkeys/bigseries/3key/config.h +++ b/keyboards/woodkeys/bigseries/3key/config.h @@ -17,21 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0 } -#define MATRIX_COL_PINS { B4, B3, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* key combination for command */ #define IS_COMMAND() ( \ false \ ) #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json index af1c85f925..c8ee901dea 100644 --- a/keyboards/woodkeys/bigseries/3key/info.json +++ b/keyboards/woodkeys/bigseries/3key/info.json @@ -8,15 +8,23 @@ "pid": "0x6073", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["B4", "B3", "B5"], + "rows": ["B0"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 50, "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 4, "h": 4}, - {"x": 4, "y": 0, "w": 4, "h": 4}, - {"x": 8, "y": 0, "w": 4, "h": 4} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}, + {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4}, + {"matrix": [0, 2], "x": 8, "y": 0, "w": 4, "h": 4} ] } } diff --git a/keyboards/woodkeys/bigseries/4key/4key.c b/keyboards/woodkeys/bigseries/4key/4key.c deleted file mode 100755 index fdb9a92514..0000000000 --- a/keyboards/woodkeys/bigseries/4key/4key.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2018 Cole Markham - -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 "4key.h" diff --git a/keyboards/woodkeys/bigseries/4key/4key.h b/keyboards/woodkeys/bigseries/4key/4key.h deleted file mode 100755 index 7e9ff7a793..0000000000 --- a/keyboards/woodkeys/bigseries/4key/4key.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -Copyright 2018 Cole Markham - -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( \ - k00, k01, \ - k10, k11 \ -) { \ - { k00, k01 }, \ - { k10, k11 } \ -} diff --git a/keyboards/woodkeys/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h index 9b1f699ce1..0bc82865f9 100755 --- a/keyboards/woodkeys/bigseries/4key/config.h +++ b/keyboards/woodkeys/bigseries/4key/config.h @@ -17,21 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B5 } -#define MATRIX_COL_PINS { B4, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* key combination for command */ #define IS_COMMAND() ( \ false \ ) #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json index b6e02aa987..22ebdc7f6b 100644 --- a/keyboards/woodkeys/bigseries/4key/info.json +++ b/keyboards/woodkeys/bigseries/4key/info.json @@ -8,17 +8,25 @@ "pid": "0x6074", "device_version": "0.0.2" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["B4", "B3"], + "rows": ["B0", "B5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u2", "bootloader": "atmel-dfu", "debounce": 50, "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 4, "h": 4}, - {"x": 4, "y": 0, "w": 4, "h": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}, + {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4}, - {"x": 0, "y": 4, "w": 4, "h": 4}, - {"x": 4, "y": 4, "w": 4, "h": 4} + {"matrix": [1, 0], "x": 0, "y": 4, "w": 4, "h": 4}, + {"matrix": [1, 1], "x": 4, "y": 4, "w": 4, "h": 4} ] } } diff --git a/keyboards/woodkeys/meira/config.h b/keyboards/woodkeys/meira/config.h index f1434fdbd4..d5bdf9540c 100644 --- a/keyboards/woodkeys/meira/config.h +++ b/keyboards/woodkeys/meira/config.h @@ -28,7 +28,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255} #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 - #define RGBLED_NUM 15 // Number of LEDs #endif diff --git a/keyboards/woodkeys/meira/featherble/featherble.c b/keyboards/woodkeys/meira/featherble/featherble.c deleted file mode 100644 index 63ade21904..0000000000 --- a/keyboards/woodkeys/meira/featherble/featherble.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2017 Cole Markham, WoodKeys.click - * - * 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 "meira.h" diff --git a/keyboards/woodkeys/meira/featherble/featherble.h b/keyboards/woodkeys/meira/featherble/featherble.h deleted file mode 100644 index eab7c639b9..0000000000 --- a/keyboards/woodkeys/meira/featherble/featherble.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2017 Cole Markham, WoodKeys.click - * - * 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 "meira.h" diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json index 3a0ae1d190..e39df58323 100644 --- a/keyboards/woodkeys/meira/info.json +++ b/keyboards/woodkeys/meira/info.json @@ -12,6 +12,9 @@ "driver": "custom", "levels": 10 }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layout_aliases": { @@ -21,57 +24,57 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, + {"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}, - {"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}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"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}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":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}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"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}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3} + {"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": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/woodkeys/meira/keymaps/cole/keymap.c b/keyboards/woodkeys/meira/keymaps/cole/keymap.c index ea9f954331..365c9d18e5 100644 --- a/keyboards/woodkeys/meira/keymaps/cole/keymap.c +++ b/keyboards/woodkeys/meira/keymaps/cole/keymap.c @@ -13,7 +13,7 @@ * 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 "meira.h" +#include QMK_KEYBOARD_H #include "lighting.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c index 26f70a4961..aa9730b88f 100644 --- a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c +++ b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c @@ -13,9 +13,7 @@ * 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 "meira.h" -#include "action_layer.h" -#include "action_code.h" +#include QMK_KEYBOARD_H #ifdef RGBLIGHT_ENABLE //Following line allows macro to read current RGB settings diff --git a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c index 6896997d79..ddd695461e 100644 --- a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c +++ b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c @@ -13,8 +13,7 @@ * 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 "meira.h" -#include "issi.h" +#include QMK_KEYBOARD_H #include "lighting.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/woodkeys/meira/lighting.c b/keyboards/woodkeys/meira/lighting.c index 6cbe101dbc..6a17250a29 100755 --- a/keyboards/woodkeys/meira/lighting.c +++ b/keyboards/woodkeys/meira/lighting.c @@ -16,19 +16,6 @@ const uint8_t backlight_pwm_map[BACKLIGHT_LEVELS] = BACKLIGHT_PWM_MAP; const uint8_t switch_matrices[] = {0, 1}; - // Maps switch LEDs from Row/Col to ISSI matrix. - // Value breakdown: - // Bit | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | - // | | ISSI Col | ISSI Row | - // / | - // Device -// const uint8_t switch_leds[MATRIX_ROWS][MATRIX_COLS] = -// LAYOUT( -// 0x29, 0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21, 0xA9, 0xA8, 0xA7, 0xA6, 0xA5, -// 0x39, 0x38, 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0xB9, 0xB8, 0xB7, 0xB6, 0xB5, -// 0x49, 0x48, 0x47, 0x45, 0x44, 0x43, 0x42, 0x41, 0xC9, 0xC8, 0xC7, 0xC6, -// 0x59, 0x58, 0x57, 0x56, 0x55, 0x51, 0xD6, 0xE5, 0xE4, 0xE3, 0xE2); - void backlight_set(uint8_t level){ #ifdef BACKLIGHT_ENABLE uint8_t pwm_value = 0; diff --git a/keyboards/woodkeys/meira/meira.h b/keyboards/woodkeys/meira/meira.h index 55fccf5de5..46d9791e48 100644 --- a/keyboards/woodkeys/meira/meira.h +++ b/keyboards/woodkeys/meira/meira.h @@ -19,19 +19,3 @@ #include "issi.h" void reset_keyboard_kb(void); - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_ortho_4x12( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ -} diff --git a/keyboards/woodkeys/meira/promicro/promicro.c b/keyboards/woodkeys/meira/promicro/promicro.c deleted file mode 100644 index 63ade21904..0000000000 --- a/keyboards/woodkeys/meira/promicro/promicro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2017 Cole Markham, WoodKeys.click - * - * 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 "meira.h" diff --git a/keyboards/woodkeys/meira/promicro/promicro.h b/keyboards/woodkeys/meira/promicro/promicro.h deleted file mode 100644 index eab7c639b9..0000000000 --- a/keyboards/woodkeys/meira/promicro/promicro.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2017 Cole Markham, WoodKeys.click - * - * 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 "meira.h" diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h index fac7647ab8..3854dc8659 100644 --- a/keyboards/woodkeys/scarletbandana/config.h +++ b/keyboards/woodkeys/scarletbandana/config.h @@ -17,12 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -36,9 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLED_NUM 8 // Number of LEDs #endif -#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5 } -#define MATRIX_COL_PINS { B2, B3, B7, B1, F5, F4, F6, F7, B0, F0, F1, D0, D1, D2, D5, B6, C7 } - #ifdef AUDIO_ENABLE #define AUDIO_PIN C6 #define STARTUP_SONG SONG(PREONIC_SOUND) diff --git a/keyboards/woodkeys/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/info.json index 180cd46098..d74555a178 100644 --- a/keyboards/woodkeys/scarletbandana/info.json +++ b/keyboards/woodkeys/scarletbandana/info.json @@ -1,18 +1,396 @@ { - "keyboard_name": "Scarlet Bandana Version IV Mark 2", + "keyboard_name": "Scarlet Bandana Version IV Mark 2", "manufacturer": "WoodKeys.click", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x6969", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["B2", "B3", "B7", "B1", "F5", "F4", "F6", "F7", "B0", "F0", "F1", "D0", "D1", "D2", "D5", "B6", "C7"], + "rows": ["D4", "D6", "D7", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_all": "LAYOUT_65_xt_ansi_split_space_split_bs" + }, "layouts": { - "LAYOUT_all": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"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}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":17.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.75}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2, "w":2.25}, {"x":17.5, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":2.25}, {"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":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.5, "y":3}, {"x":17.5, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":1.25}, {"x":6.25, "y":4, "w":2.25}, {"x":8.5, "y":4, "w":1.75}, {"x":10.25, "y":4, "w":2.25}, {"x":12.5, "y":4}, {"x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}, {"x":16.5, "y":4}, {"x":17.5, "y":4}] + "LAYOUT_65_xt_ansi_split_space": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0}, + + {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0}, + {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0}, + {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0}, + {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0}, + {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0, "w": 2}, + {"label": "Page Up", "matrix": [0, 16], "x": 17.5, "y": 0}, + + {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1}, + + {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "W", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "E", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "R", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "T", "matrix": [1, 7], "x": 8, "y": 1}, + {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1}, + {"label": "U", "matrix": [1, 9], "x": 10, "y": 1}, + {"label": "I", "matrix": [1, 10], "x": 11, "y": 1}, + {"label": "O", "matrix": [1, 11], "x": 12, "y": 1}, + {"label": "P", "matrix": [1, 12], "x": 13, "y": 1}, + {"label": "[", "matrix": [1, 13], "x": 14, "y": 1}, + {"label": "]", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "\\", "matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, + {"label": "Page Down", "matrix": [1, 16], "x": 17.5, "y": 1}, + + {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2}, + {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2}, + {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2}, + {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2}, + {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2}, + {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2}, + {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + {"label": "Home", "matrix": [2, 16], "x": 17.5, "y": 2}, + + {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3}, + + {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 8.75, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 9.75, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 10.75, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 11.75, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 12.75, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 13.75, "y": 3}, + {"label": "Shift", "matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3}, + {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4}, + + {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.25}, + {"label": "Fn4", "matrix": [4, 5], "x": 6.25, "y": 4, "w": 2}, + {"label": "Space", "matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25}, + {"label": "Fn3", "matrix": [4, 9], "x": 10.5, "y": 4, "w": 2}, + {"label": "Alt", "matrix": [4, 10], "x": 12.5, "y": 4}, + {"label": "Menu", "matrix": [4, 11], "x": 13.5, "y": 4}, + {"label": "Ctrl", "matrix": [4, 12], "x": 14.5, "y": 4}, + {"label": "\u2190", "matrix": [4, 14], "x": 15.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4} + ] + }, + "LAYOUT_65_xt_ansi_split_space_split_bs": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0}, + + {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0}, + {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0}, + {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0}, + {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0}, + {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0}, + {"label": "Delete", "matrix": [2, 15], "x": 16.5, "y": 0}, + {"label": "Page Up", "matrix": [0, 16], "x": 17.5, "y": 0}, + + {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1}, + + {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "W", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "E", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "R", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "T", "matrix": [1, 7], "x": 8, "y": 1}, + {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1}, + {"label": "U", "matrix": [1, 9], "x": 10, "y": 1}, + {"label": "I", "matrix": [1, 10], "x": 11, "y": 1}, + {"label": "O", "matrix": [1, 11], "x": 12, "y": 1}, + {"label": "P", "matrix": [1, 12], "x": 13, "y": 1}, + {"label": "[", "matrix": [1, 13], "x": 14, "y": 1}, + {"label": "]", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "\\", "matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, + {"label": "Page Down", "matrix": [1, 16], "x": 17.5, "y": 1}, + + {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2}, + {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2}, + {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2}, + {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2}, + {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2}, + {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2}, + {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + {"label": "Home", "matrix": [2, 16], "x": 17.5, "y": 2}, + + {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3}, + + {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 8.75, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 9.75, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 10.75, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 11.75, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 12.75, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 13.75, "y": 3}, + {"label": "Shift", "matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3}, + {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4}, + + {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.25}, + {"label": "Fn4", "matrix": [4, 5], "x": 6.25, "y": 4, "w": 2}, + {"label": "Space", "matrix": [4, 7], "x": 8.25, "y": 4, "w": 2.25}, + {"label": "Fn3", "matrix": [4, 9], "x": 10.5, "y": 4, "w": 2}, + {"label": "Alt", "matrix": [4, 10], "x": 12.5, "y": 4}, + {"label": "Menu", "matrix": [4, 11], "x": 13.5, "y": 4}, + {"label": "Ctrl", "matrix": [4, 12], "x": 14.5, "y": 4}, + {"label": "\u2190", "matrix": [4, 14], "x": 15.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4} + ] + }, + "LAYOUT_65_xt_ansi": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0}, + + {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0}, + {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0}, + {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0}, + {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0}, + {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0, "w": 2}, + {"label": "Page Up", "matrix": [0, 16], "x": 17.5, "y": 0}, + + {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1}, + + {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "W", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "E", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "R", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "T", "matrix": [1, 7], "x": 8, "y": 1}, + {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1}, + {"label": "U", "matrix": [1, 9], "x": 10, "y": 1}, + {"label": "I", "matrix": [1, 10], "x": 11, "y": 1}, + {"label": "O", "matrix": [1, 11], "x": 12, "y": 1}, + {"label": "P", "matrix": [1, 12], "x": 13, "y": 1}, + {"label": "[", "matrix": [1, 13], "x": 14, "y": 1}, + {"label": "]", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "\\", "matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, + {"label": "Page Down", "matrix": [1, 16], "x": 17.5, "y": 1}, + + {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2}, + {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2}, + {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2}, + {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2}, + {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2}, + {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2}, + {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + {"label": "Home", "matrix": [2, 16], "x": 17.5, "y": 2}, + + {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3}, + + {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 8.75, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 9.75, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 10.75, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 11.75, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 12.75, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 13.75, "y": 3}, + {"label": "Shift", "matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3}, + {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4}, + + {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 7], "x": 6.25, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 12.5, "y": 4}, + {"label": "Menu", "matrix": [4, 11], "x": 13.5, "y": 4}, + {"label": "Ctrl", "matrix": [4, 12], "x": 14.5, "y": 4}, + {"label": "\u2190", "matrix": [4, 14], "x": 15.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4} + ] + }, + "LAYOUT_65_xt_ansi_split_bs": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0}, + + {"label": "Esc", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "1", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "2", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "3", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "4", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "5", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "6", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "7", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "8", "matrix": [0, 10], "x": 10.5, "y": 0}, + {"label": "9", "matrix": [0, 11], "x": 11.5, "y": 0}, + {"label": "0", "matrix": [0, 12], "x": 12.5, "y": 0}, + {"label": "-", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "=", "matrix": [0, 14], "x": 14.5, "y": 0}, + {"label": "Backspace", "matrix": [0, 15], "x": 15.5, "y": 0}, + {"label": "Delete", "matrix": [2, 15], "x": 16.5, "y": 0}, + {"label": "Page Up", "matrix": [0, 16], "x": 17.5, "y": 0}, + + {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1}, + + {"label": "Tab", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "W", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "E", "matrix": [1, 5], "x": 6, "y": 1}, + {"label": "R", "matrix": [1, 6], "x": 7, "y": 1}, + {"label": "T", "matrix": [1, 7], "x": 8, "y": 1}, + {"label": "Y", "matrix": [1, 8], "x": 9, "y": 1}, + {"label": "U", "matrix": [1, 9], "x": 10, "y": 1}, + {"label": "I", "matrix": [1, 10], "x": 11, "y": 1}, + {"label": "O", "matrix": [1, 11], "x": 12, "y": 1}, + {"label": "P", "matrix": [1, 12], "x": 13, "y": 1}, + {"label": "[", "matrix": [1, 13], "x": 14, "y": 1}, + {"label": "]", "matrix": [1, 14], "x": 15, "y": 1}, + {"label": "\\", "matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, + {"label": "Page Down", "matrix": [1, 16], "x": 17.5, "y": 1}, + + {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 3], "x": 4.25, "y": 2}, + {"label": "S", "matrix": [2, 4], "x": 5.25, "y": 2}, + {"label": "D", "matrix": [2, 5], "x": 6.25, "y": 2}, + {"label": "F", "matrix": [2, 6], "x": 7.25, "y": 2}, + {"label": "G", "matrix": [2, 7], "x": 8.25, "y": 2}, + {"label": "H", "matrix": [2, 8], "x": 9.25, "y": 2}, + {"label": "J", "matrix": [2, 9], "x": 10.25, "y": 2}, + {"label": "K", "matrix": [2, 10], "x": 11.25, "y": 2}, + {"label": "L", "matrix": [2, 11], "x": 12.25, "y": 2}, + {"label": ";", "matrix": [2, 12], "x": 13.25, "y": 2}, + {"label": "'", "matrix": [2, 13], "x": 14.25, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + {"label": "Home", "matrix": [2, 16], "x": 17.5, "y": 2}, + + {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3}, + + {"label": "Shift", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 4.75, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 5.75, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 6.75, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 7.75, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 8.75, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 9.75, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 10.75, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 11.75, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 12.75, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 13.75, "y": 3}, + {"label": "Shift", "matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 15], "x": 16.5, "y": 3}, + {"label": "End", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4}, + + {"label": "Ctrl", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 4], "x": 5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 7], "x": 6.25, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 12.5, "y": 4}, + {"label": "Menu", "matrix": [4, 11], "x": 13.5, "y": 4}, + {"label": "Ctrl", "matrix": [4, 12], "x": 14.5, "y": 4}, + {"label": "\u2190", "matrix": [4, 14], "x": 15.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 16], "x": 17.5, "y": 4} + ] } } } diff --git a/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c b/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c index f8eb11b3ee..9a96fd6f51 100644 --- a/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c +++ b/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c @@ -43,28 +43,28 @@ bool TOG_STATUS = false; int RGB_current_mode; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_all( + [_QWERTY] = LAYOUT_65_xt_ansi_split_space_split_bs( KC_F1, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_BSPC, KC_DEL, KC_PGUP, KC_F3, KC_F4, KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_LBRC,KC_RBRC,KC_BSLS, KC_PGDN, KC_F5, KC_F6, KC_CAPS,KC_A,KC_S,KC_D,KC_F, KC_G, KC_H,KC_J,KC_K,KC_L, KC_SCLN,KC_QUOT,KC_ENT, KC_HOME, KC_F7, KC_F8, KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLASH,KC_RSFT,KC_UP,KC_END, KC_F9, KC_F10, KC_LCTL,KC_LGUI,KC_LALT, RAISE, KC_SPACE, LOWER, KC_RALT,KC_APP,KC_RCTL,KC_LEFT,KC_DOWN,KC_RIGHT), - [_RAISE] = LAYOUT_all( + [_RAISE] = LAYOUT_65_xt_ansi_split_space_split_bs( RGB_MOD, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______, _______,_______,_______,_______,_______,_______), - [_LOWER] = LAYOUT_all( + [_LOWER] = LAYOUT_65_xt_ansi_split_space_split_bs( RGB_MOD, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______, _______,_______,_______,_______,_______,_______), - [_ADJUST] = LAYOUT_all( + [_ADJUST] = LAYOUT_65_xt_ansi_split_space_split_bs( QK_BOOT, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, diff --git a/keyboards/woodkeys/scarletbandana/matrix_diagram.md b/keyboards/woodkeys/scarletbandana/matrix_diagram.md new file mode 100644 index 0000000000..370ae2279b --- /dev/null +++ b/keyboards/woodkeys/scarletbandana/matrix_diagram.md @@ -0,0 +1,21 @@ +# Matrix Diagram for WoodKeys.click Scarlet Bandana Version IV Mark 2 + +``` + ┌───────┐ + 2u Backspace │0F │ + └───────┘ +┌───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │ │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │2F │0G │ +├───┼───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ +│10 │11 │ │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │1G │ +├───┼───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ +│20 │21 │ │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │2G │ +├───┼───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ +│30 │31 │ │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3E │3F │3G │ +├───┼───┤ ├────┬───┴┬──┴─┬─┴───┴─┬─┴───┴──┬┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ +│40 │41 │ │42 │43 │44 │45 │47 │49 │4A │4B │4C │4E │4F │4G │ +└───┴───┘ └────┴────┴────┴───────┴────────┴───────┴───┴───┴───┴───┴───┴───┘ + ┌────┬────┬────┬────────────────────────┬───┬───┬───┐ + │42 │43 │44 │47 │4A │4B │4C │ Standard + └────┴────┴────┴────────────────────────┴───┴───┴───┘ +``` diff --git a/keyboards/woodkeys/scarletbandana/readme.md b/keyboards/woodkeys/scarletbandana/readme.md index 4505fd0573..7020a45fdd 100644 --- a/keyboards/woodkeys/scarletbandana/readme.md +++ b/keyboards/woodkeys/scarletbandana/readme.md @@ -1,11 +1,23 @@ # Scarlet Bandana Version IV Mark 2 -Keyboard Maintainer: [Cole Markham](https://github.com/colemarkham) -Hardware Supported: Scarlet Bandana Version IV Mark 2 -Hardware Availability: [WoodKeys.click](https://woodkeys.click/product/scarlet-bandana-version-iv-mark-2/) +* Keyboard Maintainer: [Cole Markham](https://github.com/colemarkham) +* Hardware Supported: Scarlet Bandana Version IV Mark 2 +* Hardware Availability: [~~WoodKeys.click~~ (no longer available)](https://woodkeys.click/product/scarlet-bandana-version-iv-mark-2/) Make example for this keyboard (after setting up your build environment): make woodkeys/scarletbandana:default +Flashing example for this keyboard: + + make woodkeys/scarletbandana:default:flash + See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/woodkeys/scarletbandana/scarletbandana.c b/keyboards/woodkeys/scarletbandana/scarletbandana.c deleted file mode 100644 index 6ef183c2cc..0000000000 --- a/keyboards/woodkeys/scarletbandana/scarletbandana.c +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2019 Cole Markham, WoodKeys.click - * - * 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 "scarletbandana.h" - - - - - - diff --git a/keyboards/woodkeys/scarletbandana/scarletbandana.h b/keyboards/woodkeys/scarletbandana/scarletbandana.h deleted file mode 100644 index 8178e8c8dc..0000000000 --- a/keyboards/woodkeys/scarletbandana/scarletbandana.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Cole Markham - * - * 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" - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k2f, k0g, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2g, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, k3f, k3g, \ - k40, k41, k42, k43, k44, k45, k47, k49, k4a, k4b, k4c, k4e, k4f, k4g \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, KC_NO, k3e, k3f, k3g }, \ - { k40, k41, k42, k43, k44, k45, KC_NO, k47, KC_NO, k49, k4a, k4b, k4c, KC_NO, k4e, k4f, k4g } \ -} - |