Colemak-DH/Tarmak with VIA on Keychron Q3

* Added vial support for For_Science

* Update rules.mk

* Disabled QMK features to keep firmware size in check for AVR

* moved qmk feature flags from keyboard.json to vial/rules.mk

Moved QMK feature disables to vial/rules.mk to maintain compatibility with upstream QMK.

* Delete rules.mk

keyboards/dztech/tofu/jr/v1/keymaps/vial/config.h

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x79, 0x6C, 0xEF, 0x4E, 0xC6, 0x63, 0x5F, 0xF2}
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }

keyboards/dztech/tofu/jr/v1/keymaps/vial/keymap.c

@@ -0,0 +1,48 @@
+/* Copyright 2022 DZTECH <moyi4681@live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi(
+        KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        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_PGUP,
+        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_PGDN,
+        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL,  KC_LGUI, KC_LALT,                            KC_SPC,           KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+        QK_GESC, 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_HOME,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP,
+        KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,         EE_CLR,  KC_PGDN,
+        KC_LSFT, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,          KC_VOLU, KC_MUTE,
+        _______, _______, _______,                            _______,          _______, _______, _______,          KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+    [2] = LAYOUT_65_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,          _______, _______, _______,          _______, _______, _______
+    ),
+    [3] = LAYOUT_65_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,          _______, _______, _______,          _______, _______, _______
+    )
+};

keyboards/dztech/tofu/jr/v1/keymaps/vial/rules.mk

@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIALRGB_ENABLE = yes

keyboards/dztech/tofu/jr/v1/keymaps/vial/vial.json

@@ -0,0 +1,159 @@
+{
+  "name": "TOFU_JR",
+  "vendorId": "0x445A",
+  "productId": "0x1426",
+  "matrix": {
+    "rows": 5,
+    "cols": 15
+  },
+  "lighting": "vialrgb",
+  "layouts": {
+    "keymap": [
+      [
+        {
+          "c": "#777777"
+        },
+        "0,0",
+        {
+          "c": "#cccccc"
+        },
+        "0,1",
+        "0,2",
+        "0,3",
+        "0,4",
+        "0,5",
+        "0,6",
+        "0,7",
+        "0,8",
+        "0,9",
+        "0,10",
+        "0,11",
+        "0,12",
+        {
+          "w": 2
+        },
+        "0,13",
+        {
+          "c": "#cccccc"
+        },
+        "0,14"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "1,0",
+        {
+          "c": "#cccccc"
+        },
+        "1,1",
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5",
+        "1,6",
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10",
+        "1,11",
+        "1,12",
+        {
+          "w": 1.5
+        },
+        "1,13",
+        "1,14"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "2,0",
+        {
+          "c": "#cccccc"
+        },
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6",
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10",
+        "2,11",
+        {
+          "c": "#777777",
+          "w": 2.25
+        },
+        "2,12",
+        {
+          "c": "#cccccc"
+        },
+        "2,14"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 2.25
+        },
+        "3,0",
+        {
+          "c": "#cccccc"
+        },
+        "3,1",
+        "3,2",
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6",
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10",
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "3,11",
+        "3,13",
+        {
+          "c": "#cccccc"
+        },
+        "3,14"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,0",
+        {
+          "w": 1.25
+        },
+        "4,1",
+        {
+          "w": 1.25
+        },
+        "4,2",
+        {
+          "c": "#cccccc",
+          "w": 6.25
+        },
+        "4,6",
+        {
+          "c": "#aaaaaa"
+        },
+        "4,8",
+        "4,9",
+        "4,10",
+        "4,12",
+        "4,13",
+        "4,14"
+      ]
+    ]
+  }
+}

keyboards/for_science/keymaps/vial/config.h

@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x89, 0xFB, 0xBB, 0x3C, 0xA4, 0x75, 0x46, 0x11}
+#define VIAL_UNLOCK_COMBO_ROWS { 0,0 }
+#define VIAL_UNLOCK_COMBO_COLS { 0,1 }

keyboards/for_science/keymaps/vial/keymap.c

@@ -0,0 +1,113 @@
+/* Copyright 2017 Paul James (paul@peej.co.uk)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _LAYER,
+    _MOD_LAYER,
+    _FUNCT
+};
+
+#define SFT_A SFT_T(KC_A)
+#define SFT_F1 SFT_T(KC_F1)
+#define SFT_Z SFT_T(KC_Z)
+#define SFT_F6 SFT_T(KC_F6)
+#define LAY_X LT(_LAYER, KC_X)
+#define LAY_F7 LT(_LAYER, KC_F7)
+#define LAY_SLS LT(_LAYER, KC_SLSH)
+#define LAY_SPC LT(_LAYER, KC_SPACE)
+
+#define LOCK LGUI(KC_L)
+#define MAC_LCK LGUI(LCTL(KC_Q))
+
+#define LAYER MO(_LAYER)
+#define FUNCT MO(_FUNCT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+ * ,----------------------------------------   ----------------------------------------.
+ * |  Tab  |  Esc  |   (   |   {   |   [   |   |   ]   |   }   |   )   |   '   | BkSp  |
+ * |   ~   |   `   |   <   |   _   |   -   |   |   +   |   =   |   >   |   \   |  Del  |
+ * |-------+-------+-------+-------+-------+   |-------+-------+-------+-------+-------|
+ * |   Q   |   W   |   E   |   R   |   T   |   |   Y   |   U   |   I   |   O   |   P   |
+ * |   1   |   2   |   3   |   4   |   5   |   |   6   |   7   |   8   |   9   |   0   |
+ * |-------+-------+-------+-------+-------+   |-------+-------+-------+-------+-------|
+ * |   A   |   S   |   D   |   F   |   G   |   |   H   |   J   |   K   |   L   | Enter |
+ * |  F1   |  F2      F3   |  F4   |  F5   |   | PgUp  | Home  |  Up   |  End  |   ;   |
+ * |-Shift-+-------+-------+-------+-------+   |-------+-------+-------+-------+-------|
+ * |   Z   |   X   |   C   |   V   |   B   |   |   N   |   M   |   ,   |   .   |   /   |
+ * |  F6   |  F7   |  F8   |  F9   |  F10  |   | PgDn  | Left  | Down  | Right |       |
+ * `-Shift---Layer-+-------+-------+-------+   |-------+-------+-------+---------Layer-'
+ *                 | Ctrl  |  Gui  |  Alt  |   | Space | Layer | Shift |
+ *                 |       |       |       |   | Funct |       |       |
+ *                 `------------------------   `-Layer-----------------'
+ */
+
+[_BASE] = LAYOUT_split_4x5_3(
+    KC_TAB,  KC_ESC,  KC_LPRN, KC_LCBR, KC_LBRC,    KC_RBRC, KC_RCBR, KC_RPRN, KC_QUOT, KC_BSPC,
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+    SFT_A,   KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
+    SFT_Z,   LAY_X,   KC_C,    KC_V,    KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  LAY_SLS,
+                      KC_LCTL, KC_LGUI, KC_LALT,    LAY_SPC, LAYER,   KC_RSFT
+),
+
+[_LAYER] = LAYOUT_split_4x5_3(
+    KC_TILD, KC_GRV,  KC_LABK, KC_UNDS, KC_MINS,    KC_PLUS, KC_EQL,  KC_RABK, KC_BSLS, KC_DEL,
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    SFT_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_SCLN,
+    SFT_F6,  LAY_F7,  KC_F8,   KC_F9,   KC_F10,     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______,
+                      _______, _______, _______,    FUNCT,   _______, _______
+),
+
+[_MOD_LAYER] = LAYOUT_split_4x5_3(
+    KC_TILD, _______, _______, _______, _______,    KC_Q,    _______, _______, _______, _______,
+    KC_TAB,  _______, _______, _______, _______,    _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______,
+                      _______, _______, _______,    _______, _______, _______
+),
+
+[_FUNCT] = LAYOUT_split_4x5_3(
+    QK_BOOT, _______, _______, _______, LOCK,       MAC_LCK, _______, _______, _______, QK_MAGIC_SWAP_LALT_LGUI,
+    _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______,
+                      _______, _______, _______,    _______, _______, _______
+),
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (get_mods() & MOD_MASK_CAG) {
+        if (record->event.pressed) {
+            layer_on(_MOD_LAYER);
+        } else {
+            layer_off(_MOD_LAYER);
+        }
+    }
+
+    if (record->event.pressed) {
+        if (keycode == KC_BSPC && (get_mods() & MOD_MASK_ALT)) {
+            tap_code(KC_DEL);
+            return false;
+        }
+    }
+
+    return true;
+};

