Change include guards in quantum/ to pragma once (#11239)

* [Keyboard] Fix default keymap for tunks/ergo33

* Add prpro keymap too

Makefile

@@ -99,40 +99,13 @@ $(eval $(call NEXT_PATH_ELEMENT))
 #     endif
 # endif
 
-define GET_KEYBOARDS
-ifndef ALT_GET_KEYBOARDS
-    All_RULES_MK := $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/rules.mk))
-    All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/rules.mk))
-    All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/rules.mk))
-    All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/*/rules.mk))
-
-    KEYMAPS_MK := $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/keymaps/*/rules.mk))
-    KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/keymaps/*/rules.mk))
-    KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/keymaps/*/rules.mk))
-    KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/*/keymaps/*/rules.mk))
-
-    KEYBOARDS := $$(sort $$(filter-out $$(KEYMAPS_MK), $$(All_RULES_MK)))
-else
-    KEYBOARDS := $(shell find keyboards/ -type f -iname "rules.mk" | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' | sort | uniq)
-endif
-endef
-
-$(eval $(call GET_KEYBOARDS))
-
-# Only consider folders with makefiles, to prevent errors in case there are extra folders
-#KEYBOARDS += $(patsubst $(ROOD_DIR)/keyboards/%/rules.mk,%,$(wildcard $(ROOT_DIR)/keyboards/*/*/rules.mk))
-
 .PHONY: list-keyboards
 list-keyboards:
-	echo $(KEYBOARDS)
+	util/list_keyboards.sh | sort -u | tr '\n' ' '
-
-define PRINT_KEYBOARD
-	$(info $(PRINTING_KEYBOARD))
-endef
 
 .PHONY: generate-keyboards-file
 generate-keyboards-file:
-	$(foreach PRINTING_KEYBOARD,$(KEYBOARDS),$(eval $(call PRINT_KEYBOARD)))
+	util/list_keyboards.sh | sort -u
 
 .PHONY: clean
 clean:
@@ -159,7 +132,6 @@ endif
 # $(info Keyboard: $(KEYBOARD))
 # $(info Keymap: $(KEYMAP))
 # $(info Subproject: $(SUBPROJECT))
-# $(info Keyboards: $(KEYBOARDS))
 
 
 # Set the default goal depending on where we are running make from
@@ -294,7 +266,7 @@ define PARSE_RULE
         $$(eval $$(call PARSE_TEST))
     # If the rule starts with the name of a known keyboard, then continue
     # the parsing from PARSE_KEYBOARD
-    else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true)
+    else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell util/list_keyboards.sh | sort -u)),true)
         KEYBOARD_RULE=$$(MATCHED_ITEM)
         $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
     # Otherwise use the KEYBOARD variable, which is determined either by
@@ -411,7 +383,7 @@ endef
 # if we are going to compile all keyboards, match the rest of the rule
 # for each of them
 define PARSE_ALL_KEYBOARDS
-    $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(KEYBOARDS)))
+    $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell util/list_keyboards.sh noci | sort -u)))
 endef
 
 # $1 Subproject

docs/README.md

@@ -24,7 +24,7 @@ Totally new to QMK? There are two ways to get started:
 
 ## Make It Yours
 
-QMK has lots of [features](features.md) to explore, and a good deal of reference documentation to dig through. Most features are taken advantage of by modifying your [keymap](keymap.md), and changing the [keycodes](keycodes.md).
+QMK has lots of features to explore, and a good deal of reference documentation to dig through. Most features are taken advantage of by modifying your [keymap](keymap.md), and changing the [keycodes](keycodes.md).
 
 ## Need help?
 

docs/cli_commands.md

@@ -175,7 +175,7 @@ Creates a keymap.json from a keymap.c.
 **Usage**:
 
 ```
-qmk c2json [--no-cpp] [-o OUTPUT] filename
+qmk c2json -km KEYMAP -kb KEYBOARD [-q] [--no-cpp] [-o OUTPUT] filename
 ```
 
 ## `qmk lint`

docs/feature_rawhid.md

@@ -29,7 +29,7 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
 }
 ```
 
-`raw_hid_receive` can receive variable size packets from host with maximum length `RAW_EPSIZE`. `raw_hid_send` on the other hand can send packets to host of exactly `RAW_EPSIZE` length, therefore it should be used with data of length `RAW_EPSIZE`.
+These two functions send and receive packets of length `RAW_EPSIZE` bytes to and from the host (32 on LUFA/ChibiOS/V-USB, 64 on ATSAM).
 
 Make sure to flash raw enabled firmware before proceeding with working on the host side.
 

docs/feature_rgb_matrix.md

@@ -306,6 +306,12 @@ To declare new effects, create a new `rgb_matrix_user/kb.inc` that looks somethi
 `rgb_matrix_user.inc` should go in the root of the keymap directory.
 `rgb_matrix_kb.inc` should go in the root of the keyboard directory.
 
+To use custom effects in your code, simply prepend `RGB_MATRIX_CUSTOM_` to the effect name specified in `RGB_MATRIX_EFFECT()`. For example, an effect declared as `RGB_MATRIX_EFFECT(my_cool_effect)` would be referenced with:
+
+```c
+rgb_matrix_mode(RGB_MATRIX_CUSTOM_my_cool_effect);
+```
+
 ```c
 // !!! DO NOT ADD #pragma once !!! //
 

docs/newbs_getting_started.md

@@ -66,6 +66,7 @@ You will need to install Git and Python. It's very likely that you already have
 * Void: `sudo xbps-install -y git python3-pip`
 * Solus: `sudo eopkg -y install git python3`
 * Sabayon: `sudo equo install dev-vcs/git dev-python/pip`
+* Gentoo: `sudo emerge dev-vcs/git dev-python/pip`
 
 Install the global CLI to bootstrap your system:
 

drivers/haptic/DRV2605L.c

@@ -21,8 +21,6 @@
 #include <math.h>
 
 uint8_t DRV2605L_transfer_buffer[2];
