diff --git a/keyboards/aeternus/omnibus/config.h b/keyboards/aeternus/omnibus/config.h index 01d376f0d5..0a7d501827 100644 --- a/keyboards/aeternus/omnibus/config.h +++ b/keyboards/aeternus/omnibus/config.h @@ -17,33 +17,7 @@ along with this program. If not, see . #pragma once -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xAE7E -#define PRODUCT_ID 0x4F42 /* "OB" */ -#define DEVICE_VER 0x0001 -#define MANUFACTURER KnoblesseOblige -#define PRODUCT Omnibus - -#define MATRIX_ROWS 4 -#define MATRIX_COLS 12 - -#define MATRIX_ROW_PINS { B1, B0, D6, D4 } -#define MATRIX_COL_PINS { B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, D7 } - -#define DIODE_DIRECTION COL2ROW - -#define ENCODERS_PAD_A { B2 } -#define ENCODERS_PAD_B { B3 } - -#define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 22 -# define RGBLIGHT_ANIMATIONS -#endif - -#define DEBOUNCE 5 +#define RGBLED_NUM 22 #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/aeternus/omnibus/info.json b/keyboards/aeternus/omnibus/info.json index e1f62ecc27..5fa0b4f152 100644 --- a/keyboards/aeternus/omnibus/info.json +++ b/keyboards/aeternus/omnibus/info.json @@ -1,249 +1,148 @@ { - "keyboard_name": "omnibus", - "url": "", + "manufacturer": "Aeternus", + "keyboard_name": "Omnibus", "maintainer": "KnoblesseOblige", - "layouts": { - "LAYOUT": { - "layout": [ - { - "label": "k00", - "x": 0, - "y": 0 - }, - { - "label": "k01", - "x": 1, - "y": 0 - }, - { - "label": "k02", - "x": 2, - "y": 0 - }, - { - "label": "k03", - "x": 3, - "y": 0 - }, - { - "label": "k04", - "x": 4, - "y": 0 - }, - { - "label": "k05", - "x": 5, - "y": 0 - }, - { - "label": "k06", - "x": 6, - "y": 0 - }, - { - "label": "k07", - "x": 7, - "y": 0 - }, - { - "label": "k08", - "x": 8, - "y": 0 - }, - { - "label": "k09", - "x": 9, - "y": 0 - }, - { - "label": "k0a", - "x": 10, - "y": 0 - }, - { - "label": "k0b", - "x": 11, - "y": 0, - "w": 1.75 - }, - { - "label": "k37", - "x": 7, - "y": 3 - }, - { - "label": "k10", - "x": 0, - "y": 1 - }, - { - "label": "k11", - "x": 1, - "y": 1 - }, - { - "label": "k12", - "x": 2, - "y": 1 - }, - { - "label": "k13", - "x": 3, - "y": 1 - }, - { - "label": "k14", - "x": 4, - "y": 1 - }, - { - "label": "k15", - "x": 5, - "y": 1 - }, - { - "label": "k16", - "x": 6, - "y": 1 - }, - { - "label": "k17", - "x": 7, - "y": 1 - }, - { - "label": "k18", - "x": 8, - "y": 1 - }, - { - "label": "k19", - "x": 9, - "y": 1 - }, - { - "label": "k1a", - "x": 10, - "y": 1 - }, - { - "label": "k1b", - "x": 11, - "y": 1 - }, - { - "label": "k20", - "x": 0, - "y": 2 - }, - { - "label": "k21", - "x": 1, - "y": 2 - }, - { - "label": "k22", - "x": 2, - "y": 2 - }, - { - "label": "k23", - "x": 3, - "y": 2 - }, - { - "label": "k24", - "x": 4, - "y": 2 - }, - { - "label": "k25", - "x": 5, - "y": 2 - }, - { - "label": "k26", - "x": 6, - "y": 2 - }, - { - "label": "k27", - "x": 7, - "y": 2 - }, - { - "label": "k28", - "x": 8, - "y": 2 - }, - { - "label": "k29", - "x": 9, - "y": 2 - }, - { - "label": "k2a", - "x": 10, - "y": 2 - }, - { - "label": "k2b", - "x": 11, - "y": 2 - }, - - - { - "label": "k30", - "x": 0, - "y": 3 - }, - { - "label": "k31", - "x": 1, - "y": 3 - }, - { - "label": "k32", - "x": 2, - "y": 3 - }, - { - "label": "k33", - "x": 3, - "y": 3 - }, - { - "label": "k34", - "x": 4, - "y": 3 - }, - { - "label": "k36", - "x": 6, - "y": 3 - }, - { - "label": "k38", - "x": 8, - "y": 3 - }, - { - "label": "k39", - "x": 9, - "y": 3 - }, - { - "label": "k3a", - "x": 10, - "y": 3 - }, - { - "label": "k3b", - "x": 11, - "y": 3 - } + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B2", "pin_b": "B3"} ] - } + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, + "matrix_pins": { + "cols": ["B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D7"], + "rows": ["B1", "B0", "D6", "D4"] + }, + "processor": "atmega32u4", + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "pin": "B7" + }, + "url": "", + "usb": { + "device_version": "0.0.1", + "pid": "0x4F42", + "vid": "0xAE7E" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + { "label": "1u", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "1u", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "1u", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "1u", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "1u", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "1u", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "1u", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "1u", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "1u", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "1u", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "1u", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "nono", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "enc", "matrix": [3, 7], "w": 0.75, "x": 12, "y": 0 }, + { "label": "1.25u", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, + { "label": "1u", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, + { "label": "1u", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, + { "label": "1u", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, + { "label": "1u", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, + { "label": "1u", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 }, + { "label": "1u", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 }, + { "label": "1u", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 }, + { "label": "1u", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 }, + { "label": "1u", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 }, + { "label": "1u", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 }, + { "label": "1.5u", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 }, + { "label": "1.75u", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "1u", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "label": "1u", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "label": "1u", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "label": "1u", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "label": "1u", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "label": "1u", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "label": "1u", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "label": "1u", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "label": "1u", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "label": "1u", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "1u", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "1u", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, + { "label": "1u", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, + { "label": "1u", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, + { "label": "1u", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, + { "label": "2.25u", "matrix": [3, 4], "w": 2.25, "x": 4, "y": 3 }, + { "label": "2u", "matrix": [3, 6], "w": 2, "x": 6.25, "y": 3 }, + { "label": "1.5u", "matrix": [3, 8], "w": 1.5, "x": 8.25, "y": 3 }, + { "label": "1u", "matrix": [3, 9], "w": 1, "x": 9.75, "y": 3 }, + { "label": "1u", "matrix": [3, 10], "w": 1, "x": 10.75, "y": 3 }, + { "label": "1u", "matrix": [3, 11], "w": 1, "x": 11.75, "y": 3 } + ] + }, + "LAYOUT_southpaw": { + "layout": [ + { "label": "1u", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "1u", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "1u", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "1u", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "1u", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "1u", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "1u", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "1u", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "1u", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "1u", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "1u", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "nono", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 }, + { "label": "1.25u", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, + { "label": "1u", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, + { "label": "1u", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, + { "label": "1u", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, + { "label": "1u", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, + { "label": "1u", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 }, + { "label": "1u", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 }, + { "label": "1u", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 }, + { "label": "1u", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 }, + { "label": "1u", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 }, + { "label": "1u", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 }, + { "label": "1.5u", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 }, + { "label": "1.75u", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "1u", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "label": "1u", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "label": "1u", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "label": "1u", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "label": "1u", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "label": "1u", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "label": "1u", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "label": "1u", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "label": "1u", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "label": "1u", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "1u", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "1u", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, + { "label": "1u", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, + { "label": "1u", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, + { "label": "1u", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, + { "label": "2.25u", "matrix": [3, 4], "w": 2.25, "x": 4, "y": 3 }, + { "label": "2u", "matrix": [3, 6], "w": 2, "x": 6.25, "y": 3 }, + { "label": "1.5u", "matrix": [3, 8], "w": 1.5, "x": 8.25, "y": 3 }, + { "label": "1u", "matrix": [3, 9], "w": 1, "x": 9.75, "y": 3 }, + { "label": "1u", "matrix": [3, 10], "w": 1, "x": 10.75, "y": 3 }, + { "label": "1u", "matrix": [3, 11], "w": 1, "x": 11.75, "y": 3 } + ] + } } - } +} diff --git a/keyboards/aeternus/omnibus/keymaps/default/keymap.c b/keyboards/aeternus/omnibus/keymaps/default/keymap.c index 41e2be18b9..15c9c378b3 100644 --- a/keyboards/aeternus/omnibus/keymaps/default/keymap.c +++ b/keyboards/aeternus/omnibus/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [0] = LAYOUT_all( - KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_DEL, + QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_DEL, LCTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, MO(1), KC_LALT, KC_LGUI, MO(2), KC_SPC, KC_SPC, MO(3), MO(1), TT(2), MO(2) diff --git a/keyboards/aeternus/omnibus/keymaps/via/keymap.c b/keyboards/aeternus/omnibus/keymaps/via/keymap.c deleted file mode 100644 index 41e2be18b9..0000000000 --- a/keyboards/aeternus/omnibus/keymaps/via/keymap.c +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 KnoblesseOblige - * - * 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [0] = LAYOUT_all( - KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_DEL, - LCTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - MO(1), KC_LALT, KC_LGUI, MO(2), KC_SPC, KC_SPC, MO(3), MO(1), TT(2), MO(2) - ), - [1] = LAYOUT_all( - KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [2] = LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [3] = LAYOUT_all( - KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; diff --git a/keyboards/aeternus/omnibus/keymaps/via/rules.mk b/keyboards/aeternus/omnibus/keymaps/via/rules.mk deleted file mode 100644 index 036bd6d1c3..0000000000 --- a/keyboards/aeternus/omnibus/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/aeternus/omnibus/keymaps/vial/keymap.c b/keyboards/aeternus/omnibus/keymaps/vial/keymap.c index 37e8accf27..bca595dde1 100644 --- a/keyboards/aeternus/omnibus/keymaps/vial/keymap.c +++ b/keyboards/aeternus/omnibus/keymaps/vial/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [0] = LAYOUT_all( - KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_DEL, + QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_DEL, LCTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, MO(1), KC_LALT, KC_LGUI, MO(2), KC_SPC, KC_SPC, MO(3), MO(1), TT(2), MO(2) diff --git a/keyboards/aeternus/omnibus/keymaps/vial/rules.mk b/keyboards/aeternus/omnibus/keymaps/vial/rules.mk index bacb882dc8..3e91f08bde 100644 --- a/keyboards/aeternus/omnibus/keymaps/vial/rules.mk +++ b/keyboards/aeternus/omnibus/keymaps/vial/rules.mk @@ -1,7 +1,7 @@ VIA_ENABLE = yes VIAL_ENABLE = yes +LTO_ENABLE = yes +ENCODER_MAP_ENABLE = yes QMK_SETTINGS = no -LTO_ENABLE = yes TAP_DANCE_ENABLE = no -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/aeternus/omnibus/omnibus.c b/keyboards/aeternus/omnibus/omnibus.c deleted file mode 100644 index 6fd5199509..0000000000 --- a/keyboards/aeternus/omnibus/omnibus.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 KnoblesseOblige - * - * 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 . - */ - -#include "omnibus.h" diff --git a/keyboards/aeternus/omnibus/omnibus.h b/keyboards/aeternus/omnibus/omnibus.h deleted file mode 100644 index ec716e9ae5..0000000000 --- a/keyboards/aeternus/omnibus/omnibus.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2021 KnoblesseOblige - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -#define kxx 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_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k37, \ - 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, k36, 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, kxx, k36, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_all_no_encoder( \ - 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, k36, 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, kxx, k36, kxx, k38, k39, k3a, k3b } \ -} diff --git a/keyboards/aeternus/omnibus/rules.mk b/keyboards/aeternus/omnibus/rules.mk index c28edc9134..6e7633bfe0 100644 --- a/keyboards/aeternus/omnibus/rules.mk +++ b/keyboards/aeternus/omnibus/rules.mk @@ -1,22 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = no # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes +# This file intentionally left blank diff --git a/keyboards/boardsource/lulu/keymaps/vial/config.h b/keyboards/boardsource/lulu/keymaps/vial/config.h index 65a6bdb9c0..3ce29e5a53 100644 --- a/keyboards/boardsource/lulu/keymaps/vial/config.h +++ b/keyboards/boardsource/lulu/keymaps/vial/config.h @@ -5,3 +5,8 @@ #define VIAL_KEYBOARD_UID {0xAB, 0x22, 0x68, 0x8B, 0x59, 0xD0, 0x81, 0x11} #define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } #define VIAL_UNLOCK_COMBO_COLS { 0, 1 } + +#if defined(__AVR_ATmega32U4__) + #undef ENABLE_RGB_MATRIX_BAND_SAT + #undef ENABLE_RGB_MATRIX_BAND_VAL +#endif diff --git a/keyboards/boardsource/lulu/keymaps/vial/keymap.c b/keyboards/boardsource/lulu/keymaps/vial/keymap.c index 3b07bf5564..4a969d4963 100644 --- a/keyboards/boardsource/lulu/keymaps/vial/keymap.c +++ b/keyboards/boardsource/lulu/keymaps/vial/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, - KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_ENT, RAISE, KC_BSPC, KC_RGUI ), diff --git a/keyboards/boardsource/lulu/keymaps/vial/rules.mk b/keyboards/boardsource/lulu/keymaps/vial/rules.mk index 351a30e1b6..51fa8e5556 100644 --- a/keyboards/boardsource/lulu/keymaps/vial/rules.mk +++ b/keyboards/boardsource/lulu/keymaps/vial/rules.mk @@ -1,10 +1,15 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -QMK_SETTINGS = no -COMBO_ENABLE = no -MOUSEKEY_ENABLE = no -TAP_DANCE_ENABLE = no + VIALRGB_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes -SPACE_CADET_ENABLE = no -GRAVE_ESC_ENABLE = no + +ifeq ($(strip $(MCU)), atmega32u4) + QMK_SETTINGS = no + COMBO_ENABLE = no + MOUSEKEY_ENABLE = no + TAP_DANCE_ENABLE = no + SPACE_CADET_ENABLE = no + GRAVE_ESC_ENABLE = no + KEY_OVERRIDE_ENABLE = no + MAGIC_ENABLE = no +endif diff --git a/keyboards/gh80_3000/keymaps/vial/keymap.c b/keyboards/gh80_3000/keymaps/vial/keymap.c index 0221ffbc32..be553e91aa 100644 --- a/keyboards/gh80_3000/keymaps/vial/keymap.c +++ b/keyboards/gh80_3000/keymaps/vial/keymap.c @@ -3,8 +3,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE, - KC_GRV, 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_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE, + KC_GRV, 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_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, 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_P4, KC_P5, KC_P6, KC_PPLS, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, diff --git a/keyboards/handwired/prkl30/keymaps/vial/config.h b/keyboards/handwired/prkl30/keymaps/vial/config.h index 506c1725be..d484c59291 100644 --- a/keyboards/handwired/prkl30/keymaps/vial/config.h +++ b/keyboards/handwired/prkl30/keymaps/vial/config.h @@ -6,4 +6,4 @@ #define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 1 } \ No newline at end of file +#define VIAL_UNLOCK_COMBO_COLS { 0, 1 } diff --git a/keyboards/handwired/prkl30/keymaps/vial/rules.mk b/keyboards/handwired/prkl30/keymaps/vial/rules.mk index 4e13a6c067..c852abf313 100644 --- a/keyboards/handwired/prkl30/keymaps/vial/rules.mk +++ b/keyboards/handwired/prkl30/keymaps/vial/rules.mk @@ -4,4 +4,10 @@ LTO_ENABLE = yes ENCODER_ENABLE = yes ENCODER_MAP_ENABLE = yes EXTRAKEY_ENABLE = yes -QMK_SETTINGS = no \ No newline at end of file + +CONSOLE_ENABLE = no +COMMAND_ENABLE = no + +ifeq ($(strip $(MCU)), atmega32u4) + QMK_SETTINGS = no +endif diff --git a/keyboards/horizon/keymaps/vial/keymap.c b/keyboards/horizon/keymaps/vial/keymap.c index 29a9bec0d8..bdb03bd081 100644 --- a/keyboards/horizon/keymaps/vial/keymap.c +++ b/keyboards/horizon/keymaps/vial/keymap.c @@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_FUNCTION] = LAYOUT( - _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_PSCR, KC_SLCK, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______, - _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_INS , KC_CLCK, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, _______, + _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_PSCR, KC_SCRL, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______, + _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_INS , KC_CAPS, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, _______, _______, KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json index 98ad19fded..cc33c26cc1 100644 --- a/keyboards/kbdcraft/adam64/info.json +++ b/keyboards/kbdcraft/adam64/info.json @@ -1,5 +1,4 @@ { - "keyboard_name": "Adam64", "manufacturer": "KBDCRAFT", "url": "https://kbdcraft.store/products/adam", @@ -16,7 +15,7 @@ "rows": ["C8", "C9", "A8", "A10", "B14"], "cols": ["B15", "C6", "C7", "A15", "B7", "C10", "C11", "C12", "D2", "B3", "B4", "B5", "A0", "A1"] }, - "features":{ + "features": { "bootmagic": true, "mousekey": true, "extrakey": true, @@ -25,10 +24,10 @@ "command": false, "rgb_matrix": true }, - "rgb_matrix":{ + "rgb_matrix": { "driver": "IS31FL3741", "max_brightness": 150, - "animations":{ + "animations": { "alphas_mods": true, "gradient_up_down": true, "gradient_left_right": true, @@ -66,149 +65,148 @@ "solid_multisplash": true }, "layout": [ - {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, - {"flags": 4, "matrix": [0, 1], "x": 16, "y": 0 }, - {"flags": 4, "matrix": [0, 2], "x": 32, "y": 0 }, - {"flags": 4, "matrix": [0, 3], "x": 48, "y": 0 }, - {"flags": 4, "matrix": [0, 4], "x": 64, "y": 0 }, - {"flags": 4, "matrix": [0, 5], "x": 80, "y": 0 }, - {"flags": 4, "matrix": [0, 6], "x": 96, "y": 0 }, - {"flags": 4, "matrix": [0, 7], "x": 112, "y": 0 }, - {"flags": 4, "matrix": [0, 8], "x": 128, "y": 0 }, - {"flags": 4, "matrix": [0, 9], "x": 144, "y": 0 }, - {"flags": 4, "matrix": [0, 10], "x": 160, "y": 0 }, - {"flags": 4, "matrix": [0, 11], "x": 176, "y": 0 }, - {"flags": 4, "matrix": [0, 12], "x": 192, "y": 0 }, - {"flags": 4, "matrix": [0, 13], "x": 208, "y": 0 }, + {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0}, + {"flags": 4, "matrix": [0, 1], "x": 16, "y": 0}, + {"flags": 4, "matrix": [0, 2], "x": 32, "y": 0}, + {"flags": 4, "matrix": [0, 3], "x": 48, "y": 0}, + {"flags": 4, "matrix": [0, 4], "x": 64, "y": 0}, + {"flags": 4, "matrix": [0, 5], "x": 80, "y": 0}, + {"flags": 4, "matrix": [0, 6], "x": 96, "y": 0}, + {"flags": 4, "matrix": [0, 7], "x": 112, "y": 0}, + {"flags": 4, "matrix": [0, 8], "x": 128, "y": 0}, + {"flags": 4, "matrix": [0, 9], "x": 144, "y": 0}, + {"flags": 4, "matrix": [0, 10], "x": 160, "y": 0}, + {"flags": 4, "matrix": [0, 11], "x": 176, "y": 0}, + {"flags": 4, "matrix": [0, 12], "x": 192, "y": 0}, + {"flags": 4, "matrix": [0, 13], "x": 208, "y": 0}, - {"flags": 4, "matrix": [1, 0], "x": 0, "y": 10 }, - {"flags": 4, "matrix": [1, 1], "x": 16, "y": 10 }, - {"flags": 4, "matrix": [1, 2], "x": 32, "y": 10 }, - {"flags": 4, "matrix": [1, 3], "x": 48, "y": 10 }, - {"flags": 4, "matrix": [1, 4], "x": 64, "y": 10 }, - {"flags": 4, "matrix": [1, 5], "x": 80, "y": 10 }, - {"flags": 4, "matrix": [1, 6], "x": 96, "y": 10 }, - {"flags": 4, "matrix": [1, 7], "x": 112, "y": 10 }, - {"flags": 4, "matrix": [1, 8], "x": 128, "y": 10 }, - {"flags": 4, "matrix": [1, 9], "x": 144, "y": 10 }, - {"flags": 4, "matrix": [1, 10], "x": 160, "y": 10 }, - {"flags": 4, "matrix": [1, 11], "x": 176, "y": 10 }, - {"flags": 4, "matrix": [1, 12], "x": 192, "y": 10 }, - {"flags": 4, "matrix": [1, 13], "x": 208, "y": 10 }, + {"flags": 4, "matrix": [1, 0], "x": 0, "y": 10}, + {"flags": 4, "matrix": [1, 1], "x": 16, "y": 10}, + {"flags": 4, "matrix": [1, 2], "x": 32, "y": 10}, + {"flags": 4, "matrix": [1, 3], "x": 48, "y": 10}, + {"flags": 4, "matrix": [1, 4], "x": 64, "y": 10}, + {"flags": 4, "matrix": [1, 5], "x": 80, "y": 10}, + {"flags": 4, "matrix": [1, 6], "x": 96, "y": 10}, + {"flags": 4, "matrix": [1, 7], "x": 112, "y": 10}, + {"flags": 4, "matrix": [1, 8], "x": 128, "y": 10}, + {"flags": 4, "matrix": [1, 9], "x": 144, "y": 10}, + {"flags": 4, "matrix": [1, 10], "x": 160, "y": 10}, + {"flags": 4, "matrix": [1, 11], "x": 176, "y": 10}, + {"flags": 4, "matrix": [1, 12], "x": 192, "y": 10}, + {"flags": 4, "matrix": [1, 13], "x": 208, "y": 10}, - {"flags": 4, "matrix": [2, 0], "x": 0, "y": 20 }, - {"flags": 4, "matrix": [2, 1], "x": 16, "y": 20 }, - {"flags": 4, "matrix": [2, 2], "x": 32, "y": 20 }, - {"flags": 4, "matrix": [2, 3], "x": 48, "y": 20 }, - {"flags": 4, "matrix": [2, 4], "x": 64, "y": 20 }, - {"flags": 4, "matrix": [2, 5], "x": 80, "y": 20 }, - {"flags": 4, "matrix": [2, 6], "x": 96, "y": 20 }, - {"flags": 4, "matrix": [2, 7], "x": 112, "y": 20 }, - {"flags": 4, "matrix": [2, 8], "x": 128, "y": 20 }, - {"flags": 4, "matrix": [2, 9], "x": 144, "y": 20 }, - {"flags": 4, "matrix": [2, 10], "x": 160, "y": 20 }, - {"flags": 4, "matrix": [2, 11], "x": 176, "y": 20 }, - {"flags": 4, "matrix": [2, 13], "x": 208, "y": 20 }, + {"flags": 4, "matrix": [2, 0], "x": 0, "y": 20}, + {"flags": 4, "matrix": [2, 1], "x": 16, "y": 20}, + {"flags": 4, "matrix": [2, 2], "x": 32, "y": 20}, + {"flags": 4, "matrix": [2, 3], "x": 48, "y": 20}, + {"flags": 4, "matrix": [2, 4], "x": 64, "y": 20}, + {"flags": 4, "matrix": [2, 5], "x": 80, "y": 20}, + {"flags": 4, "matrix": [2, 6], "x": 96, "y": 20}, + {"flags": 4, "matrix": [2, 7], "x": 112, "y": 20}, + {"flags": 4, "matrix": [2, 8], "x": 128, "y": 20}, + {"flags": 4, "matrix": [2, 9], "x": 144, "y": 20}, + {"flags": 4, "matrix": [2, 10], "x": 160, "y": 20}, + {"flags": 4, "matrix": [2, 11], "x": 176, "y": 20}, + {"flags": 4, "matrix": [2, 13], "x": 208, "y": 20}, - {"flags": 4, "matrix": [3, 0], "x": 0, "y": 30 }, - {"flags": 4, "matrix": [3, 1], "x": 16, "y": 30 }, - {"flags": 4, "matrix": [3, 2], "x": 32, "y": 30 }, - {"flags": 4, "matrix": [3, 3], "x": 48, "y": 30 }, - {"flags": 4, "matrix": [3, 4], "x": 64, "y": 30 }, - {"flags": 4, "matrix": [3, 5], "x": 80, "y": 30 }, - {"flags": 4, "matrix": [3, 6], "x": 96, "y": 30 }, - {"flags": 4, "matrix": [3, 7], "x": 112, "y": 30 }, - {"flags": 4, "matrix": [3, 8], "x": 128, "y": 30 }, - {"flags": 4, "matrix": [3, 9], "x": 144, "y": 30 }, - {"flags": 4, "matrix": [3, 10], "x": 160, "y": 30 }, - {"flags": 4, "matrix": [3, 11], "x": 176, "y": 30 }, - {"flags": 4, "matrix": [3, 12], "x": 192, "y": 30 }, - {"flags": 4, "matrix": [3, 13], "x": 208, "y": 30 }, + {"flags": 4, "matrix": [3, 0], "x": 0, "y": 30}, + {"flags": 4, "matrix": [3, 1], "x": 16, "y": 30}, + {"flags": 4, "matrix": [3, 2], "x": 32, "y": 30}, + {"flags": 4, "matrix": [3, 3], "x": 48, "y": 30}, + {"flags": 4, "matrix": [3, 4], "x": 64, "y": 30}, + {"flags": 4, "matrix": [3, 5], "x": 80, "y": 30}, + {"flags": 4, "matrix": [3, 6], "x": 96, "y": 30}, + {"flags": 4, "matrix": [3, 7], "x": 112, "y": 30}, + {"flags": 4, "matrix": [3, 8], "x": 128, "y": 30}, + {"flags": 4, "matrix": [3, 9], "x": 144, "y": 30}, + {"flags": 4, "matrix": [3, 10], "x": 160, "y": 30}, + {"flags": 4, "matrix": [3, 11], "x": 176, "y": 30}, + {"flags": 4, "matrix": [3, 12], "x": 192, "y": 30}, + {"flags": 4, "matrix": [3, 13], "x": 208, "y": 30}, - {"flags": 4, "matrix": [4, 0], "x": 0, "y": 40 }, - {"flags": 4, "matrix": [4, 1], "x": 16, "y": 40 }, - {"flags": 4, "matrix": [4, 2], "x": 32, "y": 40 }, - {"flags": 4, "matrix": [4, 5], "x": 80, "y": 40 }, - {"flags": 4, "matrix": [4, 9], "x": 144, "y": 40 }, - {"flags": 4, "matrix": [4, 10], "x": 160, "y": 40 }, - {"flags": 4, "matrix": [4, 11], "x": 176, "y": 40 }, - {"flags": 4, "matrix": [4, 12], "x": 192, "y": 40 }, - {"flags": 4, "matrix": [4, 13], "x": 208, "y": 40 } + {"flags": 4, "matrix": [4, 0], "x": 0, "y": 40}, + {"flags": 4, "matrix": [4, 1], "x": 16, "y": 40}, + {"flags": 4, "matrix": [4, 2], "x": 32, "y": 40}, + {"flags": 4, "matrix": [4, 5], "x": 80, "y": 40}, + {"flags": 4, "matrix": [4, 9], "x": 144, "y": 40}, + {"flags": 4, "matrix": [4, 10], "x": 160, "y": 40}, + {"flags": 4, "matrix": [4, 11], "x": 176, "y": 40}, + {"flags": 4, "matrix": [4, 12], "x": 192, "y": 40}, + {"flags": 4, "matrix": [4, 13], "x": 208, "y": 40} ] }, - "community_layouts": [ "64_ansi" ], "layouts": { "LAYOUT_64_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], "w": 2, "x": 13, "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}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "w": 2, "x": 13, "y": 0}, - { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1}, - { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2}, - { "matrix": [3, 0], "w": 2, "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 2, "y": 3 }, - { "matrix": [3, 2], "x": 3, "y": 3 }, - { "matrix": [3, 3], "x": 4, "y": 3 }, - { "matrix": [3, 4], "x": 5, "y": 3 }, - { "matrix": [3, 5], "x": 6, "y": 3 }, - { "matrix": [3, 6], "x": 7, "y": 3 }, - { "matrix": [3, 7], "x": 8, "y": 3 }, - { "matrix": [3, 8], "x": 9, "y": 3 }, - { "matrix": [3, 9], "x": 10, "y": 3 }, - { "matrix": [3, 10], "x": 11, "y": 3 }, - { "matrix": [3, 11], "x": 12, "y": 3 }, - { "matrix": [3, 12], "x": 13, "y": 3 }, - { "matrix": [3, 13], "x": 14, "y": 3 }, + {"matrix": [3, 0], "w": 2, "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, - { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, - { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, - { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 }, - { "matrix": [4, 9], "x": 10, "y": 4 }, - { "matrix": [4, 10], "x": 11, "y": 4 }, - { "matrix": [4, 11], "x": 12, "y": 4 }, - { "matrix": [4, 12], "x": 13, "y": 4 }, - { "matrix": [4, 13], "x": 14, "y": 4 } + {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4}, + {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4}, + {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4}, + {"matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} ] } } -} \ No newline at end of file +} diff --git a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c index a2f71eda95..0396bd77d1 100644 --- a/keyboards/kbdcraft/adam64/keymaps/default/keymap.c +++ b/keyboards/kbdcraft/adam64/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SPI, RGB_SPD, KC_HOME, KC_PGUP, EE_CLR, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, NK_TOGG, KC_NO, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_MOD, KC_VOLD, RGB_TOG + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, NK_TOGG, KC_NO, KC_NO, KC_INS, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RGB_MOD, KC_VOLD, RGB_TOG ) }; diff --git a/keyboards/keycapsss/3w6_2040/config.h b/keyboards/keycapsss/3w6_2040/config.h index 0cb820a3a7..bf54e4ee37 100644 --- a/keyboards/keycapsss/3w6_2040/config.h +++ b/keyboards/keycapsss/3w6_2040/config.h @@ -23,7 +23,4 @@ #define RGBLIGHT_DEFAULT_VAR 255 #define RGBLIGHT_DEFAULT_SPD 2 -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 - -#define DYNAMIC_KEYMAP_LAYER_COUNT 9 \ No newline at end of file +#define DYNAMIC_KEYMAP_LAYER_COUNT 9 diff --git a/keyboards/keyhive/absinthe/keymaps/vial/keymap.c b/keyboards/keyhive/absinthe/keymaps/vial/keymap.c index 91343a1370..c22e351663 100644 --- a/keyboards/keyhive/absinthe/keymaps/vial/keymap.c +++ b/keyboards/keyhive/absinthe/keymaps/vial/keymap.c @@ -17,14 +17,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_default( - KC_GESC, 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_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP, + QK_GESC, 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_BSLS, KC_GRV, KC_INS, KC_HOME, KC_PGUP, 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_BSPC, KC_DEL, KC_END, KC_PGDN, KC_LCTL, 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT_default( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/keymaps/vial/keymap.c b/keyboards/mechlovin/adelais/standard_led/arm/rev4/keymaps/vial/keymap.c index c83d398f64..f4cf26ab4e 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/keymaps/vial/keymap.c +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/keymaps/vial/keymap.c @@ -17,15 +17,15 @@ enum my_keycodes { BL_TOG = USER00, - BL_EFFECT = USER01, - BL_ISPD = USER02, - BL_DSPD = USER03, - BL_IHUE = USER04, - BL_DHUE = USER05, - BL_ISAT = USER06, - BL_DSAT = USER07, - BL_IVAL = USER08, - BL_DVAL = USER09 + BL_EFFECT, + BL_ISPD, + BL_DSPD, + BL_IHUE, + BL_DHUE, + BL_ISAT, + BL_DSAT, + BL_IVAL, + BL_DVAL }; @@ -47,14 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PAST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_P0, KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - + KC_TRNS, KC_P0, KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; #ifdef ENCODER_ENABLE diff --git a/keyboards/mechlovin/infinity87/keymaps/vial/keymap.c b/keyboards/mechlovin/infinity87/keymaps/vial/keymap.c index 6267857a24..bd15bd1fd9 100644 --- a/keyboards/mechlovin/infinity87/keymaps/vial/keymap.c +++ b/keyboards/mechlovin/infinity87/keymaps/vial/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, 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_INS, KC_HOME, KC_PGUP, 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_DEL, KC_END, KC_PGDN, 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_HASH, KC_ENT, diff --git a/keyboards/planck/rev6_drop/keymaps/vial/rules.mk b/keyboards/planck/rev6_drop/keymaps/vial/rules.mk index 9dbbcc4c49..1ab38db929 100644 --- a/keyboards/planck/rev6_drop/keymaps/vial/rules.mk +++ b/keyboards/planck/rev6_drop/keymaps/vial/rules.mk @@ -1,5 +1,6 @@ VIA_ENABLE = yes VIAL_ENABLE = yes +RGB_MATRIX_ENABLE = yes VIALRGB_ENABLE = yes LTO_ENABLE = yes diff --git a/keyboards/planck/rev6_drop/keymaps/vial/vial.json b/keyboards/planck/rev6_drop/keymaps/vial/vial.json index edf741abc7..5a0f5f9de2 100644 --- a/keyboards/planck/rev6_drop/keymaps/vial/vial.json +++ b/keyboards/planck/rev6_drop/keymaps/vial/vial.json @@ -2,17 +2,8 @@ "name": "OLKB PLANCK REV6.1", "vendorId": "0x03A8", "productId": "0xA4F9", - "firmwareVersion": 0, - "keycodes": ["via/keycodes", "via/qmk_lighting"], - "lighting": "vialrgb", - "menus": [ - "via/keymap", - "via/layouts", - "via/macros", - "via/save_load", - "core/qmk_rgblight" - ], "matrix": {"rows": 8, "cols": 6}, + "lighting": "vialrgb", "layouts": { "labels": [["Layout", "MIT (1x2u)", "Grid (2x1u)", "2x2u", "3x3u"]], "keymap": [ @@ -113,4 +104,4 @@ ] ] } -} \ No newline at end of file +} diff --git a/keyboards/rainkeebs/twoyo/config.h b/keyboards/rainkeebs/twoyo/config.h index e74c75e600..a14020674f 100644 --- a/keyboards/rainkeebs/twoyo/config.h +++ b/keyboards/rainkeebs/twoyo/config.h @@ -18,9 +18,6 @@ /* usb handedness? */ #define SPLIT_USB_DETECT -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCING 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/rainkeebs/twoyo/info.json b/keyboards/rainkeebs/twoyo/info.json index 678691453d..2c8fcd1a4a 100644 --- a/keyboards/rainkeebs/twoyo/info.json +++ b/keyboards/rainkeebs/twoyo/info.json @@ -1,144 +1,97 @@ { - "manufacturer": "rainkeebs", - "keyboard_name": "Twoyo", - "maintainer": "rainkeebs", - "bootloader": "caterina", - "config_h_features": { - "audio": false, - "backlight": false, - "bootmagic": true, - "command": false, - "console": false, - "encoder": true, - "extrakey": true, - "mousekey": true, - "nkro": true, - "sleep_led": false - }, - "diode_direction": "COL2ROW", - "encoder": { - "enabled": true, - "rotary": [ - { - "pin_a": "F4", - "pin_b": "F5" - } - ] - }, - "features": { - "audio": false, - "backlight": false, - "bootmagic": true, - "command": false, - "console": false, - "encoder": true, - "extrakey": true, - "mousekey": true, - "nkro": true, - "sleep_led": false - }, - "height": 4, - "keyboard_folder": "rainkeebs/twoyo", - "keymaps": {}, - "matrix_pins": { - "cols": ["D1", "B6", "B2", "B3", "B1", "F7"], - "rows": ["F6", "C6", "D4", "D0"] - }, - "matrix_size": { - "cols": 6, - "rows": 8 - }, - "mouse_key": { - "enabled": true - }, - "parse_errors": [], - "parse_warnings": [], - "platform": "unknown", - "processor": "atmega32u4", - "processor_type": "avr", - "protocol": "LUFA", - "split": { - "enabled": true, - "encoder": { - "right": { - "rotary": [ - { - "pin_a": "D1", - "pin_b": "D0" - } - ] - } - }, - "matrix_pins": { - "right": { - "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], - "rows": ["F4", "F7", "F6", "B6"] - } - }, - "soft_serial_pin": "D3", - "transport": { - "protocol": "serial" - }, - "usb_detect": { - "enabled": false - } - }, - "url": "https://www.rainkeebs.mx/product/twoyo-keyboard-kit", - "usb": { - "device_ver": "0x0001", - "device_version": "0.0.1", - "pid": "0x616B", - "vid": "0x726B" - }, - "width": 14, - "layouts": { - "LAYOUT": { - "c_macro": true, - "filename": "keyboards/rainkeebs/twoyo/twoyo.h", - "layout": [ - { "label": "0,0", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "0,1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "0,2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "0,3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "0,4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "0,5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "0,6", "matrix": [4, 0], "w": 1, "x": 8, "y": 0 }, - { "label": "0,7", "matrix": [4, 1], "w": 1, "x": 9, "y": 0 }, - { "label": "0,8", "matrix": [4, 2], "w": 1, "x": 10, "y": 0 }, - { "label": "0,9", "matrix": [4, 3], "w": 1, "x": 11, "y": 0 }, - { "label": "0,10", "matrix": [4, 4], "w": 1, "x": 12, "y": 0 }, - { "label": "0,11", "matrix": [4, 5], "w": 1, "x": 13, "y": 0 }, - { "label": "1,0", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "1,1", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "1,2", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, - { "label": "1,3", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, - { "label": "1,4", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, - { "label": "1,5", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 }, - { "label": "1,7", "matrix": [5, 1], "w": 1, "x": 8.25, "y": 1 }, - { "label": "1,8", "matrix": [5, 2], "w": 1, "x": 9.25, "y": 1 }, - { "label": "1,9", "matrix": [5, 3], "w": 1, "x": 10.25, "y": 1 }, - { "label": "1,10", "matrix": [5, 4], "w": 1, "x": 11.25, "y": 1 }, - { "label": "1,11", "matrix": [5, 5], "w": 1.75, "x": 12.25, "y": 1 }, - { "label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "2,1", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "2,2", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "2,3", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "2,4", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "2,5", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "2,7", "matrix": [6, 1], "w": 1, "x": 8.75, "y": 2 }, - { "label": "2,8", "matrix": [6, 2], "w": 1, "x": 9.75, "y": 2 }, - { "label": "2,9", "matrix": [6, 3], "w": 1, "x": 10.75, "y": 2 }, - { "label": "2,10", "matrix": [6, 4], "w": 1, "x": 11.75, "y": 2 }, - { "label": "2,11", "matrix": [6, 5], "w": 1.25, "x": 12.75, "y": 2 }, - { "label": "3,0", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "label": "3,1", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, - { "label": "3,2", "matrix": [3, 2], "w": 1.25, "x": 2.25, "y": 3 }, - { "label": "3,4", "matrix": [3, 4], "w": 2.75, "x": 3.5, "y": 3 }, - { "label": "3,7", "matrix": [7, 1], "w": 2.25, "x": 8.25, "y": 3 }, - { "label": "3,9", "matrix": [7, 3], "w": 1.25, "x": 10.5, "y": 3 }, - { "label": "3,10", "matrix": [7, 4], "w": 1, "x": 11.75, "y": 3 }, - { "label": "3,11", "matrix": [7, 5], "w": 1.25, "x": 12.75, "y": 3 } - ] - } - } + "manufacturer": "rainkeebs", + "keyboard_name": "Twoyo", + "maintainer": "rainkeebs", + "development_board": "promicro", + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "F4", "pin_b": "F5"} + ] + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["D1", "B6", "B2", "B3", "B1", "F7"], + "rows": ["F6", "C6", "D4", "D0"] + }, + "split": { + "enabled": true, + "encoder": { + "right": { + "rotary": [ + {"pin_a": "D1", "pin_b": "D0"} + ] + } + }, + "matrix_pins": { + "right": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F7", "F6", "B6"] + } + }, + "soft_serial_pin": "D3", + "transport": { + "protocol": "serial" + } + }, + "url": "https://www.rainkeebs.mx/product/twoyo-keyboard-kit", + "usb": { + "device_version": "0.0.1", + "pid": "0x616B", + "vid": "0x726B" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0, "w": 1}, + {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1}, + {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1}, + {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1}, + {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1}, + {"label": "0,6", "matrix": [4, 0], "x": 8, "y": 0, "w": 1}, + {"label": "0,7", "matrix": [4, 1], "x": 9, "y": 0, "w": 1}, + {"label": "0,8", "matrix": [4, 2], "x": 10, "y": 0, "w": 1}, + {"label": "0,9", "matrix": [4, 3], "x": 11, "y": 0, "w": 1}, + {"label": "0,10", "matrix": [4, 4], "x": 12, "y": 0, "w": 1}, + {"label": "0,11", "matrix": [4, 5], "x": 13, "y": 0, "w": 1}, + {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"label": "1,1", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1}, + {"label": "1,2", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1}, + {"label": "1,3", "matrix": [1, 3], "x": 3.25, "y": 1, "w": 1}, + {"label": "1,4", "matrix": [1, 4], "x": 4.25, "y": 1, "w": 1}, + {"label": "1,5", "matrix": [1, 5], "x": 5.25, "y": 1, "w": 1}, + {"label": "1,7", "matrix": [5, 1], "x": 8.25, "y": 1, "w": 1}, + {"label": "1,8", "matrix": [5, 2], "x": 9.25, "y": 1, "w": 1}, + {"label": "1,9", "matrix": [5, 3], "x": 10.25, "y": 1, "w": 1}, + {"label": "1,10", "matrix": [5, 4], "x": 11.25, "y": 1, "w": 1}, + {"label": "1,11", "matrix": [5, 5], "x": 12.25, "y": 1, "w": 1.75}, + {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1}, + {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1}, + {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1}, + {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1}, + {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1}, + {"label": "2,7", "matrix": [6, 1], "x": 8.75, "y": 2, "w": 1}, + {"label": "2,8", "matrix": [6, 2], "x": 9.75, "y": 2, "w": 1}, + {"label": "2,9", "matrix": [6, 3], "x": 10.75, "y": 2, "w": 1}, + {"label": "2,10", "matrix": [6, 4], "x": 11.75, "y": 2, "w": 1}, + {"label": "2,11", "matrix": [6, 5], "x": 12.75, "y": 2, "w": 1.25}, + {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1}, + {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"label": "3,4", "matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.75}, + {"label": "3,7", "matrix": [7, 1], "x": 8.25, "y": 3, "w": 2.25}, + {"label": "3,9", "matrix": [7, 3], "x": 10.5, "y": 3, "w": 1.25}, + {"label": "3,10", "matrix": [7, 4], "x": 11.75, "y": 3, "w": 1}, + {"label": "3,11", "matrix": [7, 5], "x": 12.75, "y": 3, "w": 1.25} + ] + } + } } diff --git a/keyboards/rainkeebs/twoyo/keymaps/default/keymap.c b/keyboards/rainkeebs/twoyo/keymaps/default/keymap.c index 3f35b2d50b..5e14849704 100644 --- a/keyboards/rainkeebs/twoyo/keymaps/default/keymap.c +++ b/keyboards/rainkeebs/twoyo/keymaps/default/keymap.c @@ -28,16 +28,16 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE, + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENTER, - KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1), - KC_LCTRL, KC_LGUI, KC_LALT, MO(2), KC_SPC, KC_RALT, KC_RGUI, KC_RCTRL + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, MO(2), KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), LAYOUT( KC_TILDE, KC_EXCLAIM, KC_AT, KC_HASH, KC_DOLLAR, KC_PERCENT, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_UNDS, KC_LCBR, KC_RCBR, KC_DQT, KC_COLON, KC_TRNS, - KC_TRNS, RESET, KC_NO, KC_NO, KC_NO, KC_PLUS, KC_PIPE, KC_QUES, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_PLUS, KC_PIPE, KC_QUES, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/rainkeebs/twoyo/keymaps/default/rules.mk b/keyboards/rainkeebs/twoyo/keymaps/default/rules.mk new file mode 100644 index 0000000000..ee32568148 --- /dev/null +++ b/keyboards/rainkeebs/twoyo/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/rainkeebs/twoyo/keymaps/via/keymap.c b/keyboards/rainkeebs/twoyo/keymaps/via/keymap.c deleted file mode 100644 index a32c73c291..0000000000 --- a/keyboards/rainkeebs/twoyo/keymaps/via/keymap.c +++ /dev/null @@ -1,117 +0,0 @@ -/* Copyright 2021 Regan Palmer - * - * 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENTER, - KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1), - KC_LCTRL, KC_LGUI, KC_LALT, MO(2), KC_SPC, KC_RALT, KC_RGUI, KC_RCTRL - ), - - LAYOUT( - KC_TILDE, KC_EXCLAIM, KC_AT, KC_HASH, KC_DOLLAR, KC_PERCENT, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_UNDS, KC_LCBR, KC_RCBR, KC_DQT, KC_COLON, KC_TRNS, - KC_TRNS, RESET, KC_NO, KC_NO, KC_NO, KC_PLUS, KC_PIPE, KC_QUES, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - LAYOUT( - KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, - KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_MINS, KC_LBRC, KC_RBRC, KC_QUOTE, KC_SCLN, KC_TRNS, - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_EQL, KC_BSLS, KC_SLASH, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; - -void encoder_update_user(uint8_t index, bool clockwise) { - - switch (get_highest_layer(layer_state)) { - case 0: - if (index == 0) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - else if (index == 1) { - if (clockwise) { - tap_code(KC_MS_WH_DOWN); - } else { - tap_code(KC_MS_WH_UP); - } - } - break; - case 1: - if (index == 0) { - if (clockwise) { - tap_code(KC_MNXT); - } else { - tap_code(KC_MPRV); - } - } - else if (index == 1) { - if (clockwise) { - tap_code(KC_WH_R); - } else { - tap_code(KC_WH_L); - } - } - break; - case 2: - if (index == 0) { - if (clockwise) { - tap_code(KC_PGUP); - } else { - tap_code(KC_PGDOWN); - } - } - else if (index == 1) { - if (clockwise) { - tap_code(KC_END); - } else { - tap_code(KC_HOME); - } - } - break; - case 3: - if (index == 0) { - if (clockwise) { - tap_code(KC_PGUP); - } else { - tap_code(KC_PGDOWN); - } - } - else if (index == 1) { - if (clockwise) { - tap_code(KC_END); - } else { - tap_code(KC_HOME); - } - } - break; - } -}; diff --git a/keyboards/rainkeebs/twoyo/keymaps/via/rules.mk b/keyboards/rainkeebs/twoyo/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/rainkeebs/twoyo/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/rainkeebs/twoyo/keymaps/vial/keymap.c b/keyboards/rainkeebs/twoyo/keymaps/vial/keymap.c index 3f35b2d50b..5e14849704 100644 --- a/keyboards/rainkeebs/twoyo/keymaps/vial/keymap.c +++ b/keyboards/rainkeebs/twoyo/keymaps/vial/keymap.c @@ -28,16 +28,16 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPACE, + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENTER, - KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1), - KC_LCTRL, KC_LGUI, KC_LALT, MO(2), KC_SPC, KC_RALT, KC_RGUI, KC_RCTRL + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, MO(2), KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), LAYOUT( KC_TILDE, KC_EXCLAIM, KC_AT, KC_HASH, KC_DOLLAR, KC_PERCENT, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_UNDS, KC_LCBR, KC_RCBR, KC_DQT, KC_COLON, KC_TRNS, - KC_TRNS, RESET, KC_NO, KC_NO, KC_NO, KC_PLUS, KC_PIPE, KC_QUES, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_PLUS, KC_PIPE, KC_QUES, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/rainkeebs/twoyo/twoyo.c b/keyboards/rainkeebs/twoyo/twoyo.c deleted file mode 100644 index 515f2dc3f2..0000000000 --- a/keyboards/rainkeebs/twoyo/twoyo.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Regan Palmer - * - * 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 . - */ -#include "twoyo.h" diff --git a/keyboards/rainkeebs/twoyo/twoyo.h b/keyboards/rainkeebs/twoyo/twoyo.h deleted file mode 100644 index 96c9a88d45..0000000000 --- a/keyboards/rainkeebs/twoyo/twoyo.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 Regan Palmer - * - * 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 . - */ -#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, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, \ - L30, L31, L32, L34, R31, R33, R34, R35 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05}, \ - { L10, L11, L12, L13, L14, L15}, \ - { L20, L21, L22, L23, L24, L25}, \ - { L30, L31, L32, KC_NO, L34, KC_NO}, \ - { R00, R01, R02, R03, R04, R05}, \ - { KC_NO, R11, R12, R13, R14, R15}, \ - { KC_NO, R21, R22, R23, R24, R25}, \ - { KC_NO, R31, KC_NO, R33, R34, R35} \ - } diff --git a/keyboards/reviung/reviung53/keymaps/vial/keymap.c b/keyboards/reviung/reviung53/keymaps/vial/keymap.c index 6b47aad35a..4764cbd274 100644 --- a/keyboards/reviung/reviung53/keymaps/vial/keymap.c +++ b/keyboards/reviung/reviung53/keymaps/vial/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, SP_LO, SP_RA, KC_LALT, KC_RGUI, KC_RCTL ), [_LOWER] = LAYOUT_reviung53( - KC_GESC, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_PAUS, KC_SLCK, KC_PSCR, _______, + QK_GESC, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_PAUS, KC_SCRL, KC_PSCR, _______, _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, KC_QUOT, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_SLSH, diff --git a/keyboards/sneakbox/aliceclonergb/keymaps/vial/keymap.c b/keyboards/sneakbox/aliceclonergb/keymaps/vial/keymap.c index bdd6deb5f8..a55b58780e 100644 --- a/keyboards/sneakbox/aliceclonergb/keymaps/vial/keymap.c +++ b/keyboards/sneakbox/aliceclonergb/keymaps/vial/keymap.c @@ -20,9 +20,7 @@ along with this program. If not, see . // Defines names for use in layer keycodes and the keymap enum layer_names { _BASE, - _FN, - _L3, - _L4 + _FN }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -38,17 +36,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, QK_BOOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_SAI, KC_TRNS, RGB_HUI, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [_L3] = LAYOUT_alice_split_bs( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [_L4] = LAYOUT_alice_split_bs( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/viktus/minne/info.json b/keyboards/viktus/minne/info.json index 396aca8bcd..a31d5d1884 100644 --- a/keyboards/viktus/minne/info.json +++ b/keyboards/viktus/minne/info.json @@ -20,7 +20,7 @@ "nkro": true }, "bootmagic": { - "matrix": [1,0] + "matrix": [1, 0] }, "build": { "lto": true @@ -43,320 +43,320 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3 }, - { "label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3 }, - { "label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3 }, - { "label": "K72", "matrix": [7, 2], "w": 1.25, "x": 4.625, "y": 3 }, - { "label": "K73", "matrix": [7, 3], "w": 1, "x": 5.875, "y": 3 }, - { "label": "K63", "matrix": [6, 3], "w": 1.25, "x": 6.875, "y": 3 }, - { "label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3 }, - { "label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3 }, - { "label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3 } + {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, + {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, + {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3}, + {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3}, + {"label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3}, + {"label": "K72", "matrix": [7, 2], "w": 1.25, "x": 4.625, "y": 3}, + {"label": "K73", "matrix": [7, 3], "w": 1, "x": 5.875, "y": 3}, + {"label": "K63", "matrix": [6, 3], "w": 1.25, "x": 6.875, "y": 3}, + {"label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3}, + {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3}, + {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3} ] }, "LAYOUT_dual175u": { "layout": [ - { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3 }, - { "label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3 }, - { "label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3 }, - { "label": "K72", "matrix": [7, 2], "w": 1.75, "x": 4.625, "y": 3 }, - { "label": "K63", "matrix": [6, 3], "w": 1.75, "x": 6.375, "y": 3 }, - { "label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3 }, - { "label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3 }, - { "label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3 } + {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, + {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, + {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3}, + {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3}, + {"label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3}, + {"label": "K72", "matrix": [7, 2], "w": 1.75, "x": 4.625, "y": 3}, + {"label": "K63", "matrix": [6, 3], "w": 1.75, "x": 6.375, "y": 3}, + {"label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3}, + {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3}, + {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3} ] }, "LAYOUT_275_225u": { "layout": [ - { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3 }, - { "label": "K61", "matrix": [6, 1], "w": 1.5, "x": 2.375, "y": 3 }, - { "label": "K72", "matrix": [7, 2], "w": 2.75, "x": 3.875, "y": 3 }, - { "label": "K63", "matrix": [6, 3], "w": 2.25, "x": 6.625, "y": 3 }, - { "label": "K74", "matrix": [7, 4], "w": 1.5, "x": 8.875, "y": 3 }, - { "label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3 } + {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, + {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, + {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3}, + {"label": "K61", "matrix": [6, 1], "w": 1.5, "x": 2.375, "y": 3}, + {"label": "K72", "matrix": [7, 2], "w": 2.75, "x": 3.875, "y": 3}, + {"label": "K63", "matrix": [6, 3], "w": 2.25, "x": 6.625, "y": 3}, + {"label": "K74", "matrix": [7, 4], "w": 1.5, "x": 8.875, "y": 3}, + {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3} ] }, "LAYOUT_dual3u": { "layout": [ - { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3 }, - { "label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3 }, - { "label": "K72", "matrix": [7, 2], "w": 3, "x": 3.375, "y": 3 }, - { "label": "K63", "matrix": [6, 3], "w": 3, "x": 6.375, "y": 3 }, - { "label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3 }, - { "label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3 } + {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, + {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, + {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3}, + {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3}, + {"label": "K72", "matrix": [7, 2], "w": 3, "x": 3.375, "y": 3}, + {"label": "K63", "matrix": [6, 3], "w": 3, "x": 6.375, "y": 3}, + {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3}, + {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3} ] }, "LAYOUT_6u": { "layout": [ - { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3 }, - { "label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3 }, - { "label": "K73", "matrix": [7, 3], "w": 6, "x": 3.375, "y": 3 }, - { "label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3 }, - { "label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3 } + {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, + {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, + {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3}, + {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3}, + {"label": "K73", "matrix": [7, 3], "w": 6, "x": 3.375, "y": 3}, + {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3}, + {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3} ] }, "LAYOUT_7u": { "layout": [ - { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K71", "matrix": [7, 1], "w": 1.5, "x": 1.375, "y": 3 }, - { "label": "K73", "matrix": [7, 3], "w": 7, "x": 2.875, "y": 3 }, - { "label": "K75", "matrix": [7, 5], "w": 1.5, "x": 9.875, "y": 3 } + {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, + {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, + {"label": "K71", "matrix": [7, 1], "w": 1.5, "x": 1.375, "y": 3}, + {"label": "K73", "matrix": [7, 3], "w": 7, "x": 2.875, "y": 3}, + {"label": "K75", "matrix": [7, 5], "w": 1.5, "x": 9.875, "y": 3} ] }, "LAYOUT_10u": { "layout": [ - { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K73", "matrix": [7, 3], "w": 10, "x": 1.375, "y": 3 } + {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0}, + {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1}, + {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1}, + {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1}, + {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1}, + {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1}, + {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2}, + {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2}, + {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2}, + {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2}, + {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2}, + {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2}, + {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2}, + {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2}, + {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2}, + {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2}, + {"label": "K73", "matrix": [7, 3], "w": 10, "x": 1.375, "y": 3} ] } } diff --git a/keyboards/viktus/minne/keymaps/default/keymap.c b/keyboards/viktus/minne/keymaps/default/keymap.c index bf34ed993e..547132712c 100644 --- a/keyboards/viktus/minne/keymaps/default/keymap.c +++ b/keyboards/viktus/minne/keymaps/default/keymap.c @@ -18,9 +18,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(1), - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL ) }; diff --git a/keyboards/viktus/minne/keymaps/via/keymap.c b/keyboards/viktus/minne/keymaps/via/keymap.c index bf34ed993e..547132712c 100644 --- a/keyboards/viktus/minne/keymaps/via/keymap.c +++ b/keyboards/viktus/minne/keymaps/via/keymap.c @@ -18,9 +18,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(1), - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL + KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL ) }; diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json index afe00b7652..4f795e082f 100644 --- a/keyboards/viktus/minne_topre/info.json +++ b/keyboards/viktus/minne_topre/info.json @@ -19,7 +19,7 @@ "nkro": true }, "bootmagic": { - "matrix": [0,0] + "matrix": [0, 0] }, "build": { "lto": true @@ -32,224 +32,224 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 }, - { "label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3 }, - { "label": "K35", "matrix": [3, 5], "w": 1, "x": 5.875, "y": 3 }, - { "label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3 }, - { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 }, - { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 } + {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0}, + {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0}, + {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1}, + {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1}, + {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1}, + {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1}, + {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1}, + {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1}, + {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2}, + {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2}, + {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2}, + {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2}, + {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2}, + {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2}, + {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2}, + {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3}, + {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3}, + {"label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3}, + {"label": "K35", "matrix": [3, 5], "w": 1, "x": 5.875, "y": 3}, + {"label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3}, + {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3}, + {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3} ] }, "LAYOUT_dual_3u": { "layout": [ - { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 }, - { "label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3 }, - { "label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3 }, - { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 }, - { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 } + {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0}, + {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0}, + {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1}, + {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1}, + {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1}, + {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1}, + {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1}, + {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1}, + {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2}, + {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2}, + {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2}, + {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2}, + {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2}, + {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2}, + {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2}, + {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3}, + {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3}, + {"label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3}, + {"label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3}, + {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3}, + {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3} ] }, "LAYOUT_6u": { "layout": [ - { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3 }, - { "label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3 }, - { "label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3 }, - { "label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3 } + {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0}, + {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0}, + {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1}, + {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1}, + {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1}, + {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1}, + {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1}, + {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1}, + {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2}, + {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2}, + {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2}, + {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2}, + {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2}, + {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2}, + {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2}, + {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3}, + {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3}, + {"label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3}, + {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3}, + {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3} ] }, "LAYOUT_7u": { "layout": [ - { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3 }, - { "label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3 }, - { "label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3 } + {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0}, + {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0}, + {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1}, + {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1}, + {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1}, + {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1}, + {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1}, + {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1}, + {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2}, + {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2}, + {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2}, + {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2}, + {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2}, + {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2}, + {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2}, + {"label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3}, + {"label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3}, + {"label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3} ] }, "LAYOUT_10u": { "layout": [ - { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 }, - { "label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, - { "label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, - { "label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 }, - { "label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 }, - { "label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 }, - { "label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 }, - { "label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 }, - { "label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 }, - { "label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 }, - { "label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, - { "label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, - { "label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, - { "label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, - { "label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, - { "label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, - { "label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, - { "label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, - { "label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, - { "label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, - { "label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3 } + {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0}, + {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0}, + {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1}, + {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1}, + {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1}, + {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1}, + {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1}, + {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1}, + {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1}, + {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1}, + {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1}, + {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1}, + {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1}, + {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1}, + {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2}, + {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2}, + {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2}, + {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2}, + {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2}, + {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2}, + {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2}, + {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2}, + {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2}, + {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2}, + {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2}, + {"label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3} ] } } diff --git a/keyboards/wuque/tata80/wk/config.h b/keyboards/wuque/tata80/wk/config.h index c4890ec9b1..e8a4274181 100644 --- a/keyboards/wuque/tata80/wk/config.h +++ b/keyboards/wuque/tata80/wk/config.h @@ -15,17 +15,7 @@ */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2, B1, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -#define FORCE_NKRO diff --git a/keyboards/wuque/tata80/wk/info.json b/keyboards/wuque/tata80/wk/info.json index f1b5acf12d..ce532c9269 100644 --- a/keyboards/wuque/tata80/wk/info.json +++ b/keyboards/wuque/tata80/wk/info.json @@ -6,8 +6,14 @@ "usb": { "vid": "0x2365", "pid": "0x0168", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, + "matrix_pins": { + "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "indicators": { @@ -16,99 +22,108 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - { "label": "F5", "x": 5.5, "y": 0 }, - { "label": "F6", "x": 6.5, "y": 0 }, - { "label": "F7", "x": 7.5, "y": 0 }, - { "label": "F8", "x": 8.5, "y": 0 }, - { "label": "F9", "x": 9.75, "y": 0 }, - { "label": "F10", "x": 10.75, "y": 0 }, - { "label": "F11", "x": 11.75, "y": 0 }, - { "label": "F12", "x": 12.75, "y": 0 }, - { "label": "F13", "x": 14, "y": 0 }, - { "label": "Print", "x": 15.25, "y": 0 }, - { "label": "Scroll", "x": 16.25, "y": 0 }, - { "label": "Pause", "x": 17.25, "y": 0 }, + {"matrix": [0, 0], "x": 0, "y": 0}, - { "label": "~", "x": 0, "y": 1.25 }, - { "label": "1", "x": 1, "y": 1.25 }, - { "label": "2", "x": 2, "y": 1.25 }, - { "label": "3", "x": 3, "y": 1.25 }, - { "label": "4", "x": 4, "y": 1.25 }, - { "label": "5", "x": 5, "y": 1.25 }, - { "label": "6", "x": 6, "y": 1.25 }, - { "label": "7", "x": 7, "y": 1.25 }, - { "label": "8", "x": 8, "y": 1.25 }, - { "label": "9", "x": 9, "y": 1.25 }, - { "label": "0", "x": 10, "y": 1.25 }, - { "label": "-", "x": 11, "y": 1.25 }, - { "label": "=", "x": 12, "y": 1.25 }, - { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 }, - { "label": "Insert", "x": 15.25, "y": 1.25 }, - { "label": "Home", "x": 16.25, "y": 1.25 }, - { "label": "PageUp", "x": 17.25, "y": 1.25 }, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, - { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 2.25 }, - { "label": "W", "x": 2.5, "y": 2.25 }, - { "label": "E", "x": 3.5, "y": 2.25 }, - { "label": "R", "x": 4.5, "y": 2.25 }, - { "label": "T", "x": 5.5, "y": 2.25 }, - { "label": "Y", "x": 6.5, "y": 2.25 }, - { "label": "U", "x": 7.5, "y": 2.25 }, - { "label": "I", "x": 8.5, "y": 2.25 }, - { "label": "O", "x": 9.5, "y": 2.25 }, - { "label": "P", "x": 10.5, "y": 2.25 }, - { "label": "[", "x": 11.5, "y": 2.25 }, - { "label": "]", "x": 12.5, "y": 2.25 }, - { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 }, - { "label": "Delete", "x": 15.25, "y": 2.25 }, - { "label": "End", "x": 16.25, "y": 2.25 }, - { "label": "PageDown", "x": 17.25, "y": 2.25 }, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, - { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 3.25 }, - { "label": "S", "x": 2.75, "y": 3.25 }, - { "label": "D", "x": 3.75, "y": 3.25 }, - { "label": "F", "x": 4.75, "y": 3.25 }, - { "label": "G", "x": 5.75, "y": 3.25 }, - { "label": "H", "x": 6.75, "y": 3.25 }, - { "label": "J", "x": 7.75, "y": 3.25 }, - { "label": "K", "x": 8.75, "y": 3.25 }, - { "label": "L", "x": 9.75, "y": 3.25 }, - { "label": ";", "x": 10.75, "y": 3.25 }, - { "label": "'", "x": 11.75, "y": 3.25 }, - { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 }, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, - { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 }, - { "label": "Z", "x": 2.25, "y": 4.25 }, - { "label": "X", "x": 3.25, "y": 4.25 }, - { "label": "C", "x": 4.25, "y": 4.25 }, - { "label": "V", "x": 5.25, "y": 4.25 }, - { "label": "B", "x": 6.25, "y": 4.25 }, - { "label": "N", "x": 7.25, "y": 4.25 }, - { "label": "M", "x": 8.25, "y": 4.25 }, - { "label": ",", "x": 9.25, "y": 4.25 }, - { "label": ".", "x": 10.25, "y": 4.25 }, - { "label": "/", "x": 11.25, "y": 4.25 }, - { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 }, - { "label": "\u2191", "x": 16.25, "y": 4.25 }, + {"matrix": [0, 13], "x": 14, "y": 0}, - { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 }, - { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 }, - { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 }, - { "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 }, - { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 }, - { "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25 }, - { "label": "Win", "x": 12.5, "y": 5.25, "w": 1.25 }, - { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 }, - { "label": "\u2190", "x": 15.25, "y": 5.25 }, - { "label": "\u2193", "x": 16.25, "y": 5.25 }, - { "label": "\u2192", "x": 17.25, "y": 5.25 } + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} ] } } diff --git a/keyboards/xelus/rs60/keymaps/vial/rules.mk b/keyboards/xelus/rs60/keymaps/vial/rules.mk index 46f9f1360f..a1c84ce8f9 100644 --- a/keyboards/xelus/rs60/keymaps/vial/rules.mk +++ b/keyboards/xelus/rs60/keymaps/vial/rules.mk @@ -1,3 +1,5 @@ VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes + +CONSOLE_ENABLE = no