keyboards/for_science/keymaps/vial/rules.mk

@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+LTO_ENABLE = yes
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no

keyboards/for_science/keymaps/vial/vial.json

@@ -0,0 +1,15 @@
+{
+    "matrix": {
+        "rows": 10,
+        "cols": 5
+    },
+    "layouts": {
+        "keymap": [
+        ["0,0","0,1","0,2","0,3","0,4",{"x":1.25},"5,0","5,1","5,2","5,3","5,4"],
+        ["1,0","1,1","1,2","1,3","1,4",{"x":1.25},"6,0","6,1","6,2","6,3","6,4"],
+        ["2,0","2,1","2,2","2,3","2,4",{"x":1.25},"7,0","7,1","7,2","7,3","7,4"],
+        ["3,0","3,1","3,2","3,3","3,4",{"x":1.25},"8,0","8,1","8,2","8,3","8,4"],
+        [{"x":2},    "4,2","4,3","4,4",{"x":1.25},"9,0","9,1","9,2"            ]
+        ]
+    }
+}

keyboards/horrortroll/chinese_pcb/black_e65/keymaps/vial/config.h

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x17, 0x64, 0x41, 0xC1, 0x5F, 0xCA, 0x48, 0xDD}
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }

keyboards/horrortroll/chinese_pcb/black_e65/keymaps/vial/keymap.c