-uint8_t DRV2605L_tx_register[0];
-uint8_t DRV2605L_read_buffer[0];
 uint8_t DRV2605L_read_register;
 
 void DRV_write(uint8_t drv_register, uint8_t settings) {
@@ -32,8 +30,7 @@ void DRV_write(uint8_t drv_register, uint8_t settings) {
 }
 
 uint8_t DRV_read(uint8_t regaddress) {
-    i2c_readReg(DRV2605L_BASE_ADDRESS << 1, regaddress, DRV2605L_read_buffer, 1, 100);
+    i2c_readReg(DRV2605L_BASE_ADDRESS << 1, regaddress, &DRV2605L_read_register, 1, 100);
-    DRV2605L_read_register = (uint8_t)DRV2605L_read_buffer[0];
 
     return DRV2605L_read_register;
 }

keyboards/40percentclub/mf68/config.h

@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
+#define VENDOR_ID       0x3430 // "40"
-#define PRODUCT_ID      0x0510
+#define PRODUCT_ID      0x4D68 // "M68"
 #define DEVICE_VER      0x0101
 #define MANUFACTURER    di0ib
 #define PRODUCT         MF68

keyboards/40percentclub/mf68/keymaps/via/keymap.c

@@ -0,0 +1,49 @@
+/* Copyright 2020 MechMerlin 
+  * 
+  * 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_68_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_INS,  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_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_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [1] = LAYOUT_68_ansi(
+    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_BSPC,          KC_VOLU, KC_HOME,
+    _______, _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, _______,          KC_VOLD, KC_END,
+    _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, _______,                   _______,          KC_MUTE,
+    _______, _______, _______,                            _______,                            _______, _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
+  ),
+  [2] = LAYOUT_68_ansi(
+    _______, _______, _______,   _______, _______, _______,   _______, _______, _______,   _______, _______, _______,  _______, _______, _______, _______,
+    _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,    _______,                   _______,          _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______
+  ),
+  [3] = LAYOUT_68_ansi(
+    _______, _______, _______,   _______, _______, _______,   _______, _______, _______,   _______, _______, _______,  _______, _______, _______, _______,
+    _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,    _______,                   _______,          _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______
+  )
+};

keyboards/40percentclub/mf68/keymaps/via/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

keyboards/40percentclub/mf68/mf68.h

@@ -16,7 +16,7 @@
     { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
     { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
     { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, K71, K72, K73, K74 } \
+    { K70, K71, K72, K73, K74, KC_NO, KC_NO, KC_NO, KC_NO } \
 }
 
 #define LAYOUT_kc( \

keyboards/40percentclub/mf68/rules.mk

@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
@@ -22,7 +22,7 @@ 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
+NKRO_ENABLE = yes            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 MIDI_ENABLE = no            # MIDI controls

keyboards/ai03/orbit/orbit.c

@@ -208,8 +208,6 @@ uint32_t layer_state_set_kb(uint32_t state) {
 	
 	if (is_keyboard_master())
 	{
-		
-		current_layer = biton32(state);
 		serial_m2s_buffer.current_layer = biton32(state);
 		
 		// If left half, do the LED toggle thing

keyboards/ai03/orbit/orbit.h

@@ -56,8 +56,6 @@
 	{ R40,   R41,   R42,   R43,   R44,   R45, KC_NO }  \
 }
 
-uint8_t current_layer;
-
 extern void led_toggle(int id, bool on);
 void set_all_leds(bool leds[6]);
 extern void set_layer_indicators(uint8_t layer);

keyboards/axolstudio/yeti/config.h

@@ -0,0 +1,42 @@
+/*
+Copyright 2020 kb-elmo
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x525C
+#define PRODUCT_ID   0x9F9F
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Axolstudio
+#define PRODUCT      Yeti
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/* Keyboard Matrix Assignments */
+
+#define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 }
+#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, F7, D7, D6, D4, B3, B7, D0, D1, D2, D3, D5 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5

keyboards/axolstudio/yeti/info.json

@@ -0,0 +1,285 @@
+{
+  "keyboard_name": "yeti",
+  "url": "https://axolstudio.ca/yeti",
+  "maintainer": "kb-elmo",
+  "width": 17.75,
+  "height": 5,
+  "layouts": {
+    "LAYOUT_alice": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":1.25, "y":0},
+        {"x":2.25, "y":0},
+        {"x":3.25, "y":0},
+        {"x":4.25, "y":0},
+        {"x":5.25, "y":0},
+        {"x":6.25, "y":0},
+        {"x":7.25, "y":0},
+        {"x":10.25, "y":0},
+        {"x":11.25, "y":0},
+        {"x":12.25, "y":0},
+        {"x":13.25, "y":0},
+        {"x":14.25, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0, "w": 2},
+        {"x":0, "y":1},
+        {"x":1.25, "y":1, "w":1.5},
+        {"x":2.75, "y":1},
+        {"x":3.75, "y":1},
+        {"x":4.75, "y":1},
+        {"x":5.75, "y":1},
+        {"x":6.75, "y":1},
+        {"x":9.75, "y":1},
+        {"x":10.75, "y":1},
+        {"x":11.75, "y":1},
+        {"x":12.75, "y":1},
+        {"x":13.75, "y":1},
+        {"x":14.75, "y":1},
+        {"x":15.75, "y":1},
+        {"x":16.75, "y":1, "w":1.5},
+        {"x":0, "y":2},
+        {"x":1.25, "y":2, "w":1.75},
+        {"x":3, "y":2},
+        {"x":4, "y":2},
+        {"x":5, "y":2},
+        {"x":6, "y":2},
+        {"x":7, "y":2},
+        {"x":10, "y":2},
+        {"x":11, "y":2},
+        {"x":12, "y":2},
+        {"x":13, "y":2},
+        {"x":14, "y":2},
+        {"x":15, "y":2},
+        {"x":16, "y":2, "w":2.25},
+        {"x":1.25, "y":3, "w":2.25},
+        {"x":3.5, "y":3},
+        {"x":4.5, "y":3},
+        {"x":5.5, "y":3},
+        {"x":6.5, "y":3},
+        {"x":7.5, "y":3},
+        {"x":9.5, "y":3},
+        {"x":10.5, "y":3},
+        {"x":11.5, "y":3},
+        {"x":12.5, "y":3},
+        {"x":13.5, "y":3},
+        {"x":14.5, "y":3},
+        {"x":15.5, "y":3, "w":1.75},
+        {"x":17.25, "y":3},
+        {"x":1.25, "y":4, "w":1.5},
+        {"x":4.25, "y":4, "w":1.5},
+        {"x":5.75, "y":4, "w":2},
+        {"x":7.75, "y":4, "w":1.25},
+        {"x":9.5, "y":4, "w":2.75},
+        {"x":12.25, "y":4, "w":1.5},
+        {"x":16.75, "y":4, "w":1.5}
+      ]
+    },
+    "LAYOUT_alice_split_bs": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":1.25, "y":0},
+        {"x":2.25, "y":0},
+        {"x":3.25, "y":0},
+        {"x":4.25, "y":0},
+        {"x":5.25, "y":0},
+        {"x":6.25, "y":0},
+        {"x":7.25, "y":0},
+        {"x":10.25, "y":0},
+        {"x":11.25, "y":0},
+        {"x":12.25, "y":0},
+        {"x":13.25, "y":0},
+        {"x":14.25, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0},
+        {"x":17.25, "y":0},
+        {"x":0, "y":1},
+        {"x":1.25, "y":1, "w":1.5},
+        {"x":2.75, "y":1},
+        {"x":3.75, "y":1},
+        {"x":4.75, "y":1},
+        {"x":5.75, "y":1},
+        {"x":6.75, "y":1},
+        {"x":9.75, "y":1},
+        {"x":10.75, "y":1},
+        {"x":11.75, "y":1},
+        {"x":12.75, "y":1},
+        {"x":13.75, "y":1},
+        {"x":14.75, "y":1},
+        {"x":15.75, "y":1},
+        {"x":16.75, "y":1, "w":1.5},
+        {"x":0, "y":2},
+        {"x":1.25, "y":2, "w":1.75},
+        {"x":3, "y":2},
+        {"x":4, "y":2},
+        {"x":5, "y":2},
+        {"x":6, "y":2},
+        {"x":7, "y":2},
+        {"x":10, "y":2},
+        {"x":11, "y":2},
+        {"x":12, "y":2},
+        {"x":13, "y":2},
+        {"x":14, "y":2},
+        {"x":15, "y":2},
+        {"x":16, "y":2, "w":2.25},
+        {"x":1.25, "y":3, "w":2.25},
+        {"x":3.5, "y":3},
+        {"x":4.5, "y":3},
+        {"x":5.5, "y":3},
+        {"x":6.5, "y":3},
+        {"x":7.5, "y":3},
+        {"x":9.5, "y":3},
+        {"x":10.5, "y":3},
+        {"x":11.5, "y":3},
+        {"x":12.5, "y":3},
+        {"x":13.5, "y":3},
+        {"x":14.5, "y":3},
+        {"x":15.5, "y":3, "w":1.75},
+        {"x":17.25, "y":3},
+        {"x":1.25, "y":4, "w":1.5},
+        {"x":4.25, "y":4, "w":1.5},
+        {"x":5.75, "y":4, "w":2},
+        {"x":7.75, "y":4, "w":1.25},
+        {"x":9.5, "y":4, "w":2.75},
+        {"x":12.25, "y":4, "w":1.5},
+        {"x":16.75, "y":4, "w":1.5}
+      ]
+    },
+    "LAYOUT_alice_full_rshift": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":1.25, "y":0},
+        {"x":2.25, "y":0},
+        {"x":3.25, "y":0},
+        {"x":4.25, "y":0},
+        {"x":5.25, "y":0},
+        {"x":6.25, "y":0},
+        {"x":7.25, "y":0},
+        {"x":10.25, "y":0},
+        {"x":11.25, "y":0},
+        {"x":12.25, "y":0},
+        {"x":13.25, "y":0},
+        {"x":14.25, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0, "w":2},
+        {"x":0, "y":1},
+        {"x":1.25, "y":1, "w":1.5},
+        {"x":2.75, "y":1},
+        {"x":3.75, "y":1},
+        {"x":4.75, "y":1},
+        {"x":5.75, "y":1},
+        {"x":6.75, "y":1},
+        {"x":9.75, "y":1},
+        {"x":10.75, "y":1},
+        {"x":11.75, "y":1},
+        {"x":12.75, "y":1},
+        {"x":13.75, "y":1},
+        {"x":14.75, "y":1},
+        {"x":15.75, "y":1},
+        {"x":16.75, "y":1, "w":1.5},
+        {"x":0, "y":2},
+        {"x":1.25, "y":2, "w":1.75},
+        {"x":3, "y":2},
+        {"x":4, "y":2},
+        {"x":5, "y":2},
+        {"x":6, "y":2},
+        {"x":7, "y":2},
+        {"x":10, "y":2},
+        {"x":11, "y":2},
+        {"x":12, "y":2},
+        {"x":13, "y":2},
+        {"x":14, "y":2},
+        {"x":15, "y":2},
+        {"x":16, "y":2, "w":2.25},
+        {"x":1.25, "y":3, "w":2.25},
+        {"x":3.5, "y":3},
+        {"x":4.5, "y":3},
+        {"x":5.5, "y":3},
+        {"x":6.5, "y":3},
+        {"x":7.5, "y":3},
+        {"x":9.5, "y":3},
+        {"x":10.5, "y":3},
+        {"x":11.5, "y":3},
+        {"x":12.5, "y":3},
+        {"x":13.5, "y":3},
+        {"x":14.5, "y":3},
+        {"x":15.5, "y":3, "w":2.75},
+        {"x":1.25, "y":4, "w":1.5},
+        {"x":4.25, "y":4, "w":1.5},
+        {"x":5.75, "y":4, "w":2},
+        {"x":7.75, "y":4, "w":1.25},
+        {"x":9.5, "y":4, "w":2.75},
+        {"x":12.25, "y":4, "w":1.5},
+        {"x":16.75, "y":4, "w":1.5}
+      ]
+    },
+    "LAYOUT_alice_split_bs_full_rshift": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":1.25, "y":0},
+        {"x":2.25, "y":0},
+        {"x":3.25, "y":0},
+        {"x":4.25, "y":0},
+        {"x":5.25, "y":0},
+        {"x":6.25, "y":0},
+        {"x":7.25, "y":0},
+        {"x":10.25, "y":0},
+        {"x":11.25, "y":0},
+        {"x":12.25, "y":0},
+        {"x":13.25, "y":0},
+        {"x":14.25, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0},
+        {"x":17.25, "y":0},
+        {"x":0, "y":1},
+        {"x":1.25, "y":1, "w":1.5},
+        {"x":2.75, "y":1},
+        {"x":3.75, "y":1},
+        {"x":4.75, "y":1},
+        {"x":5.75, "y":1},
+        {"x":6.75, "y":1},
+        {"x":9.75, "y":1},
+        {"x":10.75, "y":1},
+        {"x":11.75, "y":1},
+        {"x":12.75, "y":1},
+        {"x":13.75, "y":1},
+        {"x":14.75, "y":1},
+        {"x":15.75, "y":1},
+        {"x":16.75, "y":1, "w":1.5},
+        {"x":0, "y":2},
+        {"x":1.25, "y":2, "w":1.75},
+        {"x":3, "y":2},
+        {"x":4, "y":2},
+        {"x":5, "y":2},
+        {"x":6, "y":2},
+        {"x":7, "y":2},
+        {"x":10, "y":2},
+        {"x":11, "y":2},
+        {"x":12, "y":2},
+        {"x":13, "y":2},
+        {"x":14, "y":2},
+        {"x":15, "y":2},
+        {"x":16, "y":2, "w":2.25},
+        {"x":1.25, "y":3, "w":2.25},
+        {"x":3.5, "y":3},
+        {"x":4.5, "y":3},
+        {"x":5.5, "y":3},
+        {"x":6.5, "y":3},
+        {"x":7.5, "y":3},
+        {"x":9.5, "y":3},
+        {"x":10.5, "y":3},
+        {"x":11.5, "y":3},
+        {"x":12.5, "y":3},
+        {"x":13.5, "y":3},
+        {"x":14.5, "y":3},
+        {"x":15.5, "y":3, "w":2.75},
+        {"x":1.25, "y":4, "w":1.5},
+        {"x":4.25, "y":4, "w":1.5},
+        {"x":5.75, "y":4, "w":2},
+        {"x":7.75, "y":4, "w":1.25},
+        {"x":9.5, "y":4, "w":2.75},
+        {"x":12.25, "y":4, "w":1.5},
+        {"x":16.75, "y":4, "w":1.5}
+      ]
+    }
+  }
+}

keyboards/axolstudio/yeti/keymaps/default/keymap.c

@@ -0,0 +1,34 @@
+/* Copyright 2020 kb-elmo
+ *
+ * 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] = {
+    /* Base */
+    [0] = LAYOUT_alice(
+        KC_PAUS, 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_PSCR, 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_F5,   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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,            MO(1),
+                 KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                                    KC_RCTL
+    ),
+    [1] = LAYOUT_alice(
+        KC_TRNS, 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_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS,          KC_TRNS,
+                 KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                                     KC_TRNS
+    )
+};

keyboards/axolstudio/yeti/keymaps/via/keymap.c

@@ -0,0 +1,48 @@
+/* Copyright 2020 kb-elmo
+ *
+ * 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] = {
+    /* Base */
+    [0] = LAYOUT_alice_split_bs(
+        KC_PAUS, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL,
+        KC_PSCR, 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_F5,   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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,            MO(1),
+                 KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                                    KC_RCTL
+    ),
+    [1] = LAYOUT_alice_split_bs(
+        KC_TRNS, 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_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS,          KC_TRNS,
+                 KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                                     KC_TRNS
+    ),
+    [2] = LAYOUT_alice_split_bs(
+        KC_TRNS, 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_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS,          KC_TRNS,
+                 KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                                     KC_TRNS
+    ),
+    [3] = LAYOUT_alice_split_bs(
+        KC_TRNS, 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_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS,          KC_TRNS,
+                 KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                                     KC_TRNS
+    )
+};