@@ -0,0 +1,87 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ` │Bks│Del│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │PgU│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │PgD│
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │LSft│LSt│ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ ↑ │Fn │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+       │LCrl│GUI │LAlt│         Space          │RAt│Fn │RCl│ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ ~ │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │   │
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │LSft│LSt│ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │   │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │   │   │   │   │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
+    [_BASE] = LAYOUT_all(
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
+                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_PGUP,
+                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_PGDN,
+                KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   MO(_FN),
+                KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │Rst│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│   │   │PSc│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+       │RTog │Mod│Hui│Hud│Sai│Sad│Vai│Vad│   │   │   │   │   │     │Hom│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │BTog  │BTg│Dec│Inc│Ste│   │   │   │   │   │   │   │        │End│
+       ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │
+       ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │   │   │   │   │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */
+    [_FN]   = LAYOUT_all(
+                QK_BOOT, 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,
+                RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,          KC_HOME,
+                BL_TOGG, BL_TOGG, BL_DOWN, BL_UP,   BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______,                   KC_END,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+                _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+            ),
+};

keyboards/horrortroll/chinese_pcb/black_e65/keymaps/vial/rules.mk

@@ -0,0 +1,7 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+LTO_ENABLE = yes
+QMK_SETTINGS = yes
+COMBO_ENABLE = yes
+TAP_DANCE_ENABLE = no
+KEY_OVERRIDE_ENABLE = no

keyboards/horrortroll/chinese_pcb/black_e65/keymaps/vial/vial.json

@@ -0,0 +1,306 @@
+{
+    "name": "E6.5 Black PCB",
+    "vendorId": "0x4558",
+    "productId": "0xE605B",
+    "lighting": "none",
+    "matrix": {
+        "rows": 5,
+        "cols": 15
+    },
+    "keycodes": [
+      "qmk_lighting"
+    ],
+    "menus": [
+      "qmk_blacklight_rgblight"
+    ],
+    "layouts": {
+        "labels":[
+            "Split Backspace",
+            "ISO Enter",
+            [
+                "Bottom Row",
+                "No Blockers, 6.25U",
+                "No Blockers, 7U",
+                "Right Blocker, 6.25U",
+                "Right Blocker, 7U",
+                "WKL, 7U",
+                "HHKB"
+            ]
+        ],
+        "keymap": [
+            [
+                "0,0",
+                "0,1",
+                "0,2",
+                "0,3",
+                "0,4",
+                "0,5",
+                "0,6",
+                "0,7",
+                "0,8",
+                "0,9",
+                "0,10",
+                "0,11",
+                "0,12",
+                {
+                  "w": 2
+                },
+                "0,14\n\n\n0,0",
+                "4,14",
+                {
+                  "x": 1
+                },
+                "0,13\n\n\n0,1",
+                "0,14\n\n\n0,1"
+              ],
+              [
+                {
+                  "w": 1.5
+                },
+                "1,0",
+                "1,1",
+                "1,2",
+                "1,3",
+                "1,4",
+                "1,5",
+                "1,6",
+                "1,7",
+                "1,8",
+                "1,9",
+                "1,10",
+                "1,11",
+                "1,12",
+                {
+                  "w": 1.5
+                },
+                "2,12\n\n\n1,0",
+                "1,14",
+                {
+                  "x": 1.75,
+                  "w": 1.25,
+                  "h": 2,
+                  "w2": 1.5,
+                  "h2": 1,
+                  "x2": -0.25
+                },
+                "1,13\n\n\n1,1"
+              ],
+              [
+                {
+                  "w": 1.75
+                },
+                "2,0",
+                "2,1",
+                "2,2",
+                "2,3",
+                "2,4",
+                "2,5",
+                "2,6",
+                "2,7",
+                "2,8",
+                "2,9",
+                "2,10",
+                "2,11",
+                {
+                  "w": 2.25
+                },
+                "1,13\n\n\n1,0",
+                "2,14",
+                {
+                  "x": 0.75
+                },
+                "2,12\n\n\n1,1"
+              ],
+              [
+                {
+                  "w": 2.25
+                },
+                "3,0",
+                "3,2",
+                "3,3",
+                "3,4",
+                "3,5",
+                "3,6",
+                "3,7",
+                "3,8",
+                "3,9",
+                "3,10",
+                "3,11",
+                {
+                  "w": 1.75
+                },
+                "3,12",
+                "3,13",
+                "3,14"
+              ],
+              [
+                {
+                  "w": 1.25
+                },
+                "4,0\n\n\n2,0",
+                {
+                  "w": 1.25
+                },
+                "4,1\n\n\n2,0",
+                {
+                  "w": 1.25
+                },
+                "4,2\n\n\n2,0",
+                {
+                  "w": 6.25
+                },
+                "4,6\n\n\n2,0",
+                {
+                  "w": 1.5
+                },
+                "4,8\n\n\n2,0",
+                {
+                  "w": 1.5
+                },
+                "4,10\n\n\n2,0",
+                "4,11\n\n\n2,0",
+                "4,12\n\n\n2,0",
+                "4,13\n\n\n2,0"
+              ],
+              [
+                {
+                  "y": 0.25,
+                  "w": 1.5
+                },
+                "4,0\n\n\n2,1",
+                {
+                  "w": 1.5
+                },
+                "4,1\n\n\n2,1",
+                {
+                  "w": 7
+                },
+                "4,6\n\n\n2,1",
+                {
+                  "w": 1.5
+                },
+                "4,8\n\n\n2,1",
+                {
+                  "w": 1.5
+                },
+                "4,10\n\n\n2,1",
+                "4,11\n\n\n2,1",
+                "4,12\n\n\n2,1",
+                "4,13\n\n\n2,1"
+              ],
+              [
+                {
+                  "w": 1.25
+                },
+                "4,0\n\n\n2,2",
+                {
+                  "w": 1.25
+                },
+                "4,1\n\n\n2,2",
+                {
+                  "w": 1.25
+                },
+                "4,2\n\n\n2,2",
+                {
+                  "w": 6.25
+                },
+                "4,6\n\n\n2,2",
+                {
+                  "w": 1.25
+                },
+                "4,8\n\n\n2,2",
+                {
+                  "w": 1.25
+                },
+                "4,9\n\n\n2,2",
+                {
+                  "x": 0.5
+                },
+                "4,11\n\n\n2,2",
+                "4,12\n\n\n2,2",
+                "4,13\n\n\n2,2"
+              ],
+              [
+                {
+                  "w": 1.5
+                },
+                "4,0\n\n\n2,3",
+                "4,1\n\n\n2,3",
+                {
+                  "w": 1.5
+                },
+                "4,2\n\n\n2,3",
+                {
+                  "w": 7
+                },
+                "4,6\n\n\n2,3",
+                {
+                  "w": 1.5
+                },
+                "4,9\n\n\n2,3",
+                {
+                  "x": 0.5
+                },
+                "4,11\n\n\n2,3",
+                "4,12\n\n\n2,3",
+                "4,13\n\n\n2,3"
+              ],
+              [
+                {
+                  "w": 1.5
+                },
+                "4,0\n\n\n2,4",
+                {
+                  "d": true
+                },
+                "4,1\n\n\n2,4",
+                {
+                  "w": 1.5
+                },
+                "4,2\n\n\n2,4",
+                {
+                  "w": 7
+                },
+                "4,6\n\n\n2,4",
+                {
+                  "w": 1.5
+                },
+                "4,9\n\n\n2,4",
+                {
+                  "x": 0.5
+                },
+                "4,11\n\n\n2,4",
+                "4,12\n\n\n2,4",
+                "4,13\n\n\n2,4"
+              ],
+              [
+                {
+                  "w": 0.5,
+                  "d": true
+                },
+                "4\n\n\n2,5",
+                "4,0\n\n\n2,5",
+                {
+                  "w": 1.5
+                },
+                "4,1\n\n\n2,5",
+                {
+                  "w": 7
+                },
+                "4,6\n\n\n2,5",
+                {
+                  "w": 1.5
+                },
+                "4,8\n\n\n2,5",
+                "4,9\n\n\n2,5",
+                {
+                  "x": 0.5
+                },
+                "4,11\n\n\n2,5",
+                "4,12\n\n\n2,5",
+                "4,13\n\n\n2,5"
+              ]
+        ]
+    }
+  }
+  

keyboards/keebio/chiri_ce/keymaps/vial/config.h

@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x38, 0x44, 0x95, 0x0E, 0x18, 0xF1, 0x64, 0x24}
+#define VIAL_UNLOCK_COMBO_ROWS {0,7}
+#define VIAL_UNLOCK_COMBO_COLS {1,5}
+
+// Since the outer columns can be broken off, redefine the bootmagic keys as second column from outside
+#define BOOTMAGIC_ROW 0
+#define BOOTMAGIC_COLUMN 1
+
+#undef BOOTMAGIC_COLUMN_RIGHT
+#undef BOOTMAGIC_ROW_RIGHT
+#define BOOTMAGIC_ROW_RIGHT 4
+#define BOOTMAGIC_COLUMN_RIGHT 1

keyboards/keebio/chiri_ce/keymaps/vial/keymap.json

@@ -0,0 +1,32 @@
+{
+    "config": { "features": {"tri_layer": true} },
+    "keyboard": "keebio/chiri_ce/rev1",
+    "keymap": "default",
+    "layout": "LAYOUT",
+    "layers": [
+        [
+            "KC_TAB" , "KC_Q"   , "KC_W"   , "KC_E"   , "KC_R"   , "KC_T"   ,                       "KC_Y"   , "KC_U"   , "KC_I"   , "KC_O"   , "KC_P"   , "KC_DEL" ,
+            "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"   , "QK_GESC", "KC_BSPC", "KC_N"   , "KC_M"   , "KC_COMM", "KC_DOT" , "KC_SLSH", "KC_RSFT",
+                                                        "KC_LGUI", "TL_LOWR", "KC_ENT" , "KC_SPC" , "TL_UPPR", "KC_RALT"
+        ],
+        [
+            "KC_GRV" , "KC_1"   , "KC_2"   , "KC_3"   , "KC_4"   , "KC_5"   ,                       "KC_6"   , "KC_7"   , "KC_8"   , "KC_9"   , "KC_0"   , "KC_BSPC",
+            "KC_ESC" , "KC_LEFT", "KC_DOWN", "KC_UP"  , "KC_RGHT", "KC_LBRC",                       "KC_RBRC", "KC_P4"  , "KC_P5"  , "KC_P6"  , "KC_PLUS", "KC_PIPE",
+            "RGB_MOD", "_______", "_______", "_______", "_______", "KC_LCBR", "KC_LPRN", "KC_RPRN", "KC_RCBR", "KC_P1"  , "KC_P2"  , "KC_P3"  , "KC_MINS", "_______",
+                                                        "_______", "_______", "KC_DEL" , "KC_DEL" , "_______", "KC_P0"
+        ],
+        [
+            "RGB_TOG", "KC_EXLM", "KC_AT"  , "KC_HASH", "KC_DLR" , "KC_PERC",                       "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "QK_BOOT",
+            "RGB_MOD", "KC_MPRV", "KC_MNXT", "KC_VOLU", "KC_PGUP", "KC_UNDS",                       "KC_EQL" , "KC_HOME", "RGB_HUI", "RGB_SAI", "RGB_VAI", "KC_BSLS",
+            "KC_MUTE", "KC_MSTP", "KC_MPLY", "KC_VOLD", "KC_PGDN", "KC_MINS", "KC_LPRN", "_______", "KC_PLUS", "KC_END" , "RGB_HUD", "RGB_SAD", "RGB_VAD", "_______",
+                                                        "_______", "_______", "_______", "_______", "_______", "_______"
+        ],
+        [
+            "KC_F12" , "KC_F1"  , "KC_F2"  , "KC_F3"  , "KC_F4"  , "KC_F5"  ,                       "KC_F6"  , "KC_F7"  , "KC_F8"  , "KC_F9"  , "KC_F10" , "KC_F11" ,
+            "_______", "_______", "_______", "_______", "_______", "_______",                       "_______", "_______", "_______", "_______", "_______", "_______",
+            "_______", "EE_CLR" , "QK_BOOT", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "QK_BOOT", "EE_CLR" , "_______",
+                                                        "_______", "_______", "_______", "_______", "_______", "_______"
+        ]
+    ]
+}

keyboards/keebio/chiri_ce/keymaps/vial/rules.mk

@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIALRGB_ENABLE = yes

keyboards/keebio/chiri_ce/keymaps/vial/vial.json

@@ -0,0 +1,20 @@
+{
+    "lighting": "vialrgb",
+    "matrix": {
+        "rows": 8,
+        "cols": 6
+    },
+    "layouts": {
+        "labels":[
+            ["Size", "3x6", "3x5"]
+        ],
+        "keymap": [
+            [{"y":0.375},"0,0\n\n\n0,0",{"x":-1,"d":true},"0,0\n\n\n0,1","0,1",{"y":-0.25},"0,2",{"y":-0.125},"0,3",{"y":0.125},"0,4",{"y":0.125},"0,5",{"x":4},"4,5",{"y":-0.125},"4,4",{"y":-0.125},"4,3",{"y":0.125},"4,2",{"y":0.25},"4,1","4,0\n\n\n0,0",{"x":-1,"d":true},"4,0\n\n\n0,1"],
+            ["1,0\n\n\n0,0",{"x":-1,"d":true},"1,0\n\n\n0,1","1,1",{"y":-0.25},"1,2",{"y":-0.125},"1,3",{"y":0.125},"1,4",{"y":0.125},"1,5",{"x":4},"5,5",{"y":-0.125},"5,4",{"y":-0.125},"5,3",{"y":0.125},"5,2",{"y":0.25},"5,1","5,0\n\n\n0,0",{"x":-1,"d":true},"5,0\n\n\n0,1"],
+            ["2,0\n\n\n0,0",{"x":-1,"d":true},"2,0\n\n\n0,1","2,1",{"y":-0.25},"2,2",{"y":-0.125},"2,3",{"y":0.125},"2,4",{"y":0.125},"2,5",{"x":4},"6,5",{"y":-0.125},"6,4",{"y":-0.125},"6,3",{"y":0.125},"6,2",{"y":0.25},"6,1","6,0\n\n\n0,0",{"x":-1,"d":true},"6,0\n\n\n0,1"],
+            [{"x":3.5},"3,2",{"y":0.125},"3,3",{"x":5},"7,3",{"y":-0.125},"7,2"],
+            [{"r":30,"rx":5.1,"ry":4.925,"y":-1.5,"x":0.25},"3,4",{"y":-1,"x":-1},"3,5"],
+            [{"r":330,"rx":9.0,"ry":4.925,"y":-1.5,"x":0.4},"7,5",{"y":1,"x":-1},"7,4"]
+        ]
+    }
+}

keyboards/keychron/q11/ansi_encoder/keymaps/vial/vial.json

@@ -4,21 +4,68 @@
     "productId": "0x01E0",
     "lighting": "vialrgb",
     "customKeycodes": [
-      {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "MCtrl"},
+        {
-      {"name": "Launch Pad",      "title": "Launch Pad in macOS",      "shortName": "LPad"},
+            "name": "Mission Control",
-      {"name": "Left Option",     "title": "Left Option in macOS",     "shortName": "LOpt"},
+            "title": "Mission Control in macOS",
-      {"name": "Right Option",    "title": "Right Option in macOS",    "shortName": "ROpt"},
+            "shortName": "MCtrl"
-      {"name": "Left Cmd",        "title": "Left Command in macOS",    "shortName": "LCmd"},
+        },
-      {"name": "Right Cmd",       "title": "Right Command in macOS",   "shortName": "RCmd"},
+        {
-      {"name": "Siri",            "title": "Siri in macOS",            "shortName": "Siri"},
+            "name": "Launch Pad",
-      {"name": "Task View",       "title": "Task View in windows",     "shortName": "Task"},
+            "title": "Launch Pad in macOS",
-      {"name": "File Explorer",   "title": "File Explorer in windows", "shortName": "File"},
+            "shortName": "LPad"
-      {"name": "Screen Shot",     "title": "Screenshot in macOS",      "shortName": "SShot"},
+        },
-      {"name": "Cortana",         "title": "Cortana in windows",       "shortName": "Cortana"}
+        {
+            "name": "Left Option",
+            "title": "Left Option in macOS",
+            "shortName": "LOpt"
+        },
+        {
+            "name": "Right Option",
+            "title": "Right Option in macOS",
+            "shortName": "ROpt"
+        },
+        {
+            "name": "Left Cmd",
+            "title": "Left Command in macOS",
+            "shortName": "LCmd"
+        },
+        {
+            "name": "Right Cmd",
+            "title": "Right Command in macOS",
+            "shortName": "RCmd"
+        },
+        {
+            "name": "Siri",
+            "title": "Siri in macOS",
+            "shortName": "Siri"
+        },
+        {
+            "name": "Task View",
+            "title": "Task View in windows",
+            "shortName": "Task"
+        },
+        {
+            "name": "File Explorer",
+            "title": "File Explorer in windows",
+            "shortName": "File"
+        },
+        {
+            "name": "Screen Shot",
+            "title": "Screenshot in macOS",
+            "shortName": "SShot"
+        },
+        {
+            "name": "Cortana",
+            "title": "Cortana in windows",
+            "shortName": "Cortana"
+        }
     ],
-    "matrix": {"rows": 12, "cols": 9},
+    "matrix": {
+        "rows": 12,
+        "cols": 9
+    },
     "layouts": {
-      "keymap": [
+        "keymap": [
             [
                 {
                     "x": 0.25
@@ -26,7 +73,7 @@
                 "0,0\n\n\n\n\n\n\n\n\ne",
                 "0,1\n\n\n\n\n\n\n\n\ne",
                 {
-                    "x": 14.5
+                    "x": 15
                 },
                 "1,0\n\n\n\n\n\n\n\n\ne",
                 "1,1\n\n\n\n\n\n\n\n\ne"
@@ -53,6 +100,9 @@
                 },
                 "0,6",
                 "0,7",
+                {
+                    "x": 0.5
+                },
                 "6,0",
                 "6,1",
                 {
@@ -89,6 +139,9 @@
                 "1,5",
                 "1,6",
                 "1,7",
+                {
+                    "x": 0.5
+                },
                 "7,0",
                 "7,1",
                 "7,2",
@@ -125,6 +178,9 @@
                 "2,4",
                 "2,6",
                 "2,7",
+                {
+                    "x": 0.5
+                },
                 "8,0",
                 "8,1",
                 "8,2",
@@ -162,6 +218,9 @@
                 "3,4",
                 "3,5",
                 "3,6",
+                {
+                    "x": 0.5
+                },
                 "9,0",
                 "9,1",
                 "9,2",
@@ -199,6 +258,9 @@
                 "4,5",
                 "4,6",
                 "4,7",
+                {
+                    "x": 0.5
+                },
                 "10,0",
                 "10,1",
                 "10,2",
@@ -245,6 +307,7 @@
                 },
                 "5,6",
                 {
+                    "x": 0.5,
                     "w": 2.75
                 },
                 "11,1",
@@ -264,5 +327,4 @@
             ]
         ]
     }
-}
+}
-  

keyboards/keychron/q3/ansi_encoder/keymaps/vial/keymap.c

@@ -17,6 +17,14 @@
 #include QMK_KEYBOARD_H
 #include "keychron_common.h"
 
+// Set these to 0 as you progress learning COLEMAK-DH layout
+#define LAYOUT_TARMAK1 0
+#define LAYOUT_TARMAK2 0
+#define LAYOUT_TARMAK3 0
+#define LAYOUT_TARMAK4 0
+#define LAYOUT_TARMAK5 0
+#define LAYOUT_COLEMAK 1
+
 enum layers{
     MAC_BASE,
     MAC_FN,
@@ -41,21 +49,91 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
 
+#if LAYOUT_TARMAK1
     [WIN_BASE] = LAYOUT_tkl_f13_ansi(
-        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_MUTE,  KC_PSCR,  KC_CRTA,  RGB_MOD,
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_SNAP,  KC_SIRI,  RGB_MOD,
         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_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_TAB,   KC_Q,     KC_W,     KC_J,     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_ENT,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_N,     KC_E,     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,            KC_UP,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
-        KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_tkl_f13_ansi(
-        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
         _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
         _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+#elif LAYOUT_TARMAK2
+    [WIN_BASE] = LAYOUT_tkl_f13_ansi(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_SNAP,  KC_SIRI,  RGB_MOD,
+        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_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_F,     KC_R,     KC_G,     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_T,     KC_J,     KC_H,     KC_N,     KC_E,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_tkl_f13_ansi(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+#elif LAYOUT_TARMAK3
+    [WIN_BASE] = LAYOUT_tkl_f13_ansi(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_SNAP,  KC_SIRI,  RGB_MOD,
+        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_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_F,     KC_J,     KC_G,     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_R,     KC_S,     KC_T,     KC_D,     KC_H,     KC_N,     KC_E,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_tkl_f13_ansi(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+#elif LAYOUT_TARMAK4
+    [WIN_BASE] = LAYOUT_tkl_f13_ansi(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_SNAP,  KC_SIRI,  RGB_MOD,
+        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_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,     KC_J,     KC_U,     KC_I,     KC_Y,     KC_SCLN,  KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_R,     KC_S,     KC_T,     KC_D,     KC_H,     KC_N,     KC_E,     KC_L,     KC_O,     KC_QUOT,              KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_tkl_f13_ansi(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+
+#else // LAYOUT_COLEMAK / LAYOUT_TARMAK5
+    [WIN_BASE] = LAYOUT_tkl_f13_ansi(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    KC_MUTE,  KC_NO,    KC_NO,    RGB_MOD,
+        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_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,     KC_J,     KC_L,     KC_U,     KC_Y,     KC_SCLN,  KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
+        KC_CAPS,  KC_A,     KC_R,     KC_S,     KC_T,     KC_G,     KC_M,     KC_N,     KC_E,     KC_I,     KC_O,     KC_QUOT,              KC_ENT,
+        KC_LSFT,            KC_X,     KC_C,     KC_D,     KC_V,     KC_Z,     KC_K,     KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,            KC_UP,
+        KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_tkl_f13_ansi(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,  _______,  _______,  RGB_TOG,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+        _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
+#endif
 };
 
 #if defined(ENCODER_MAP_ENABLE)

keyboards/magic_force/mf34/keymaps/vial/config.h

@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x5E, 0x7B, 0xF6, 0x40, 0x62, 0x3D, 0xB4, 0x60}
+#define VIAL_UNLOCK_COMBO_ROWS {0, 0}
+#define VIAL_UNLOCK_COMBO_COLS {1, 6}
+
+#define MIDI_ADVANCED

keyboards/magic_force/mf34/keymaps/vial/keymap.c

@@ -0,0 +1,39 @@
+/*
+Copyright 2012,2013 gezhaoyou <gezhaoyou@126.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+               KC_ESC,     MO(1),   KC_EQL,     KC_LPRN,    KC_RPRN,    KC_CALCULATOR,  KC_BSPC,
+               KC_INSERT,  KC_HOME, KC_PGUP,    KC_NUM_LOCK,    KC_PSLS,    KC_PAST,        KC_PMNS,
+               KC_DEL,     KC_END,  KC_PGDN,    KC_P7,      KC_P8,      KC_P9,
+                                                KC_P4,      KC_P5,      KC_P6,          KC_PPLS,
+                           KC_UP,               KC_P1,      KC_P2,      KC_P3,
+               KC_LEFT,    KC_DOWN, KC_RGHT,                KC_P0,      KC_PDOT,        KC_PENT),
+   [_FN] = LAYOUT(
+               KC_TRNS,             KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,               KC_TRNS, QK_BOOTLOADER,
+               RGB_TOG,   RGB_HUI, RGB_MOD,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,
+               KC_TRNS,             RGB_HUD, RGB_RMOD,  KC_TRNS, KC_TRNS, KC_TRNS,
+                                                                KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
+                        RGB_VAI,                                KC_TRNS, KC_TRNS, KC_TRNS,
+               RGB_SPD, RGB_VAD, RGB_SPI,                       KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM),
+};
+

keyboards/magic_force/mf34/keymaps/vial/rules.mk

@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+MIDI_ENABLE = yes
+VIALRGB_ENABLE = yes

keyboards/magic_force/mf34/keymaps/vial/vial.json

@@ -0,0 +1,93 @@
+{
+    "name":"mf34cloneR1",
+	"vendorId":"0x1a53",
+	"productId":"0x4f51",
+	"vial": {
+	"midi": "advanced"},
+	"lighting": "qmk_rgblight",
+    "matrix": {
+        "rows": 6,
+        "cols": 7
+    },
+    "layouts": {
+        "keymap": [
+		[
+    "0,0",
+    "0,1",
+    "0,2",
+    {
+      "x": 0.25
+    },
+    "0,3",
+    "0,4",
+    "0,5",
+    "0,6"
+  ],
+  [
+    {
+      "y": 0.25
+    },
+    "1,0",
+    "1,1",
+    "1,2",
+    {
+      "x": 0.25
+    },
+    "1,3",
+    "1,4",
+    "1,5",
+    "1,6"
+  ],
+  [
+    "2,0",
+    "2,1",
+    "2,2",
+    {
+      "x": 0.25
+    },
+    "2,3",
+    "2,4",
+    "2,5",
+    {
+      "h": 2
+    },
+    "3,6"
+  ],
+  [
+    {
+      "x": 3.25
+    },
+    "3,3",
+    "3,4",
+    "3,5"
+  ],
+  [
+    {
+      "x": 1
+    },
+    "4,1",
+    {
+      "x": 1.25
+    },
+    "4,3",
+    "4,4",
+    "4,5",
+    {
+      "h": 2
+    },
+    "5,6"
+  ],
+  [
+    "5,0",
+    "5,1",
+    "5,2",
+    {
+      "x": 0.25,
+      "w": 2
+    },
+    "5,4",
+    "5,5"
+  ]
+]
+    }
+}

keyboards/nachie/evelyn/info.json

@@ -1,5 +1,5 @@
 {
-  "manufacturer": "nachie",
+  "manufacturer": "Nachie",
   "keyboard_name": "Syndrome",
   "maintainer": "nachie",
   "board": "GENERIC_RP_RP2040",
@@ -43,44 +43,44 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"y": 0.0, "x": 0.29, "matrix": [0, 0], "label": "0,0"},
+        {"y": 0, "x": 0, "matrix": [0, 0], "label": "0,0"},
-        {"y": 0.0, "x": 10.190000000000001, "matrix": [1, 4], "label": "1,4"},
+        {"y": 0, "x": 1, "matrix": [1, 0], "label": "1,0"},
-        {"y": 0.0, "x": 11.190000000000001, "matrix": [0, 5], "label": "0,5"},
+        {"y": 0, "x": 2, "matrix": [0, 1], "label": "0,1"},
-        {"y": 0.99, "x": 0.15, "matrix": [2, 0], "w": 1.25, "label": "2,0"},
+        {"y": 0, "x": 3, "matrix": [1, 1], "label": "1,1"},
-        {"y": 0.99, "x": 10.58, "matrix": [2, 5], "w": 1.75, "label": "2,5"},
+        {"y": 0, "x": 4, "matrix": [0, 2], "label": "0,2"},
-        {"y": 1.99, "x": 0.0, "matrix": [4, 0], "w": 1.75, "label": "4,0"},
+        {"y": 0, "x": 6.25, "matrix": [1, 2], "label": "1,2"},
-        {"y": 2.99, "x": 0.09000000000000001, "matrix": [6, 0], "w": 1.25, "label": "6,0"},
+        {"y": 0, "x": 7.25, "matrix": [0, 3], "label": "0,3"},
-        {"y": 6.23, "x": 3.97, "matrix": [5, 4], "w": 1.25, "label": "5,4"},
+        {"y": 0, "x": 8.25, "matrix": [1, 3], "label": "1,3"},
-        {"y": 6.23, "x": 5.220000000000001, "matrix": [4, 5], "label": "4,5"},
+        {"y": 0, "x": 9.25, "matrix": [0, 4], "label": "0,4"},
-        {"y": 7.23, "x": 4.87, "matrix": [6, 5], "w": 1.25, "label": "6,5"},
+        {"y": 0, "x": 10.25, "matrix": [1, 4], "label": "1,4"},
-        {"y": 8.23, "x": 1.43, "matrix": [1, 0], "label": "1,0"},
+        {"y": 0, "x": 11.25, "matrix": [0, 5], "label": "0,5"},
-        {"y": 8.23, "x": 2.43, "matrix": [0, 1], "label": "0,1"},
+        {"y": 1, "x": 0, "matrix": [2, 0], "w": 1.25, "label": "2,0"},
-        {"y": 8.23, "x": 3.43, "matrix": [1, 1], "label": "1,1"},
+        {"y": 1, "x": 1.25, "matrix": [3, 0], "label": "3,0"},
-        {"y": 8.23, "x": 4.430000000000001, "matrix": [0, 2], "label": "0,2"},
+        {"y": 1, "x": 2.25, "matrix": [2, 1], "label": "2,1"},
-        {"y": 9.23, "x": 1.68, "matrix": [3, 0], "label": "3,0"},
+        {"y": 1, "x": 3.25, "matrix": [3, 1], "label": "3,1"},
-        {"y": 9.23, "x": 2.68, "matrix": [2, 1], "label": "2,1"},
+        {"y": 1, "x": 4.25, "matrix": [2, 2], "label": "2,2"},
-        {"y": 9.23, "x": 3.68, "matrix": [3, 1], "label": "3,1"},
+        {"y": 1, "x": 6.5, "matrix": [3, 2], "label": "3,2"},
-        {"y": 9.23, "x": 4.680000000000001, "matrix": [2, 2], "label": "2,2"},
+        {"y": 1, "x": 7.5, "matrix": [2, 3], "label": "2,3"},
-        {"y": 10.23, "x": 2.18, "matrix": [5, 0], "label": "5,0"},
+        {"y": 1, "x": 8.5, "matrix": [3, 3], "label": "3,3"},
-        {"y": 10.23, "x": 3.18, "matrix": [4, 1], "label": "4,1"},
+        {"y": 1, "x": 9.5, "matrix": [2, 4], "label": "2,4"},
-        {"y": 10.23, "x": 4.180000000000001, "matrix": [5, 1], "label": "5,1"},
+        {"y": 1, "x": 10.5, "matrix": [2, 5], "w": 1.75, "label": "2,5"},
-        {"y": 10.23, "x": 5.180000000000001, "matrix": [4, 2], "label": "4,2"},
+        {"y": 2, "x": 0, "matrix": [4, 0], "w": 1.75, "label": "4,0"},
-        {"y": 11.23, "x": 2.93, "matrix": [6, 1], "label": "6,1"},
+        {"y": 2, "x": 1.75, "matrix": [5, 0], "label": "5,0"},
-        {"y": 11.23, "x": 3.93, "matrix": [6, 2], "w": 2.25, "label": "6,2"},
+        {"y": 2, "x": 2.75, "matrix": [4, 1], "label": "4,1"},
-        {"y": 9.89, "x": 5.930000000000001, "matrix": [1, 2], "label": "1,2"},
+        {"y": 2, "x": 3.75, "matrix": [5, 1], "label": "5,1"},
-        {"y": 9.89, "x": 6.930000000000001, "matrix": [0, 3], "label": "0,3"},
+        {"y": 2, "x": 4.75, "matrix": [4, 2], "label": "4,2"},
-        {"y": 9.89, "x": 7.930000000000001, "matrix": [1, 3], "label": "1,3"},
+        {"y": 2, "x": 6, "matrix": [5, 2], "label": "5,2"},
-        {"y": 9.89, "x": 8.93, "matrix": [0, 4], "label": "0,4"},
+        {"y": 2, "x": 7, "matrix": [4, 3], "label": "4,3"},
-        {"y": 10.89, "x": 6.180000000000001, "matrix": [3, 2], "label": "3,2"},
+        {"y": 2, "x": 8, "matrix": [5, 3], "label": "5,3"},
-        {"y": 10.89, "x": 7.180000000000001, "matrix": [2, 3], "label": "2,3"},
+        {"y": 2, "x": 9, "matrix": [4, 4], "label": "4,4"},
-        {"y": 10.89, "x": 8.18, "matrix": [3, 3], "label": "3,3"},
+        {"y": 3, "x": 0, "matrix": [6, 0], "w": 1.25, "label": "6,0"},
-        {"y": 10.89, "x": 9.18, "matrix": [2, 4], "label": "2,4"},
+        {"y": 3, "x": 2.5, "matrix": [6, 1], "label": "6,1"},
-        {"y": 11.89, "x": 5.680000000000001, "matrix": [5, 2], "label": "5,2"},
+        {"y": 3, "x": 3.5, "matrix": [6, 2], "w": 2.25, "label": "6,2"},
-        {"y": 11.89, "x": 6.680000000000001, "matrix": [4, 3], "label": "4,3"},
+        {"y": 3, "x": 6, "matrix": [6, 3], "w": 2, "label": "6,3"},
-        {"y": 11.89, "x": 7.680000000000001, "matrix": [5, 3], "label": "5,3"},
+        {"y": 3, "x": 8, "matrix": [6, 4], "label": "6,4"},
-        {"y": 11.89, "x": 8.68, "matrix": [4, 4], "label": "4,4"},
+        {"y": 6, "x": 3.75, "matrix": [5, 4], "w": 1.25, "label": "5,4"},
-        {"y": 12.89, "x": 5.680000000000001, "matrix": [6, 3], "w": 2, "label": "6,3"},
+        {"y": 6, "x": 5, "matrix": [4, 5], "label": "4,5"},
-        {"y": 12.89, "x": 7.680000000000001, "matrix": [6, 4], "label": "6,4"}
+        {"y": 7, "x": 4.75, "matrix": [6, 5], "w": 1.25, "label": "6,5"}
       ]
     }
   }

keyboards/nachie/evelyn/keyboard.json

@@ -1,6 +1,6 @@
 {
-  "manufacturer": "nachie",
+  "manufacturer": "Nachie",
-  "keyboard_name": "Syndrome",
+  "keyboard_name": "Evelyn",
   "maintainer": "nachie",
   "board": "GENERIC_RP_RP2040",
   "bootloader": "rp2040",
@@ -43,44 +43,44 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"y": 0.0, "x": 0.29, "matrix": [0, 0], "label": "0,0"},
+        {"y": 0, "x": 0, "matrix": [0, 0], "label": "0,0"},
-        {"y": 0.0, "x": 10.190000000000001, "matrix": [1, 4], "label": "1,4"},
+        {"y": 0, "x": 1, "matrix": [1, 0], "label": "1,0"},
-        {"y": 0.0, "x": 11.190000000000001, "matrix": [0, 5], "label": "0,5"},
+        {"y": 0, "x": 2, "matrix": [0, 1], "label": "0,1"},
-        {"y": 0.99, "x": 0.15, "matrix": [2, 0], "w": 1.25, "label": "2,0"},
+        {"y": 0, "x": 3, "matrix": [1, 1], "label": "1,1"},
-        {"y": 0.99, "x": 10.58, "matrix": [2, 5], "w": 1.75, "label": "2,5"},
+        {"y": 0, "x": 4, "matrix": [0, 2], "label": "0,2"},
-        {"y": 1.99, "x": 0.0, "matrix": [4, 0], "w": 1.75, "label": "4,0"},
+        {"y": 0, "x": 6.25, "matrix": [1, 2], "label": "1,2"},
-        {"y": 2.99, "x": 0.09000000000000001, "matrix": [6, 0], "w": 1.25, "label": "6,0"},
+        {"y": 0, "x": 7.25, "matrix": [0, 3], "label": "0,3"},
-        {"y": 6.23, "x": 3.97, "matrix": [5, 4], "w": 1.25, "label": "5,4"},
+        {"y": 0, "x": 8.25, "matrix": [1, 3], "label": "1,3"},
-        {"y": 6.23, "x": 5.220000000000001, "matrix": [4, 5], "label": "4,5"},
+        {"y": 0, "x": 9.25, "matrix": [0, 4], "label": "0,4"},
-        {"y": 7.23, "x": 4.87, "matrix": [6, 5], "w": 1.25, "label": "6,5"},
+        {"y": 0, "x": 10.25, "matrix": [1, 4], "label": "1,4"},
-        {"y": 8.23, "x": 1.43, "matrix": [1, 0], "label": "1,0"},
+        {"y": 0, "x": 11.25, "matrix": [0, 5], "label": "0,5"},
-        {"y": 8.23, "x": 2.43, "matrix": [0, 1], "label": "0,1"},
+        {"y": 1, "x": 0, "matrix": [2, 0], "w": 1.25, "label": "2,0"},
-        {"y": 8.23, "x": 3.43, "matrix": [1, 1], "label": "1,1"},
+        {"y": 1, "x": 1.25, "matrix": [3, 0], "label": "3,0"},
-        {"y": 8.23, "x": 4.430000000000001, "matrix": [0, 2], "label": "0,2"},
+        {"y": 1, "x": 2.25, "matrix": [2, 1], "label": "2,1"},
-        {"y": 9.23, "x": 1.68, "matrix": [3, 0], "label": "3,0"},
+        {"y": 1, "x": 3.25, "matrix": [3, 1], "label": "3,1"},
-        {"y": 9.23, "x": 2.68, "matrix": [2, 1], "label": "2,1"},
+        {"y": 1, "x": 4.25, "matrix": [2, 2], "label": "2,2"},
-        {"y": 9.23, "x": 3.68, "matrix": [3, 1], "label": "3,1"},
+        {"y": 1, "x": 6.5, "matrix": [3, 2], "label": "3,2"},
-        {"y": 9.23, "x": 4.680000000000001, "matrix": [2, 2], "label": "2,2"},
+        {"y": 1, "x": 7.5, "matrix": [2, 3], "label": "2,3"},
-        {"y": 10.23, "x": 2.18, "matrix": [5, 0], "label": "5,0"},
+        {"y": 1, "x": 8.5, "matrix": [3, 3], "label": "3,3"},
-        {"y": 10.23, "x": 3.18, "matrix": [4, 1], "label": "4,1"},
+        {"y": 1, "x": 9.5, "matrix": [2, 4], "label": "2,4"},
-        {"y": 10.23, "x": 4.180000000000001, "matrix": [5, 1], "label": "5,1"},
+        {"y": 1, "x": 10.5, "matrix": [2, 5], "w": 1.75, "label": "2,5"},
-        {"y": 10.23, "x": 5.180000000000001, "matrix": [4, 2], "label": "4,2"},
+        {"y": 2, "x": 0, "matrix": [4, 0], "w": 1.75, "label": "4,0"},
-        {"y": 11.23, "x": 2.93, "matrix": [6, 1], "label": "6,1"},
+        {"y": 2, "x": 1.75, "matrix": [5, 0], "label": "5,0"},
-        {"y": 11.23, "x": 3.93, "matrix": [6, 2], "w": 2.25, "label": "6,2"},
+        {"y": 2, "x": 2.75, "matrix": [4, 1], "label": "4,1"},
-        {"y": 9.89, "x": 5.930000000000001, "matrix": [1, 2], "label": "1,2"},
+        {"y": 2, "x": 3.75, "matrix": [5, 1], "label": "5,1"},
-        {"y": 9.89, "x": 6.930000000000001, "matrix": [0, 3], "label": "0,3"},
+        {"y": 2, "x": 4.75, "matrix": [4, 2], "label": "4,2"},
-        {"y": 9.89, "x": 7.930000000000001, "matrix": [1, 3], "label": "1,3"},
+        {"y": 2, "x": 6, "matrix": [5, 2], "label": "5,2"},
-        {"y": 9.89, "x": 8.93, "matrix": [0, 4], "label": "0,4"},
+        {"y": 2, "x": 7, "matrix": [4, 3], "label": "4,3"},
-        {"y": 10.89, "x": 6.180000000000001, "matrix": [3, 2], "label": "3,2"},
+        {"y": 2, "x": 8, "matrix": [5, 3], "label": "5,3"},
-        {"y": 10.89, "x": 7.180000000000001, "matrix": [2, 3], "label": "2,3"},
+        {"y": 2, "x": 9, "matrix": [4, 4], "label": "4,4"},
-        {"y": 10.89, "x": 8.18, "matrix": [3, 3], "label": "3,3"},
+        {"y": 3, "x": 0, "matrix": [6, 0], "w": 1.25, "label": "6,0"},
-        {"y": 10.89, "x": 9.18, "matrix": [2, 4], "label": "2,4"},
+        {"y": 3, "x": 2.5, "matrix": [6, 1], "label": "6,1"},
-        {"y": 11.89, "x": 5.680000000000001, "matrix": [5, 2], "label": "5,2"},
+        {"y": 3, "x": 3.5, "matrix": [6, 2], "w": 2.25, "label": "6,2"},
-        {"y": 11.89, "x": 6.680000000000001, "matrix": [4, 3], "label": "4,3"},
+        {"y": 3, "x": 6, "matrix": [6, 3], "w": 2, "label": "6,3"},
-        {"y": 11.89, "x": 7.680000000000001, "matrix": [5, 3], "label": "5,3"},
+        {"y": 3, "x": 8, "matrix": [6, 4], "label": "6,4"},
-        {"y": 11.89, "x": 8.68, "matrix": [4, 4], "label": "4,4"},
+        {"y": 6, "x": 3.75, "matrix": [5, 4], "w": 1.25, "label": "5,4"},
-        {"y": 12.89, "x": 5.680000000000001, "matrix": [6, 3], "w": 2, "label": "6,3"},
+        {"y": 6, "x": 5, "matrix": [4, 5], "label": "4,5"},
-        {"y": 12.89, "x": 7.680000000000001, "matrix": [6, 4], "label": "6,4"}
+        {"y": 7, "x": 4.75, "matrix": [6, 5], "w": 1.25, "label": "6,5"}
       ]
     }
   }

keyboards/nachie/evelyn/keymaps/vial/vial.json

@@ -1,5 +1,5 @@
 {
-  "name": "Syndrome",
+  "name": "Evelyn",
   "vendorId": "0x4B43",
   "productId": "0x6F75",
   "matrix": { "rows": 7, "cols": 6 },
@@ -16,15 +16,7 @@
     "keymap": [
       [
         {
-          "y": 0.16,
+          "y": 0.24,
-          "x": 12.25
-        },
-        "1,0\n\n\n\n\n\n\n\n\ne",
-        "1,1\n\n\n\n\n\n\n\n\ne"
-      ],
-      [
-        {
-          "y": -0.9199999999999999,
           "x": 0.3,
           "c": "#ffffff",
           "t": "#2e2525"
@@ -59,7 +51,7 @@
       [
         {
           "y": -0.9899999999999998,
-          "x": 12.73,
+          "x": 10.23,
           "w": 2.25
         },
         "5,4\n\n\n0,1"
@@ -72,28 +64,11 @@
         },
         "6,0"
       ],
-      [
-        {
-          "y": 0.6799999999999997,
-          "x": 3.5,
-          "c": "#cccccc",
-          "t": "#000000"
-        },
-        "2,0\n\n\n\n\n\n\n\n\ne",
-        "2,1\n\n\n\n\n\n\n\n\ne",
-        {
-          "x": 0.75
-        },
-        "3,0\n\n\n\n\n\n\n\n\ne",
-        "3,1\n\n\n\n\n\n\n\n\ne"
-      ],
       [
         {
           "rx": 6.25,
           "y": 2.24,
           "x": 3.9800000000000004,
-          "c": "#ffffff",
-          "t": "#2e2525",
           "w": 1.25
         },
         "5,4\n\n\n0,0",
@@ -141,19 +116,20 @@
         },
         "6,1\n\n\n1,0",
         {
-          "w": 2.25
+          "x": -1,
-        },
-        "6,2\n\n\n1,0"
-      ],
-      [
-        {
-          "x": 2.94,
           "t": "#000000",
           "w": 1.5
         },
         "6,1\n\n\n1,1",
         {
-          "x": 8.881784197001252e-16,
+          "x": -0.49999999999999956,
+          "t": "#2e2525",
+          "w": 2.25
+        },
+        "6,2\n\n\n1,0",
+        {
+          "x": -1.7499999999999991,
+          "t": "#000000",
           "w": 1.75
         },
         "6,2\n\n\n1,1"
@@ -161,7 +137,7 @@
       [
         {
           "r": -8,
-          "y": -3.34,
+          "y": -2.34,
           "x": 5.9399999999999995,
           "t": "#2e2525"
         },
@@ -194,11 +170,8 @@
           "w": 2
         },
         "6,3\n\n\n2,0",
-        "6,4\n\n\n2,0"
-      ],
-      [
         {
-          "x": 5.69,
+          "x": -2,
           "t": "#000000",
           "w": 1.75
         },
@@ -206,7 +179,12 @@
         {
           "w": 1.25
         },
-        "6,4\n\n\n2,1"
+        "6,4\n\n\n2,1",
+        {
+          "x": -1.0000000000000009,
+          "t": "#2e2525"
+        },
+        "6,4\n\n\n2,0"
       ]
     ]
   }

keyboards/nachie/evelyn/readme.md

@@ -1,23 +1,23 @@
-# Båge
+# Evelyn
 
-Firmware for the Båge
+Firmware for the Evelyn pcb
 
 * Keyboard Maintainer: [nachie](https://github.com/nachie)
 * Hardware Supported: Båge
-* Hardware Availability: [nachie](https://littlecraftery.com/products/Båge)
+* Hardware Availability: [nachie](https://littlecraftery.com/products/evelyn)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nachie/syndrome:default
+    make nachie/evelyn:default
 
 Or to make and flash:
 
-    make nachie/syndrome:default:flash
+    make nachie/evelyn:default:flash
 
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
 ## Bootloader
 
-* **Bootmagic reset**: Hold down ESC key (top left) and plug in the keyboard
+* **Bootmagic reset**: Hold down Q key (top left) and plug in the keyboard
-* **Physical reset button**: Briefly press the button labeled "SW_RST1" on the back of the PCB
+* **Physical reset button**: Press and hold reset, press and hold boot, let go off reset while holding boot

quantum/mousekey.h

@@ -183,7 +183,11 @@ extern uint8_t mk_interval;
 extern uint8_t mk_max_speed;
 extern uint8_t mk_time_to_max;
 extern uint8_t mk_wheel_delay;
+#ifdef MK_KINETIC_SPEED
+extern uint16_t mk_wheel_interval;
+#else
 extern uint8_t mk_wheel_interval;
+#endif
 extern uint8_t mk_wheel_max_speed;
 extern uint8_t mk_wheel_time_to_max;