keyboards/axolstudio/yeti/keymaps/via/rules.mk

@@ -0,0 +1 @@
+VIA_ENABLE = yes

keyboards/axolstudio/yeti/readme.md

@@ -0,0 +1,19 @@
+# Axolstudio Yeti
+
+![yeti](https://i.imgur.com/eoRH6W1l.png)
+
+**TGR Alice inspired board with some extra heft**
+
+* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
+* Hardware Supported: Axolstudio Yeti PCB
+* Hardware Availability: https://axolstudio.ca/yeti
+
+Make example for this keyboard (after setting up your build environment):
+
+    make axolstudio/yeti:default
+
+Flashing example for this keyboard:
+
+    make axolstudio/yeti: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).

keyboards/axolstudio/yeti/rules.mk

@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # 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 = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = alice alice_split_bs

keyboards/axolstudio/yeti/yeti.c

@@ -0,0 +1,17 @@
+/* Copyright 2020 kb-elmo
+ *
+ * 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 "yeti.h"

keyboards/axolstudio/yeti/yeti.h

@@ -0,0 +1,76 @@
+/* Copyright 2020 kb-elmo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_alice( \
+    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,      k14, \
+    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
+    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
+         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k45,      k47, \
+         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
+) { \
+    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12, KC_NO,   k14, KC_NO }, \
+    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
+    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44,   k45, KC_NO,   k47 }, \
+    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
+    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
+}
+
+// Equivalent to LAYOUT_all
+#define LAYOUT_alice_split_bs( \
+    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k15, \
+    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
+    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
+         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k45,      k47, \
+         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
+) { \
+    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13, KC_NO,   k15 }, \
+    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
+    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44,   k45, KC_NO,   k47 }, \
+    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
+    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
+}
+
+#define LAYOUT_alice_split_bs_full_rshift( \
+    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k15, \
+    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
+    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
+         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60,      k46,      \
+         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
+) { \
+    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13, KC_NO,   k15 }, \
+    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
+    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44, KC_NO,   k46, KC_NO }, \
+    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
+    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
+}
+
+#define LAYOUT_alice_full_rshift( \
+    k16, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,      k14, \
+    k32, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,      k31, \
+    k48, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44,      k30,      \
+         k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60,      k46,      \
+         k61,      k62,      k63, k64,      k65,      k66,                     k67  \
+) { \
+    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12, KC_NO,   k14, KC_NO }, \
+    { k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k30,   k31 }, \
+    { k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44, KC_NO,   k46, KC_NO }, \
+    { k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   k59,   k60, KC_NO, KC_NO, KC_NO }, \
+    { KC_NO, k61, KC_NO,   k62, KC_NO,   k63,   k64, KC_NO,   k65, KC_NO,   k66, KC_NO, KC_NO, KC_NO, KC_NO,   k67 }  \
+}

keyboards/boston_meetup/2019/rules.mk

@@ -6,7 +6,6 @@ MCU = STM32F303
 #
 BACKLIGHT_ENABLE = no
 BOOTMAGIC_ENABLE = no	# Virtual DIP switch configuration
-## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 MOUSEKEY_ENABLE = yes	# Mouse keys
 EXTRAKEY_ENABLE = yes	# Audio control and System control
 CONSOLE_ENABLE = no	# Console for debug

keyboards/butterstick/sten.h

@@ -15,7 +15,6 @@ extern size_t keymapsCount;			// Total keymaps
 extern uint32_t cChord;				// Current Chord
 extern uint32_t stenoLayers[];		// Chords that simulate QMK layers
 extern size_t stenoLayerCount;		// Number of simulated layers
-uint32_t refChord;					// Reference chord for PC macro
 
 // Function defs
 void 			processChord(bool useFakeSteno);
@@ -35,7 +34,7 @@ void 			CLICK_MOUSE(uint8_t);
 #define P(chord, act) if (cChord == (chord)) { if (!lookup) {act;} return chord;}
 #define PC(chord, act) if (cChord == (chord)) { if (!lookup) {act;} return chord;} \
 	for(int i = 0; i < stenoLayerCount; i++) { \
-		refChord = stenoLayers[i] | chord; \
+		uint32_t refChord = stenoLayers[i] | chord; \
 		if (cChord == (refChord)) { if (!lookup) {act;} return refChord;}; \
 }
 

keyboards/ckeys/thedora/rules.mk

@@ -6,7 +6,6 @@ MCU = STM32F303
 #
 BACKLIGHT_ENABLE = no
 BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration
-## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 MOUSEKEY_ENABLE = yes # Mouse keys
 EXTRAKEY_ENABLE = yes # Audio control and System control
 CONSOLE_ENABLE = no  # Console for debug

keyboards/clueboard/66_hotswap/gen1/rules.mk

@@ -9,7 +9,6 @@ LED_MATRIX_DRIVER = IS31FL3731
 #   comment out to disable the options.
 #
 BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration
-## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
 MOUSEKEY_ENABLE = yes	# Mouse keys
 EXTRAKEY_ENABLE = yes	# Audio control and System control
 CONSOLE_ENABLE = yes	# Console for debug

keyboards/cmm_studio/saka68/config.h

@@ -0,0 +1,57 @@
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x434D
+#define PRODUCT_ID      0x534B
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    CMM.Studio
+#define PRODUCT         Saka68
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D1, D0, B0, F6, F7 }
+#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, F5, F4, F1, F0, B1, B2, B3, D2, D3, D5 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define DEBOUNCE 5
+
+
+// Dynamic keymap starts after EEPROM version
+#define DYNAMIC_KEYMAP_EEPROM_ADDR 35
+// Dynamic macro starts after dynamic keymaps (35+(4*10*6*2)) = (35+480)
+#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 680    // **** CHANGE THIS BASED ON MATRIX_ROWS & MATRIX_COLS ****
+#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 344    // **** CHANGE THIS BASED ON 1024-DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR ****
+#define DYNAMIC_KEYMAP_MACRO_COUNT 16
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/

keyboards/cmm_studio/saka68/info.json

@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 17.25,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (D1,D4)", "x":0, "y":0},
+                {"label":"K01 (D1,D6)", "x":1, "y":0},
+                {"label":"K02 (D1,D7)", "x":2, "y":0},
+                {"label":"K03 (D1,B4)", "x":3, "y":0},
+                {"label":"K04 (D1,B5)", "x":4, "y":0},
+                {"label":"K05 (D1,B6)", "x":5, "y":0},
+                {"label":"K06 (D1,C6)", "x":6, "y":0},
+                {"label":"K07 (D1,F5)", "x":7, "y":0},
+                {"label":"K08 (D1,F4)", "x":8, "y":0},
+                {"label":"K09 (D1,F1)", "x":9, "y":0},
+                {"label":"K0A (D1,F0)", "x":10, "y":0},
+                {"label":"K0B (D1,B1)", "x":11, "y":0},
+                {"label":"K0C (D1,B2)", "x":12, "y":0},
+                {"label":"K0D (D1,B3)", "x":13, "y":0, "w":2},
+                {"label":"K0F (D1,D3)", "x":15.25, "y":0},
+                {"label":"K0G (D1,D5)", "x":16.25, "y":0},
+                {"label":"K10 (D0,D4)", "x":0, "y":1, "w":1.5},
+                {"label":"K11 (D0,D6)", "x":1.5, "y":1},
+                {"label":"K12 (D0,D7)", "x":2.5, "y":1},
+                {"label":"K13 (D0,B4)", "x":3.5, "y":1},
+                {"label":"K14 (D0,B5)", "x":4.5, "y":1},
+                {"label":"K15 (D0,B6)", "x":5.5, "y":1},
+                {"label":"K16 (D0,C6)", "x":6.5, "y":1},
+                {"label":"K17 (D0,F5)", "x":7.5, "y":1},
+                {"label":"K18 (D0,F4)", "x":8.5, "y":1},
+                {"label":"K19 (D0,F1)", "x":9.5, "y":1},
+                {"label":"K1A (D0,F0)", "x":10.5, "y":1},
+                {"label":"K1B (D0,B1)", "x":11.5, "y":1},
+                {"label":"K1C (D0,B2)", "x":12.5, "y":1},
+                {"label":"K1D (D0,B3)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K1E (D0,D2)", "x":15.25, "y":1},
+                {"label":"K1F (D0,D3)", "x":16.25, "y":1},
+                {"label":"K20 (B0,D4)", "x":0, "y":2, "w":1.75},
+                {"label":"K21 (B0,D6)", "x":1.75, "y":2},
+                {"label":"K22 (B0,D7)", "x":2.75, "y":2},
+                {"label":"K23 (B0,B4)", "x":3.75, "y":2},
+                {"label":"K24 (B0,B5)", "x":4.75, "y":2},
+                {"label":"K25 (B0,B6)", "x":5.75, "y":2},
+                {"label":"K26 (B0,C6)", "x":6.75, "y":2},
+                {"label":"K27 (B0,F5)", "x":7.75, "y":2},
+                {"label":"K28 (B0,F4)", "x":8.75, "y":2},
+                {"label":"K29 (B0,F1)", "x":9.75, "y":2},
+                {"label":"K2A (B0,F0)", "x":10.75, "y":2},
+                {"label":"K2B (B0,B1)", "x":11.75, "y":2},
+                {"label":"K2D (B0,B3)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K30 (F6,D4)", "x":0, "y":3, "w":2.25},
+                {"label":"K32 (F6,D7)", "x":2.25, "y":3},
+                {"label":"K33 (F6,B4)", "x":3.25, "y":3},
+                {"label":"K34 (F6,B5)", "x":4.25, "y":3},
+                {"label":"K35 (F6,B6)", "x":5.25, "y":3},
+                {"label":"K36 (F6,C6)", "x":6.25, "y":3},
+                {"label":"K37 (F6,F5)", "x":7.25, "y":3},
+                {"label":"K38 (F6,F4)", "x":8.25, "y":3},
+                {"label":"K39 (F6,F1)", "x":9.25, "y":3},
+                {"label":"K3A (F6,F0)", "x":10.25, "y":3},
+                {"label":"K3B (F6,B1)", "x":11.25, "y":3},
+                {"label":"K3C (F6,B2)", "x":12.25, "y":3, "w":2.75},
+                {"label":"K3E (F6,D2)", "x":15.25, "y":3},
+                {"label":"K40 (F7,D4)", "x":0, "y":4, "w":1.25},
+                {"label":"K41 (F7,D6)", "x":1.25, "y":4, "w":1.25},
+                {"label":"K42 (F7,D7)", "x":2.5, "y":4, "w":1.25},
+                {"label":"K46 (F7,C6)", "x":3.75, "y":4, "w":6.25},
+                {"label":"K4A (F7,F0)", "x":10, "y":4, "w":1.25},
+                {"label":"K4B (F7,B1)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K4C (F7,B2)", "x":12.5, "y":4, "w":1.25},
+                {"label":"K4D (F7,B3)", "x":14.25, "y":4},
+                {"label":"K4E (F7,D2)", "x":15.25, "y":4},
+                {"label":"K4F (F7,D3)", "x":16.25, "y":4}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}

keyboards/cmm_studio/saka68/keymaps/default/keymap.c

@@ -0,0 +1,36 @@
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * 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(
+        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_INS,  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_DEL,  KC_END,
+        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_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,                   KC_UP,
+        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,  MO(1),   KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS,  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_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
+    ),
+
+};

keyboards/cmm_studio/saka68/keymaps/via/keymap.c

@@ -0,0 +1,51 @@
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * 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(
+        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_INS,  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_DEL,  KC_END,
+        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_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,                   KC_UP,
+        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,  MO(1),   KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS,  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_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
+    ),
+
+    [2] = 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,    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
+    ),
+
+    [3] = 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,    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
+    ),
+};

keyboards/cmm_studio/saka68/keymaps/via/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = yes

keyboards/cmm_studio/saka68/readme.md

@@ -0,0 +1,17 @@
+# CMM.Studio Saka68
+
+CMM.Studio Saka68 Keyboard
+
+![CMM.Studio Saka68](https://i.imgur.com/gZ9Thjel.png)
+
+* Keyboard Maintainer: [CMM.Studio Freather](https://github.com/CMMS-Freather)
+* Hardware Supported: PCB, Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cmm_studio/saka68:default
+
+
+For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode
+
+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).

keyboards/cmm_studio/saka68/rules.mk

@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # 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 = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output

keyboards/cmm_studio/saka68/saka68.c

@@ -0,0 +1,20 @@
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * 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 "saka68.h"
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/

keyboards/cmm_studio/saka68/saka68.h

@@ -0,0 +1,36 @@
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0F, K0G,  \
+    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E, K1F,  \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,                    \
+    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3E,       \
+    K40,  K41,  K42,              K46,                K4A,  K4B,  K4C,     K4D, K4E, K4F   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO, K0F,   K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   KC_NO }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   KC_NO, KC_NO, KC_NO }, \
+    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO, K3E,   KC_NO, KC_NO }, \
+    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   KC_NO }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/

keyboards/draytronics/scarlet/keymaps/via/keymap.c

@@ -0,0 +1,51 @@
+/*Copyright 2020 Blake Drayson / Draytronics
+
+Special thanks to sirdicholas for the VIA support config files
+
+VIA Design Config File
+https://www.draytronics.co.uk/f_scarlet/draytronics_scarlet_via_config.json
+
+Contact info@draytronics.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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_numpad_5x4(
+      KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_P7,   KC_P8,   KC_P9,
+      KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+      KC_P1,   KC_P2,   KC_P3,
+      KC_P0,            KC_PDOT, KC_PENT),
+  [1] = LAYOUT_numpad_5x4(
+      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_numpad_5x4(
+      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  ),
+  [3] = LAYOUT_numpad_5x4(
+      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  ),
+};

keyboards/draytronics/scarlet/keymaps/via/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

keyboards/draytronics/scarlet/readme.md

@@ -17,3 +17,5 @@ Flashing example for this keyboard:
     make draytronics/scarlet: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).
+
+VIA design config file avaliable [here](https://www.draytronics.co.uk/f_scarlet/draytronics_scarlet_via_config.json)

keyboards/ergodox_ez/keymaps/stamm/keymap.c

@@ -31,14 +31,10 @@
 #define NO_BSLS_ALT KC_EQUAL
 #define LSA_T(kc) MT(MOD_LSFT | MOD_LALT, kc)
 
-#define E_NUMBERS LT(_3_NUMBERS,KC_E)
+#define E_NUMBERS LT(_1_NUMBERS, KC_E)
-#define R_MOUSE LT(_4_MOUSE,KC_R)
+#define R_MOUSE LT(_2_MOUSE, KC_R)
-#define O_NUMBERS LT(_3_NUMBERS,KC_O)
+
-#define U_MOUSE LT(_4_MOUSE,KC_U)
+#define ARROWS MO(_3_ARROW)
-#define R_NUMBERS LT(_3_NUMBERS,KC_R)
-#define W_MOUSE LT(_4_MOUSE,KC_W)
-#define LEFT_NUMBERS LT(_3_NUMBERS, KC_LEFT)
-#define RIGHT_MOUSE LT(_4_MOUSE, KC_RIGHT)
 
 enum custom_keycodes {
   RGB_SLD = EZ_SAFE_RANGE,
@@ -50,20 +46,19 @@ uint16_t alt_tab_timer = 0;        // we will be using them soon.
 
 enum layers {
   _0_BASE,
-  _1_BEAKL,
+  _1_NUMBERS,
-  _2_WORKMAN,
+  _2_MOUSE,
-  _3_NUMBERS,
+  _3_ARROW,
-  _4_MOUSE,
 };
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_0_BASE] = LAYOUT_ergodox(
-  KC_NONUS_BSLASH,      KC_EXLM,              KC_AT,         KC_HASH,       KC_DLR,             KC_PERC,   KC_AUDIO_MUTE,
+  KC_NONUS_BSLASH,      KC_EXLM,              KC_AT,         KC_HASH,        KC_DLR,       KC_PERC,   KC_AUDIO_MUTE,
-  KC_LEAD,              KC_Q,                 KC_W,          E_NUMBERS,     R_MOUSE,            KC_T,      TG(_1_BEAKL),
+  KC_LEAD,              KC_Q,                 KC_W,          E_NUMBERS,      R_MOUSE,      KC_T,      XXXXXXX,
-  LCTL(KC_B),           LSFT_T(KC_A),         LCTL_T(KC_S),  LALT_T(KC_D),  LGUI_T(KC_F),       KC_G,
+  LCTL(KC_B),           LSFT_T(KC_A),         LCTL_T(KC_S),  LALT_T(KC_D),   LGUI_T(KC_F), KC_G,
-  KC_BSLASH,            KC_Z,                 KC_X,          KC_C,          KC_V,               KC_B,      TG(_2_WORKMAN),
+  KC_BSLASH,            KC_Z,                 KC_X,          KC_C,           KC_V,         KC_B,      XXXXXXX,
-  ALT_TAB,              XXXXXXX,              XXXXXXX,       LEFT_NUMBERS,  RIGHT_MOUSE,
+  ALT_TAB,              XXXXXXX,              XXXXXXX,       MO(_1_NUMBERS), ARROWS,
   KC_AUDIO_VOL_DOWN,    KC_AUDIO_VOL_UP,
   XXXXXXX,
   KC_ENTER,             KC_TAB,               KC_ESCAPE,
@@ -71,50 +66,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   XXXXXXX,              KC_Y,                 KC_U,          KC_I,          KC_O,               KC_P,      KC_LBRACKET,
   KC_H,                 RGUI_T(KC_J),         RALT_T(KC_K),  RCTL_T(KC_L),  RSFT_T(KC_SCOLON),  KC_QUOTE,
   KC_RBRACKET,          KC_N,                 KC_M,          KC_COMMA,      KC_DOT,             KC_SLASH,  KC_EQUAL,
-  KC_DOWN,              KC_UP,                XXXXXXX,       XXXXXXX,       XXXXXXX,
+  XXXXXXX,              XXXXXXX,              XXXXXXX,       XXXXXXX,       XXXXXXX,
   KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK,
   XXXXXXX,
   KC_ESCAPE,            KC_BSPACE,            KC_SPACE
 ),
-[_1_BEAKL] = LAYOUT_ergodox(
+[_1_NUMBERS] = LAYOUT_ergodox(
-  _______,  _______,       _______,       _______,           _______,         _______,    _______,
-  _______,  _______,       KC_H,          O_NUMBERS,  U_MOUSE,  KC_X,       _______,
-  _______,  LSFT_T(KC_Y),  LCTL_T(KC_I),  LALT_T(KC_E),      LGUI_T(KC_A),    KC_DOT,
-  _______,  KC_J,          KC_SLASH,      KC_COMMA,          KC_K,            KC_QUOTE,   _______,
-  _______,  _______,       _______,       _______,           _______,
-                                                              _______,         _______,
-                                                              _______,
-                                                              _______,         _______,    _______,
-
-  _______,  _______,       _______,       _______,           _______,         _______,    _______,
-  _______,  KC_G,          KC_C,          KC_R,              KC_F,            KC_Z,       _______,
-  KC_D,     RGUI_T(KC_S),  RALT_T(KC_T),  RCTL_T(KC_N),      RSFT_T(KC_B),    KC_SCOLON,
-  _______,  KC_W,          _______,       KC_L,              KC_P,            KC_V,       _______,
-  _______,  _______,       _______,       _______,           _______,
-  _______,  _______,
-  _______,
-  _______,  _______,       _______
-),
-[_2_WORKMAN] = LAYOUT_ergodox(
-  _______,  _______,       _______,       _______,           _______,         _______,    _______,
-  _______,  _______,       KC_D,          R_NUMBERS,  W_MOUSE,  KC_B,       _______,
-  _______,  _______,       _______,       LALT_T(KC_H),      LGUI_T(KC_T),    _______,
-  _______,  _______,       _______,       KC_M,              KC_C,            KC_V,       _______,
-  _______,  _______,       _______,       _______,           _______,
-                                                              _______,         _______,
-                                                              _______,
-                                                              _______,         _______, _______,
-
-  _______,  _______,       _______,       _______,           _______,         _______,    _______,
-  _______,  KC_J,          KC_F,          KC_U,              KC_P,            KC_SCOLON,  _______,
-  KC_Y,     RGUI_T(KC_N),  RALT_T(KC_E),  RCTL_T(KC_O),      RSFT_T(KC_I),    _______,
-  _______,  KC_K,          KC_L,          _______,           _______,         _______,    _______,
-  _______,  _______,       _______,       _______,           _______,
-  _______,  _______,
-  _______,
-  _______,  _______,       _______
-),
-[_3_NUMBERS] = LAYOUT_ergodox(
   _______,  KC_F1,      KC_F2,    KC_F3,     KC_F4,    KC_F5,      _______,
   _______,  _______,    _______,  _______,   _______,  _______,    _______,
   _______,  _______,    _______,  _______,   _______,  _______,
@@ -133,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______,
   _______,  _______,    _______
 ),
-[_4_MOUSE] = LAYOUT_ergodox(
+[_2_MOUSE] = LAYOUT_ergodox(
   _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______, _______,
   _______, _______, _______, _______, _______, _______,
@@ -152,12 +109,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   RGB_VAD, RGB_VAI,
   _______,
+  _______, _______, _______
+),
+[_3_ARROW] = LAYOUT_ergodox(
+  _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,
+
+                                      _______, _______,
+                                      _______,
+                                      _______, _______, _______,
+
+  _______, _______, _______, _______, _______, _______,  _______,
+  _______, _______, _______, _______, _______, _______,  _______,
+                    KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, _______, _______,
+  _______, _______, _______, _______, _______, _______,  _______,
+                    _______, _______, _______, _______,  _______,
+
   _______, _______,
+  _______,
+  _______, _______, _______
 ),
 };
 
 
 /* bool suspended = false; */
+void keyboard_post_init_user(void) {
+  rgblight_disable();
+}
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
@@ -184,24 +165,20 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
     ergodox_led_all_off();
+    /* rgblight_disable(); */
     switch (get_highest_layer(state)) {
-      case _1_BEAKL:
+      case _1_NUMBERS:
         ergodox_right_led_1_on();
+        /* rgblight_enable();
+        rgblight_mode(1);
+        rgblight_sethsv(HSV_BLUE);*/
         break;
-      case _2_WORKMAN:
+      case _2_MOUSE:
         ergodox_right_led_2_on();
         break;
-      case _3_NUMBERS:
+      case _3_ARROW:
         ergodox_right_led_3_on();
         break;
-      case _4_MOUSE:
-        ergodox_right_led_1_on();
-        ergodox_right_led_2_on();
-        break;
-      /* case 6: */
-      /*   ergodox_right_led_2_on(); */
-      /*   ergodox_right_led_3_on(); */
-      /*   break; */
       /* case 7: */
       /*   ergodox_right_led_1_on(); */
       /*   ergodox_right_led_2_on(); */
@@ -219,9 +196,9 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     /* case SFT_T(KC_SPC): */
     /*   return TAPPING_TERM + 1250; */
-    case LT(_3_NUMBERS, KC_E):
+    case E_NUMBERS:
       return 200;
-    case LT(_4_MOUSE, KC_R):
+    case LT(_2_MOUSE, KC_R):
       return 200;
     /* case LGUI_T(KC_F): */
     /*   return 50; */
@@ -231,8 +208,8 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
 }
 bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case LT(_3_NUMBERS, KC_E):
+    case E_NUMBERS:
-    case LT(_4_MOUSE, KC_R):
+    case R_MOUSE:
     case LSFT_T(KC_A):
     case LCTL_T(KC_S):
     case LALT_T(KC_D):
@@ -241,8 +218,7 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
     case RALT_T(KC_K):
     case RCTL_T(KC_L):
     case RSFT_T(KC_SCOLON):
-    case LEFT_NUMBERS:
+    case ARROWS:
-    case RIGHT_MOUSE:
       return true;
     default:
       return false;
@@ -252,8 +228,8 @@ bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
 
 bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case LT(_3_NUMBERS, KC_E):
+    case LT(_1_NUMBERS, KC_E):
-    case LT(_4_MOUSE, KC_R):
+    case R_MOUSE:
     case LSFT_T(KC_A):
     case LCTL_T(KC_S):
     case LALT_T(KC_D):
@@ -262,8 +238,7 @@ bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
     case RALT_T(KC_K):
     case RCTL_T(KC_L):
     case RSFT_T(KC_SCOLON):
-    case LEFT_NUMBERS:
+    case ARROWS:
-    case RIGHT_MOUSE:
       return false;
     default:
       return true;
@@ -291,6 +266,9 @@ void matrix_scan_user(void) {
     SEQ_ONE_KEY(KC_S) {
       SEND_STRING ("sudo -i\n");
     }
+    SEQ_ONE_KEY(KC_H) {
+      SEND_STRING ("--help\n");
+    }
     SEQ_TWO_KEYS(KC_D, KC_D) {
       SEND_STRING(SS_LGUI("ac"));
       /* SEND_STRING(SS_LGUI("a") SS_LGUI("c")); */

keyboards/ergodox_ez/keymaps/stamm/readme.md

@@ -1,12 +1,11 @@
 # Stamm layouts for ergodox_ez
 
-5 layers:
+4 layers:
 
 * QUERTY
-* BEAKL15
-* WORKMAN
 * Numbers
 * Mouse
+* Arrows
 
 On home row there are hold dual keys:
 - shift, ctrl, alt, cmd — on the fingers on the left hand
@@ -17,17 +16,17 @@ Hold E switch to layer with numbers.
 Hold R switch to mouse controll layer.
 
 ```
-                                              0 Base
+                                              0_Base
 ╭────────┬─────┬─────┬─────┬─────┬─────┬─────╮      ╭─────┬─────┬─────┬─────┬─────┬─────┬────────╮
 │   `    │  !  │  @  │  #  │  $  │  %  │Mute │      │Capsl│  ^  │  &  │  *  │  (  │  )  │   -    │
 ├────────┼─────┼─────┼─────┼─────┼─────┼─────┤      ├─────┼─────┼─────┼─────┼─────┼─────┼────────┤
-│  Lead  │  Q  │  W  │E|LT3│R|LT4│  T  │ TG1 │      │     │  Y  │  U  │  I  │  O  │  P  │   [    │
+│  Lead  │  Q  │  W  │E|LT1│R|LT2│  T  │     │      │     │  Y  │  U  │  I  │  O  │  P  │   [    │
 ├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
 │Ctrl + B│A | ⇧│S | ⌃│D | ⌥│F | ⌘│  G  ├─────┤      ├─────┤  H  │J | ⌘│K | ⌥│L | ⌃│; | ⇧│   '    │
-├────────┼─────┼─────┼─────┼─────┼─────┤ TG2 │      │  ]  ├─────┼─────┼─────┼─────┼─────┼────────┤
+├────────┼─────┼─────┼─────┼─────┼─────┤     │      │  ]  ├─────┼─────┼─────┼─────┼─────┼────────┤
 │   \    │  Z  │  X  │  C  │  V  │  B  │     │      │     │  N  │  M  │  ,  │  .  │  /  │   =    │
 ╰──┬─────┼─────┼─────┼─────┼─────┼─────┴─────╯      ╰─────┴─────┼─────┼─────┼─────┼─────┼─────┬──╯
-   │⎇ + T│     │     │←|LT3│→|LT4│                              │  ↓  │  ↑  │     │     │     │
+   │⎇ + T│     │     │     │Arrow│                              │     │     │     │     │     │
    ╰─────┴─────┴─────┴─────┴─────╯ ╭─────┬─────╮  ╭─────┬─────╮ ╰─────┴─────┴─────┴─────┴─────╯
                                    │Vol- │Vol+ │  │Play │Next │
                              ╭─────┼─────┼─────┤  ├─────┼─────┼─────╮
@@ -36,45 +35,7 @@ Hold R switch to mouse controll layer.
                              │     │     │ Esc │  │ Esc │     │     │
                              ╰─────┴─────┴─────╯  ╰─────┴─────┴─────╯
 
-                                             1 Beakl
+                                            1_Numbers
-╭────────┬─────┬─────┬─────┬─────┬─────┬─────╮      ╭─────┬─────┬─────┬─────┬─────┬─────┬────────╮
-│        │     │     │     │     │     │     │      │     │     │     │     │     │     │        │
-├────────┼─────┼─────┼─────┼─────┼─────┼─────┤      ├─────┼─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │  H  │O|LT3│U|LT4│  X  │     │      │     │  G  │  C  │  R  │  F  │  Z  │        │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
-│        │Y | ⇧│I | ⌃│E | ⌥│A | ⌘│  .  ├─────┤      ├─────┤  D  │S | ⌘│T | ⌥│N | ⌃│B | ⇧│   ;    │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
-│        │  J  │  /  │  ,  │  K  │  '  │     │      │     │  W  │     │  L  │  P  │  V  │        │
-╰──┬─────┼─────┼─────┼─────┼─────┼─────┴─────╯      ╰─────┴─────┼─────┼─────┼─────┼─────┼─────┬──╯
-   │     │     │     │     │     │                              │     │     │     │     │     │
-   ╰─────┴─────┴─────┴─────┴─────╯ ╭─────┬─────╮  ╭─────┬─────╮ ╰─────┴─────┴─────┴─────┴─────╯
-                                   │     │     │  │     │     │
-                             ╭─────┼─────┼─────┤  ├─────┼─────┼─────╮
-                             │     │     │     │  │     │     │     │
-                             │     │     ├─────┤  ├─────┤     │     │
-                             │     │     │     │  │     │     │     │
-                             ╰─────┴─────┴─────╯  ╰─────┴─────┴─────╯
-
-                                            2 Workman
-╭────────┬─────┬─────┬─────┬─────┬─────┬─────╮      ╭─────┬─────┬─────┬─────┬─────┬─────┬────────╮
-│        │     │     │     │     │     │     │      │     │     │     │     │     │     │        │
-├────────┼─────┼─────┼─────┼─────┼─────┼─────┤      ├─────┼─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │  D  │R|LT3│W|LT4│  B  │     │      │     │  J  │  F  │  U  │  P  │  ;  │        │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │     │H | ⌥│T | ⌘│     ├─────┤      ├─────┤  Y  │N | ⌘│E | ⌥│O | ⌃│I | ⇧│        │
-├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
-│        │     │     │  M  │  C  │  V  │     │      │     │  K  │  L  │     │     │     │        │
-╰──┬─────┼─────┼─────┼─────┼─────┼─────┴─────╯      ╰─────┴─────┼─────┼─────┼─────┼─────┼─────┬──╯
-   │     │     │     │     │     │                              │     │     │     │     │     │
-   ╰─────┴─────┴─────┴─────┴─────╯ ╭─────┬─────╮  ╭─────┬─────╮ ╰─────┴─────┴─────┴─────┴─────╯
-                                   │     │     │  │     │     │
-                             ╭─────┼─────┼─────┤  ├─────┼─────┼─────╮
-                             │     │     │     │  │     │     │     │
-                             │     │     ├─────┤  ├─────┤     │     │
-                             │     │     │     │  │     │     │     │
-                             ╰─────┴─────┴─────╯  ╰─────┴─────┴─────╯
-
-                                            3 Numbers
 ╭────────┬─────┬─────┬─────┬─────┬─────┬─────╮      ╭─────┬─────┬─────┬─────┬─────┬─────┬────────╮
 │        │ F1  │ F2  │ F3  │ F4  │ F5  │     │      │     │ F6  │ F7  │ F8  │ F9  │ F10 │  F11   │
 ├────────┼─────┼─────┼─────┼─────┼─────┼─────┤      ├─────┼─────┼─────┼─────┼─────┼─────┼────────┤
@@ -93,7 +54,7 @@ Hold R switch to mouse controll layer.
                              │     │     │     │  │     │     │     │
                              ╰─────┴─────┴─────╯  ╰─────┴─────┴─────╯
 
-                                             4 Mouse
+                                             2_Mouse
 ╭────────┬─────┬─────┬─────┬─────┬─────┬─────╮      ╭─────┬─────┬─────┬─────┬─────┬─────┬────────╮
 │        │     │     │     │     │     │     │      │     │     │     │     │     │     │        │
 ├────────┼─────┼─────┼─────┼─────┼─────┼─────┤      ├─────┼─────┼─────┼─────┼─────┼─────┼────────┤
@@ -108,7 +69,26 @@ Hold R switch to mouse controll layer.
                                    │RgbHu│RgbHu│  │RgbVa│RgbVa│
                              ╭─────┼─────┼─────┤  ├─────┼─────┼─────╮
                              │     │     │     │  │     │     │     │
-                             │     │     ├─────┤  ├─────┤     │ 75  │
+                             │     │     ├─────┤  ├─────┤     │     │
+                             │     │     │     │  │     │     │     │
+                             ╰─────┴─────┴─────╯  ╰─────┴─────┴─────╯
+
+                                             3_Arrow
+╭────────┬─────┬─────┬─────┬─────┬─────┬─────╮      ╭─────┬─────┬─────┬─────┬─────┬─────┬────────╮
+│        │     │     │     │     │     │     │      │     │     │     │     │     │     │        │
+├────────┼─────┼─────┼─────┼─────┼─────┼─────┤      ├─────┼─────┼─────┼─────┼─────┼─────┼────────┤
+│        │     │     │     │     │     │     │      │     │     │     │     │     │     │        │
+├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
+│        │     │     │     │     │     ├─────┤      ├─────┤  ←  │  ↓  │  ↑  │  →  │     │        │
+├────────┼─────┼─────┼─────┼─────┼─────┤     │      │     ├─────┼─────┼─────┼─────┼─────┼────────┤
+│        │     │     │     │     │     │     │      │     │     │     │     │     │     │        │
+╰──┬─────┼─────┼─────┼─────┼─────┼─────┴─────╯      ╰─────┴─────┼─────┼─────┼─────┼─────┼─────┬──╯
+   │     │     │     │     │     │                              │     │     │     │     │     │
+   ╰─────┴─────┴─────┴─────┴─────╯ ╭─────┬─────╮  ╭─────┬─────╮ ╰─────┴─────┴─────┴─────┴─────╯
+                                   │     │     │  │     │     │
+                             ╭─────┼─────┼─────┤  ├─────┼─────┼─────╮
+                             │     │     │     │  │     │     │     │
+                             │     │     ├─────┤  ├─────┤     │     │
                              │     │     │     │  │     │     │     │
                              ╰─────┴─────┴─────╯  ╰─────┴─────┴─────╯