Fix Czech sendstring LUT (#19193)

* rb1

* Update keymap.c

* Update keyboards/ryanbaekr/rb1/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

* Delete rb1.c

* Delete rb1.h

* Update keyboards/ryanbaekr/rb1/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/ryanbaekr/rb1/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/ryanbaekr/rb1/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve QMK Firmware.
-title: "[Bug] "
-labels: bug, help wanted
-assignees: ''
-
----
-
-<!-- Provide a general summary of the bug in the title above. -->
-
-<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
-<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
-
-## Describe the Bug
-
-<!-- A clear and concise description of what the bug is. -->
-
-## System Information
-
-**Keyboard:** 
-**Revision (if applicable):** 
-**Operating system:** 
-**`qmk doctor` output:** 
-```
-(Paste output here)
-```
-
-**Any keyboard related software installed?** 
- - [ ] AutoHotKey (Windows)
- - [ ] Karabiner (macOS)
- - [ ] Other:
-
-## Additional Context
-
-<!-- Add any other relevant information about the problem here. -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,41 @@
+name: Bug report
+description: Create a report to help us improve QMK Firmware.
+title: "[Bug] "
+labels: ["bug", "help wanted"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Provide a general summary of the bug in the title above.
+  - type: textarea
+    attributes:
+      label: Describe the Bug
+      description: A clear and concise description of what the bug is.
+  - type: input
+    attributes:
+      label: Keyboard Used
+      description: The name of the keyboard from the `make` or `qmk compile`/`qmk flash` commands, eg. `planck/rev6`.
+  - type: input
+    attributes:
+      label: Link to product page (if applicable)
+  - type: input
+    attributes:
+      label: Operating System
+  - type: textarea
+    attributes:
+      label: qmk doctor Output
+      description: Output from running the `qmk doctor` command.
+      render: text
+  - type: checkboxes
+    attributes:
+      label: Is AutoHotKey / Karabiner installed
+      options:
+        - label: AutoHotKey (Windows)
+        - label: Karabiner (macOS)
+  - type: input
+    attributes:
+      label: Other keyboard-related software installed
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: Add any other relevant information about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,24 +0,0 @@
----
-name: Feature request
-about: Suggest a new feature or changes to existing features.
-title: "[Feature Request] "
-labels: enhancement, help wanted
-assignees: ''
-
----
-
-<!--- Provide a general summary of the changes you want in the title above. -->
-
-<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
-<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
-
-## Feature Request Type
-
-- [ ] Core functionality
-- [ ] Add-on hardware support (eg. audio, RGB, OLED screen, etc.)
-- [ ] Alteration (enhancement/optimization) of existing feature(s)
-- [ ] New behavior
-
-## Description
-
-<!-- A few sentences describing what it is that you'd like to see in QMK. Additional information (such as links to spec sheets, licensing info, other related issues or PRs, etc) would be helpful. -->

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,21 @@
+name: Feature request
+description: Suggest a new feature or changes to existing features.
+title: "[Feature Request] "
+labels: ["enhancement", "help wanted"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Provide a general summary of the changes you want in the title above.
+  - type: checkboxes
+    attributes:
+      label: Feature Request Type
+      options:
+        - label: Core functionality
+        - label: Add-on hardware support (eg. audio, RGB, OLED screen, etc.)
+        - label: Alteration (enhancement/optimization) of existing feature(s)
+        - label: New behavior
+  - type: textarea
+    attributes:
+      label: Description
+      description: A few sentences describing what it is that you'd like to see in QMK. Additional information (such as links to spec sheets, licensing info, other related issues or PRs, etc) would be helpful.

.github/ISSUE_TEMPLATE/other_issues.md

@@ -1,14 +0,0 @@
----
-name: Other issues
-about: Anything else that doesn't fall into the above categories.
-title: ''
-labels: help wanted, question
-assignees: ''
-
----
-
-<!--- Provide a general summary of the changes you want in the title above. -->
-
-<!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
-
-<!-- Please check https://docs.qmk.fm/#/support for additional resources first. If that doesn't answer your question, choose the bug report template instead, as that may be more appropriate. -->

.github/ISSUE_TEMPLATE/other_issues.yml

@@ -0,0 +1,16 @@
+name: Other issues
+description: Anything else that doesn't fall into the above categories.
+labels: ["help wanted", "question"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Provide a general summary of the changes you want in the title above.
+  - type: markdown
+    attributes:
+      value: |
+        Please check [https://docs.qmk.fm/#/support](https://docs.qmk.fm/#/support) for additional resources first. If that doesn't answer your question, choose the bug report template instead, as that may be more appropriate.
+  - type: textarea
+    attributes:
+      label: Issue Description
+      description: Describe your issue in as much detail as possible.

.github/workflows/api.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
     - master
+    - develop
     paths:
     - 'keyboards/**'
     - 'layouts/community/**'
@@ -17,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     container: qmkfm/qmk_cli
 
-    # protect against those who develop with their fork on master
+    # protect against those who work in their fork on 'important' branches
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
@@ -26,15 +27,20 @@ jobs:
         fetch-depth: 1
         persist-credentials: false
 
+    - name: Install dependencies
+      run: |
+        pip3 install -r requirements-dev.txt
+
     - name: Generate API Data
-      run: qmk generate-api
+      run: |
+        qmk generate-api
 
     - name: Upload API Data
       uses: jakejarvis/s3-sync-action@master
       with:
         args: --acl public-read --follow-symlinks --delete
       env:
-        AWS_S3_BUCKET: ${{ secrets.API_SPACE_MASTER }}
+        AWS_S3_BUCKET: ${{ github.ref == 'refs/heads/develop' && secrets['API_SPACE_DEVELOP'] || secrets['API_SPACE_MASTER'] }}
         AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
         AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com

.github/workflows/auto_tag.yml

@@ -27,7 +27,7 @@ jobs:
         fetch-depth: 0
 
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.50.0
+      uses: anothrNick/github-tag-action@1.52.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DEFAULT_BUMP: 'patch'

.github/workflows/develop_api.yml

@@ -1,43 +0,0 @@
-name: Update Develop API Data
-
-on:
-  push:
-    branches:
-    - develop
-    paths:
-    - 'keyboards/**'
-    - 'layouts/community/**'
-    - 'lib/python/**'
-    - 'data/**'
-    - '.github/workflows/develop_api.yml'
-  workflow_dispatch:
-
-jobs:
-  api_data:
-    runs-on: ubuntu-latest
-    container: qmkfm/qmk_cli
-
-    # protect against those who work in their fork on develop
-    if: github.repository == 'qmk/qmk_firmware'
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 1
-        persist-credentials: false
-
-    - name: Generate API Data
-      run: |
-        python3 -m pip install -r requirements-dev.txt
-        qmk generate-api
-
-    - name: Upload API Data
-      uses: jakejarvis/s3-sync-action@master
-      with:
-        args: --acl public-read --follow-symlinks --delete
-      env:
-        AWS_S3_BUCKET: ${{ secrets.API_SPACE_DEVELOP }}
-        AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
-        AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
-        SOURCE_DIR: '.build/api_data'

.github/workflows/docs.yml

@@ -34,7 +34,7 @@ jobs:
         qmk --verbose generate-docs
 
     - name: Deploy
-      uses: JamesIves/github-pages-deploy-action@v4.4.0
+      uses: JamesIves/github-pages-deploy-action@v4.4.1
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BASE_BRANCH: master

.gitignore

@@ -53,6 +53,7 @@ quantum/version.h
 build/
 cmake-build-debug
 CMakeLists.txt
+*.pdf
 
 # Let these ones be user specific, since we have so many different configurations
 *.code-workspace
@@ -67,9 +68,20 @@ CMakeLists.txt
 tags
 
 # Ignore image/font files
+*.bmp
+*.wbmp
 *.gif
 *.jpg
+*.jpeg
 *.png
+*.apng
+*.mng
+*.svg
+*.webp
+*.webm
+*.avi
+*.mp4
+*.mpeg
 *.ttf
 *.otf
 

Makefile

@@ -241,7 +241,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,$(shell util/list_keyboards.sh noci | sort -u)))
+    $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell util/list_keyboards.sh | sort -u)))
 endef
 
 # Prints a list of all known keymaps for the given keyboard
@@ -264,7 +264,7 @@ define PARSE_KEYMAP
     # The rest of the rule is the target
     # Remove the leading ":" from the target, as it acts as a separator
     MAKE_TARGET := $$(patsubst :%,%,$$(RULE))
-    # We need to generate an unique indentifer to append to the COMMANDS list
+    # We need to generate an unique identifier to append to the COMMANDS list
     CURRENT_KB_UNDER := $$(subst /,_,$$(CURRENT_KB))
     COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB_UNDER)_KEYMAP_$$(CURRENT_KM)
     # If we are compiling a keyboard without a subproject, we want to display just the name

builddefs/bootloader.mk

@@ -1,223 +0,0 @@
-# Copyright 2017 Jack Humbert
-#
-# 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/>.
-
-# If it's possible that multiple bootloaders can be used for one project,
-# you can leave this unset, and the correct size will be selected
-# automatically.
-#
-# Sets the bootloader defined in the keyboard's/keymap's rules.mk
-# Current options:
-#
-# AVR:
-#     halfkay      PJRC Teensy
-#     caterina     Pro Micro (Sparkfun/generic)
-#     atmel-dfu    Atmel factory DFU
-#     lufa-dfu     LUFA DFU
-#     qmk-dfu      QMK DFU (LUFA + blinkenlight)
-#     qmk-hid      QMK HID (LUFA + blinkenlight)
-#     bootloadhid  HIDBootFlash compatible (ATmega32A)
-#     usbasploader USBaspLoader (ATmega328P)
-# ARM:
-#     halfkay      PJRC Teensy
-#     kiibohd      Input:Club Kiibohd bootloader (only used on their boards)
-#     stm32duino   STM32Duino (STM32F103x8)
-#     stm32-dfu    STM32 USB DFU in ROM
-#     apm32-dfu    APM32 USB DFU in ROM
-# RISC-V:
-#     gd32v-dfu    GD32V USB DFU in ROM
-#
-# If you need to provide your own implementation, you can set inside `rules.mk`
-# `BOOTLOADER = custom` -- you'll need to provide your own implementations. See
-# the respective file under `platforms/<PLATFORM>/bootloaders/custom.c` to see
-# which functions may be overridden.
-#
-# BOOTLOADER_SIZE can still be defined manually, but it's recommended
-# you add any possible configuration to this list
-
-ifeq ($(strip $(BOOTLOADER)), custom)
-    OPT_DEFS += -DBOOTLOADER_CUSTOM
-    BOOTLOADER_TYPE = custom
-endif
-ifeq ($(strip $(BOOTLOADER)), atmel-dfu)
-    OPT_DEFS += -DBOOTLOADER_ATMEL_DFU
-    OPT_DEFS += -DBOOTLOADER_DFU
-    BOOTLOADER_TYPE = dfu
-
-    ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))
-        BOOTLOADER_SIZE = 4096
-    endif
-    ifneq (,$(filter $(MCU), at90usb1286 at90usb1287))
-        BOOTLOADER_SIZE = 8192
-    endif
-endif
-ifeq ($(strip $(BOOTLOADER)), lufa-dfu)
-    OPT_DEFS += -DBOOTLOADER_LUFA_DFU
-    OPT_DEFS += -DBOOTLOADER_DFU
-    BOOTLOADER_TYPE = dfu
-
-    ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))
-        BOOTLOADER_SIZE ?= 4096
-    endif
-    ifneq (,$(filter $(MCU), at90usb1286 at90usb1287))
-        BOOTLOADER_SIZE ?= 8192
-    endif
-endif
-ifeq ($(strip $(BOOTLOADER)), qmk-dfu)
-    OPT_DEFS += -DBOOTLOADER_QMK_DFU
-    OPT_DEFS += -DBOOTLOADER_DFU
-    BOOTLOADER_TYPE = dfu
-
-    ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))
-        BOOTLOADER_SIZE ?= 4096
-    endif
-    ifneq (,$(filter $(MCU), at90usb1286 at90usb1287))
-        BOOTLOADER_SIZE ?= 8192
-    endif
-endif
-ifeq ($(strip $(BOOTLOADER)), qmk-hid)
-    OPT_DEFS += -DBOOTLOADER_QMK_HID
-    OPT_DEFS += -DBOOTLOADER_HID
-    BOOTLOADER_TYPE = dfu
-
-    BOOTLOADER_SIZE ?= 4096
-endif
-ifeq ($(strip $(BOOTLOADER)), halfkay)
-    OPT_DEFS += -DBOOTLOADER_HALFKAY
-    BOOTLOADER_TYPE = halfkay
-
-    # Teensy 2.0
-    ifeq ($(strip $(MCU)), atmega32u4)
-        BOOTLOADER_SIZE = 512
-    endif
-    # Teensy 2.0++
-    ifeq ($(strip $(MCU)), at90usb1286)
-        BOOTLOADER_SIZE = 1024
-    endif
-    # Teensy LC, 3.0, 3.1/2, 3.5, 3.6
-    ifneq (,$(filter $(MCU_ORIG), MKL26Z64 MK20DX128 MK20DX256 MK64FX512 MK66FX1M0))
-        FIRMWARE_FORMAT = hex
-    endif
-endif
-ifeq ($(strip $(BOOTLOADER)), caterina)
-    OPT_DEFS += -DBOOTLOADER_CATERINA
-    BOOTLOADER_TYPE = caterina
-
-    BOOTLOADER_SIZE = 4096
-endif
-ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID))
-    OPT_DEFS += -DBOOTLOADER_BOOTLOADHID
-    BOOTLOADER_TYPE = bootloadhid
-
-    BOOTLOADER_SIZE = 4096
-endif
-ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp))
-    OPT_DEFS += -DBOOTLOADER_USBASP
-    BOOTLOADER_TYPE = usbasploader
-
-    BOOTLOADER_SIZE = 4096
-endif
-ifeq ($(strip $(BOOTLOADER)), lufa-ms)
-    OPT_DEFS += -DBOOTLOADER_MS
-    BOOTLOADER_TYPE = dfu
-
-    BOOTLOADER_SIZE ?= 8192
-    FIRMWARE_FORMAT = bin
-cpfirmware: lufa_warning
-.INTERMEDIATE: lufa_warning
-lufa_warning: $(FIRMWARE_FORMAT)
-	$(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@)
-	$(info LUFA MASS STORAGE Bootloader selected)
-	$(info DO NOT USE THIS BOOTLOADER IN NEW PROJECTS!)
-	$(info It is extremely prone to bricking, and is only included to support existing boards.)
-	$(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@)
-endif
-ifdef BOOTLOADER_SIZE
-    OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE))
-endif
-
-ifeq ($(strip $(BOOTLOADER)), stm32-dfu)
-    OPT_DEFS += -DBOOTLOADER_STM32_DFU
-    BOOTLOADER_TYPE = stm32_dfu
-
-    # Options to pass to dfu-util when flashing
-    DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
-    DFU_SUFFIX_ARGS ?= -v 0483 -p DF11
-endif
-ifeq ($(strip $(BOOTLOADER)), apm32-dfu)
-    OPT_DEFS += -DBOOTLOADER_APM32_DFU
-    BOOTLOADER_TYPE = stm32_dfu
-
-    # Options to pass to dfu-util when flashing
-    DFU_ARGS ?= -d 314B:0106 -a 0 -s 0x08000000:leave
-    DFU_SUFFIX_ARGS ?= -v 314B -p 0106
-endif
-ifeq ($(strip $(BOOTLOADER)), gd32v-dfu)
-    OPT_DEFS += -DBOOTLOADER_GD32V_DFU
-    BOOTLOADER_TYPE = gd32v_dfu
-
-    # Options to pass to dfu-util when flashing
-    DFU_ARGS ?= -d 28E9:0189 -a 0 -s 0x08000000:leave
-    DFU_SUFFIX_ARGS ?= -v 28E9 -p 0189
-endif
-ifeq ($(strip $(BOOTLOADER)), kiibohd)
-    OPT_DEFS += -DBOOTLOADER_KIIBOHD
-    BOOTLOADER_TYPE = kiibohd
-
-    ifeq ($(strip $(MCU_ORIG)), MK20DX128)
-        MCU_LDSCRIPT = MK20DX128BLDR4
-    endif
-    ifeq ($(strip $(MCU_ORIG)), MK20DX256)
-        MCU_LDSCRIPT = MK20DX256BLDR8
-    endif
-
-    # Options to pass to dfu-util when flashing
-    DFU_ARGS = -d 1C11:B007
-    DFU_SUFFIX_ARGS = -v 1C11 -p B007
-endif
-ifeq ($(strip $(BOOTLOADER)), stm32duino)
-    OPT_DEFS += -DBOOTLOADER_STM32DUINO
-    MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
-    BOARD = STM32_F103_STM32DUINO
-    BOOTLOADER_TYPE = stm32duino
-
-    # Options to pass to dfu-util when flashing
-    DFU_ARGS = -d 1EAF:0003 -a 2 -R
-    DFU_SUFFIX_ARGS = -v 1EAF -p 0003
-endif
-ifeq ($(strip $(BOOTLOADER)), tinyuf2)
-    OPT_DEFS += -DBOOTLOADER_TINYUF2
-    BOOTLOADER_TYPE = tinyuf2
-    FIRMWARE_FORMAT = uf2
-endif
-ifeq ($(strip $(BOOTLOADER)), rp2040)
-    OPT_DEFS += -DBOOTLOADER_RP2040
-    BOOTLOADER_TYPE = rp2040
-endif
-ifeq ($(strip $(BOOTLOADER)), halfkay)
-    OPT_DEFS += -DBOOTLOADER_HALFKAY
-    BOOTLOADER_TYPE = halfkay
-endif
-ifeq ($(strip $(BOOTLOADER)), md-boot)
-    OPT_DEFS += -DBOOTLOADER_MD_BOOT
-    BOOTLOADER_TYPE = md_boot
-endif
-ifeq ($(strip $(BOOTLOADER)), wb32-dfu)
-    OPT_DEFS += -DBOOTLOADER_WB32_DFU
-    BOOTLOADER_TYPE = wb32_dfu
-endif
-
-ifeq ($(strip $(BOOTLOADER_TYPE)),)
-    $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file.)
-endif

builddefs/build_full_test.mk

@@ -20,7 +20,7 @@ $(TEST)_SRC := \
 	$(TMK_COMMON_SRC) \
 	$(QUANTUM_SRC) \
 	$(SRC) \
-	tests/test_common/keymap.c \
+	$(QUANTUM_PATH)/keymap_introspection.c \
 	tests/test_common/matrix.c \
 	tests/test_common/test_driver.cpp \
 	tests/test_common/keyboard_report_util.cpp \
@@ -29,7 +29,7 @@ $(TEST)_SRC := \
 	tests/test_common/test_logger.cpp \
 	$(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp))
 
-$(TEST)_DEFS := $(TMK_COMMON_DEFS) $(OPT_DEFS)
+$(TEST)_DEFS := $(TMK_COMMON_DEFS) $(OPT_DEFS) "-DKEYMAP_C=\"keymap.c\""
 
 $(TEST)_CONFIG := $(TEST_PATH)/config.h
 

builddefs/build_keyboard.mk

@@ -124,26 +124,26 @@ include $(BUILDDEFS_PATH)/build_json.mk
 # Pull in keymap level rules.mk
 ifeq ("$(wildcard $(KEYMAP_PATH))", "")
     # Look through the possible keymap folders until we find a matching keymap.c
-    ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.c)","")
-        -include $(MAIN_KEYMAP_PATH_5)/rules.mk
-        KEYMAP_C := $(MAIN_KEYMAP_PATH_5)/keymap.c
-        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
-    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.c)","")
-        -include $(MAIN_KEYMAP_PATH_4)/rules.mk
-        KEYMAP_C := $(MAIN_KEYMAP_PATH_4)/keymap.c
-        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
-    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.c)","")
-        -include $(MAIN_KEYMAP_PATH_3)/rules.mk
-        KEYMAP_C := $(MAIN_KEYMAP_PATH_3)/keymap.c
-        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
+    ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_1)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_1)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
     else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.c)","")
         -include $(MAIN_KEYMAP_PATH_2)/rules.mk
         KEYMAP_C := $(MAIN_KEYMAP_PATH_2)/keymap.c
         KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2)
-    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.c)","")
-        -include $(MAIN_KEYMAP_PATH_1)/rules.mk
-        KEYMAP_C := $(MAIN_KEYMAP_PATH_1)/keymap.c
-        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
+    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_3)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_3)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
+    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_4)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_4)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
+    else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.c)","")
+        -include $(MAIN_KEYMAP_PATH_5)/rules.mk
+        KEYMAP_C := $(MAIN_KEYMAP_PATH_5)/keymap.c
+        KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
     else ifneq ($(LAYOUTS),)
         # If we haven't found a keymap yet fall back to community layouts
         include $(BUILDDEFS_PATH)/build_layout.mk
@@ -162,7 +162,7 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")
     -include $(KEYMAP_PATH)/rules.mk
 
     # Load any rules.mk content from keymap.json
-    INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_OUTPUT)/src/rules.mk)
+    INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(KEYMAP_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
     include $(INFO_RULES_MK)
 
 # Add rules to generate the keymap files - indentation here is important
@@ -173,7 +173,7 @@ $(KEYMAP_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
 
 $(KEYMAP_OUTPUT)/src/config.h: $(KEYMAP_JSON)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_H))
+	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --output $(KEYMAP_H) $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
 generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
@@ -236,26 +236,25 @@ endif
 # that the same keymap may be used on multiple keyboards.
 #
 # We grab the most top-level include file that we can. That file should
-# use #ifdef statements to include all the neccesary subfolder includes,
+# use #ifdef statements to include all the necessary subfolder includes,
 # as described here:
 #
 #    https://docs.qmk.fm/#/feature_layouts?id=tips-for-making-layouts-keyboard-agnostic
 #
-QMK_KEYBOARD_H = $(KEYBOARD_OUTPUT)/src/default_keyboard.h
 ifneq ("$(wildcard $(KEYBOARD_PATH_1)/$(KEYBOARD_FOLDER_1).h)","")
-    QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_1).h
+    FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_1).h
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_2)/$(KEYBOARD_FOLDER_2).h)","")
-    QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_2).h
+    FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_2).h
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_3)/$(KEYBOARD_FOLDER_3).h)","")
-    QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_3).h
+    FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_3).h
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_4)/$(KEYBOARD_FOLDER_4).h)","")
-    QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_4).h
+    FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_4).h
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_5)/$(KEYBOARD_FOLDER_5).h)","")
-    QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_5).h
+    FOUND_KEYBOARD_H = $(KEYBOARD_FOLDER_5).h
 endif
 
 # Determine and set parameters based on the keyboard's processor family.
@@ -329,7 +328,7 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
     INFO_JSON_FILES += $(KEYBOARD_PATH_5)/info.json
 endif
 
-CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h
+CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h
 KEYBOARD_SRC += $(KEYBOARD_OUTPUT)/src/default_keyboard.c
 
 $(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
@@ -344,15 +343,10 @@ $(KEYBOARD_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES)
 
 $(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h)
+	$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h)
 	@$(BUILD_CMD)
 
-$(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h)
-	@$(BUILD_CMD)
-
-generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.c $(KEYBOARD_OUTPUT)/src/default_keyboard.h $(KEYBOARD_OUTPUT)/src/layouts.h
+generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.c $(KEYBOARD_OUTPUT)/src/default_keyboard.h
 
 .INTERMEDIATE : generated-files
 
@@ -374,6 +368,10 @@ endif
 # Disable features that a keyboard doesn't support
 -include $(BUILDDEFS_PATH)/disable_features.mk
 
+ifneq ("$(CONVERTER)","")
+    -include $(CONVERTER)/post_converter.mk
+endif
+
 # Pull in post_rules.mk files from all our subfolders
 ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_rules.mk)","")
     include $(KEYBOARD_PATH_1)/post_rules.mk
@@ -428,7 +426,6 @@ include $(BUILDDEFS_PATH)/common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
 include $(TMK_PATH)/protocol.mk
 include $(PLATFORM_PATH)/common.mk
-include $(BUILDDEFS_PATH)/bootloader.mk
 
 SRC += $(patsubst %.c,%.clib,$(LIB_SRC))
 SRC += $(patsubst %.c,%.clib,$(QUANTUM_LIB_SRC))
@@ -443,6 +440,7 @@ ifneq ($(REQUIRE_PLATFORM_KEY),)
     endif
 endif
 
+-include $(PLATFORM_PATH)/$(PLATFORM_KEY)/bootloader.mk
 include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
 -include $(PLATFORM_PATH)/$(PLATFORM_KEY)/flash.mk
 
@@ -471,7 +469,7 @@ ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
 OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
 $(KEYMAP_OUTPUT)_SRC := $(SRC)
 $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) \
--DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" \
+-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(KEYBOARD_OUTPUT)/src/default_keyboard.h\" \
 -DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\"
 $(KEYMAP_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS)
 $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)

builddefs/build_test.mk

@@ -71,7 +71,7 @@ include $(BUILDDEFS_PATH)/build_full_test.mk
 endif
 
 $(TEST)_SRC += \
-	tests/test_common/main.c \
+	tests/test_common/main.cpp \
 	$(QUANTUM_PATH)/logging/print.c
 
 $(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC)

builddefs/common_features.mk

@@ -64,6 +64,7 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
         OPT_DEFS += -DAUDIO_DRIVER_PWM
     endif
     OPT_DEFS += -DAUDIO_ENABLE
+    COMMON_VPATH += $(QUANTUM_PATH)/audio
     MUSIC_ENABLE = yes
     SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
     SRC += $(QUANTUM_DIR)/process_keycode/process_clicky.c
@@ -136,6 +137,7 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
         VPATH += $(QUANTUM_DIR)/pointing_device
         SRC += $(QUANTUM_DIR)/pointing_device/pointing_device.c
         SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_drivers.c
+        SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_auto_mouse.c
         ifneq ($(strip $(POINTING_DEVICE_DRIVER)), custom)
             SRC += drivers/sensors/$(strip $(POINTING_DEVICE_DRIVER)).c
             OPT_DEFS += -DPOINTING_DEVICE_DRIVER_$(strip $(shell echo $(POINTING_DEVICE_DRIVER) | tr '[:lower:]' '[:upper:]'))
@@ -175,7 +177,7 @@ ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes)
     include $(QUANTUM_DIR)/painter/rules.mk
 endif
 
-VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling
+VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling legacy_stm32_flash
 EEPROM_DRIVER ?= vendor
 ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
   $(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
@@ -202,6 +204,12 @@ else
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
     QUANTUM_LIB_SRC += spi_master.c
     SRC += eeprom_driver.c eeprom_spi.c
+  else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
+    # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
+    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+    COMMON_VPATH += $(DRIVER_PATH)/flash
+    SRC += eeprom_driver.c eeprom_stm32.c flash_stm32.c
   else ifeq ($(strip $(EEPROM_DRIVER)), transient)
     # Transient EEPROM implementation -- no data storage but provides runtime area for it
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
@@ -212,25 +220,30 @@ else
     ifeq ($(PLATFORM),AVR)
       # Automatically provided by avr-libc, nothing required
     else ifeq ($(PLATFORM),CHIBIOS)
-      ifneq ($(filter STM32F3xx_% STM32F1xx_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
-        # Emulated EEPROM
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
+      ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
+        # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
         COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
         COMMON_VPATH += $(DRIVER_PATH)/flash
-        SRC += eeprom_driver.c eeprom_stm32.c flash_stm32.c
+        SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
+      else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G4xx WB32F3G71xx WB32FQ95xx GD32VF103),)
+        # Wear-leveling EEPROM implementation, backed by MCU flash
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+        SRC += eeprom_driver.c eeprom_wear_leveling.c
+        WEAR_LEVELING_DRIVER = embedded_flash
       else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
         # True EEPROM on STM32L0xx, L1xx
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
         SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
       else ifneq ($(filter $(MCU_SERIES),RP2040),)
-		# Wear-leveling EEPROM implementation, backed by RP2040 flash
-		OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-		SRC += eeprom_driver.c eeprom_wear_leveling.c
+        # Wear-leveling EEPROM implementation, backed by RP2040 flash
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+        SRC += eeprom_driver.c eeprom_wear_leveling.c
         WEAR_LEVELING_DRIVER = rp2040_flash
       else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
         # Teensy EEPROM implementations
-        OPT_DEFS += -DEEPROM_TEENSY
-        SRC += eeprom_teensy.c
+        OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
+        SRC += eeprom_kinetis_flexram.c
       else
         # Fall back to transient, i.e. non-persistent
         OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
@@ -274,7 +287,7 @@ ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
       POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_PATH)/wear_leveling/wear_leveling_rp2040_flash_config.h
     else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), legacy)
       COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
-      SRC += flash_stm32.c wear_leveling_legacy.c
+      SRC += legacy_flash_ops.c wear_leveling_legacy.c
       POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_legacy_config.h
     endif
   endif
@@ -512,12 +525,6 @@ ifeq ($(strip $(RGB_KEYCODES_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/process_keycode/process_rgb.c
 endif
 
-ifeq ($(strip $(PRINTING_ENABLE)), yes)
-    OPT_DEFS += -DPRINTING_ENABLE
-    SRC += $(QUANTUM_DIR)/process_keycode/process_printer.c
-    QUANTUM_LIB_SRC += uart.c
-endif
-
 VARIABLE_TRACE ?= no
 ifneq ($(strip $(VARIABLE_TRACE)),no)
     SRC += $(QUANTUM_DIR)/variable_trace.c
@@ -537,11 +544,7 @@ endif
 VALID_BACKLIGHT_TYPES := pwm timer software custom
 
 BACKLIGHT_ENABLE ?= no
-ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
-    BACKLIGHT_DRIVER ?= software
-else
-    BACKLIGHT_DRIVER ?= pwm
-endif
+BACKLIGHT_DRIVER ?= pwm
 ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
     ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid BACKLIGHT_DRIVER,BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
@@ -773,8 +776,10 @@ endif
 
 ifeq ($(strip $(UNICODE_COMMON)), yes)
     OPT_DEFS += -DUNICODE_COMMON_ENABLE
+    COMMON_VPATH += $(QUANTUM_DIR)/unicode
     SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c \
-           $(QUANTUM_DIR)/utf8.c
+           $(QUANTUM_DIR)/unicode/unicode.c \
+           $(QUANTUM_DIR)/unicode/utf8.c
 endif
 
 MAGIC_ENABLE ?= yes
@@ -805,31 +810,25 @@ ifeq ($(strip $(PS2_MOUSE_ENABLE)), yes)
     OPT_DEFS += -DMOUSE_ENABLE
 endif
 
-ifeq ($(strip $(PS2_USE_BUSYWAIT)), yes)
-    PS2_ENABLE := yes
-    SRC += ps2_busywait.c
-    SRC += ps2_io.c
-    OPT_DEFS += -DPS2_USE_BUSYWAIT
-endif
-
-ifeq ($(strip $(PS2_USE_INT)), yes)
-    PS2_ENABLE := yes
-    SRC += ps2_interrupt.c
-    SRC += ps2_io.c
-    OPT_DEFS += -DPS2_USE_INT
-endif
-
-ifeq ($(strip $(PS2_USE_USART)), yes)
-    PS2_ENABLE := yes
-    SRC += ps2_usart.c
-    SRC += ps2_io.c
-    OPT_DEFS += -DPS2_USE_USART
-endif
+VALID_PS2_DRIVER_TYPES := busywait interrupt usart vendor
 
+PS2_DRIVER ?= busywait
 ifeq ($(strip $(PS2_ENABLE)), yes)
+    ifeq ($(filter $(PS2_DRIVER),$(VALID_PS2_DRIVER_TYPES)),)
+        $(call CATASTROPHIC_ERROR,Invalid PS2_DRIVER,PS2_DRIVER="$(PS2_DRIVER)" is not a valid PS/2 driver)
+    endif
+
+    OPT_DEFS += -DPS2_DRIVER_$(strip $(shell echo $(PS2_DRIVER) | tr '[:lower:]' '[:upper:]'))
+
     COMMON_VPATH += $(DRIVER_PATH)/ps2
     COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/ps2
     OPT_DEFS += -DPS2_ENABLE
+
+    ifneq ($(strip $(PS2_DRIVER)), vendor)
+        SRC += ps2_io.c
+    endif
+
+    SRC += ps2_$(strip $(PS2_DRIVER)).c
 endif
 
 JOYSTICK_ENABLE ?= no
@@ -885,17 +884,17 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     OPT_DEFS += -DBLUETOOTH_ENABLE
     NO_USB_STARTUP_CHECK := yes
     COMMON_VPATH += $(DRIVER_PATH)/bluetooth
-    SRC += outputselect.c
+    SRC += outputselect.c bluetooth.c
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), BluefruitLE)
-        OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE
-        SRC += analog.c
+        OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE -DHAL_USE_SPI=TRUE
         SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp
+        QUANTUM_LIB_SRC += analog.c
         QUANTUM_LIB_SRC += spi_master.c
     endif
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), RN42)
-        OPT_DEFS += -DBLUETOOTH_RN42
+        OPT_DEFS += -DBLUETOOTH_RN42 -DHAL_USE_SERIAL=TRUE
         SRC += $(DRIVER_PATH)/bluetooth/rn42.c
         QUANTUM_LIB_SRC += uart.c
     endif

builddefs/common_rules.mk

@@ -1,7 +1,7 @@
 # Hey Emacs, this is a -*- makefile -*-
 #----------------------------------------------------------------------------
 
-# Enable vpath seraching for source files only
+# Enable vpath searching for source files only
 # Without this, output files, could be read from the wrong .build directories
 VPATH_SRC := $(VPATH)
 vpath %.c $(VPATH_SRC)
@@ -85,7 +85,7 @@ ifeq ($(strip $(DEBUG_ENABLE)),yes)
 endif
 CXXFLAGS += $(CXXDEFS)
 CXXFLAGS += -O$(OPT)
-# to supress "warning: only initialized variables can be placed into program memory area"
+# to suppress "warning: only initialized variables can be placed into program memory area"
 CXXFLAGS += -w
 CXXFLAGS += -Wall
 CXXFLAGS += -Wundef
@@ -332,6 +332,7 @@ $1/asflags.txt: $1/force
 	echo '$$($1_ASFLAGS)' | cmp -s - $$@ || echo '$$($1_ASFLAGS)' > $$@
 
 $1/compiler.txt: $1/force
+	test -f $$@ || touch $$@
 	$$(CC) --version | cmp -s - $$@ || $$(CC) --version > $$@
 endef
 

builddefs/converters.mk

@@ -29,6 +29,7 @@ ifneq ($(CONVERT_TO),)
 
     # Configure any defaults
     OPT_DEFS += -DCONVERT_TO_$(strip $(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]'))
+    OPT_DEFS += -DCONVERTER_TARGET=\"$(strip $(CONVERT_TO))\"
     OPT_DEFS += -DCONVERTER_ENABLED
     VPATH += $(CONVERTER)
 

builddefs/disable_features.mk

@@ -14,7 +14,6 @@ FEATURE_NAMES += LCD_BACKLIGHT
 FEATURE_NAMES += LCD
 FEATURE_NAMES += OLED
 FEATURE_NAMES += POINTING_DEVICE
-FEATURE_NAMES += PRINTING
 FEATURE_NAMES += PS2_MOUSE
 FEATURE_NAMES += RGBLIGHT
 FEATURE_NAMES += RGB_MATRIX

builddefs/generic_features.mk

@@ -17,6 +17,7 @@ SPACE_CADET_ENABLE ?= yes
 GRAVE_ESC_ENABLE ?= yes
 
 GENERIC_FEATURES = \
+    AUTOCORRECT \
     CAPS_WORD \
     COMBO \
     COMMAND \

builddefs/mcu_selection.mk

@@ -348,8 +348,6 @@ ifneq ($(findstring STM32F401, $(MCU)),)
   #   or <keyboard_dir>/ld/
   ifeq ($(strip $(BOOTLOADER)), tinyuf2)
     MCU_LDSCRIPT ?= STM32F401xC_tinyuf2
-    EEPROM_DRIVER ?= wear_leveling
-    WEAR_LEVELING_DRIVER ?= legacy
   else
     MCU_LDSCRIPT ?= STM32F401xC
   endif
@@ -465,8 +463,6 @@ ifneq ($(findstring STM32F411, $(MCU)),)
   #   or <keyboard_dir>/ld/
   ifeq ($(strip $(BOOTLOADER)), tinyuf2)
     MCU_LDSCRIPT ?= STM32F411xE_tinyuf2
-    EEPROM_DRIVER ?= wear_leveling
-    WEAR_LEVELING_DRIVER ?= legacy
   else
     MCU_LDSCRIPT ?= STM32F411xE
   endif
@@ -520,6 +516,9 @@ ifneq ($(findstring STM32F446, $(MCU)),)
 
   # Bootloader address for STM32 DFU
   STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
+
+  # Default as no chibios efl config
+  EEPROM_DRIVER ?= transient
 endif
 
 ifneq ($(findstring STM32G431, $(MCU)),)

builddefs/show_options.mk

@@ -43,7 +43,6 @@ OTHER_OPTION_NAMES = \
   KEY_LOCK_ENABLE \
   KEY_OVERRIDE_ENABLE \
   LEADER_ENABLE \
-  PRINTING_ENABLE \
   STENO_ENABLE \
   STENO_PROTOCOL \
   TAP_DANCE_ENABLE \
@@ -66,7 +65,9 @@ OTHER_OPTION_NAMES = \
   KEYLOGGER_ENABLE \
   LCD_BACKLIGHT_ENABLE \
   MACROS_ENABLED \
+  PS2_ENABLE \
   PS2_MOUSE_ENABLE \
+  PS2_DRIVER \
   RAW_ENABLE \
   SWAP_HANDS_ENABLE \
   RING_BUFFERED_6KRO_REPORT_ENABLE \
@@ -82,7 +83,8 @@ OTHER_OPTION_NAMES = \
   LTO_ENABLE \
   PROGRAMMABLE_BUTTON_ENABLE \
   SECURE_ENABLE \
-  CAPS_WORD_ENABLE
+  CAPS_WORD_ENABLE \
+  AUTOCORRECT_ENABLE
 
 define NAME_ECHO
        @printf "  %-30s = %-16s # %s\\n" "$1" "$($1)" "$(origin $1)"

data/constants/keycodes/keycodes_0.0.1.hjson

@@ -0,0 +1,96 @@
+{
+    "ranges": {
+        "0x0000/0x00FF": {
+            "define": "QK_BASIC"
+        },
+        "0x0100/0x1EFF": {
+            "define": "QK_MODS"
+        },
+        "0x2000/0x1FFF": {
+            "define": "QK_MOD_TAP"
+        },
+        "0x4000/0x0FFF": {
+            "define": "QK_LAYER_TAP"
+        },
+        "0x5000/0x01FF": {
+            "define": "QK_LAYER_MOD"
+        },
+        "0x5200/0x001F": {
+            "define": "QK_TO"
+        },
+        "0x5220/0x001F": {
+            "define": "QK_MOMENTARY"
+        },
+        "0x5240/0x001F": {
+            "define": "QK_DEF_LAYER"
+        },
+        "0x5260/0x001F": {
+            "define": "QK_TOGGLE_LAYER"
+        },
+        "0x5280/0x001F": {
+            "define": "QK_ONE_SHOT_LAYER"
+        },
+        "0x52A0/0x001F": {
+            "define": "QK_ONE_SHOT_MOD"
+        },
+        "0x52C0/0x001F": {
+            "define": "QK_LAYER_TAP_TOGGLE"
+        },
+        // 0x52E0/0x001F - UNUSED
+        // 0x5300/0x02FF - UNUSED
+        "0x5600/0x00FF": {
+            "define": "QK_SWAP_HANDS"
+        },
+        "0x5700/0x00FF": {
+            "define": "QK_TAP_DANCE"
+        },
+        // 0x5800/0x17FF - UNUSED
+        "0x7000/0x00FF": {
+            "define": "QK_MAGIC"
+        },
+        "0x7100/0x00FF": {
+            "define": "QK_MIDI"
+        },
+        "0x7200/0x01FF": {
+            "define": "QK_SEQUENCER"
+        },
+        "0x7400/0x003F": {
+            "define": "QK_JOYSTICK"
+        },
+        "0x7440/0x003F": {
+            "define": "QK_PROGRAMMABLE_BUTTON"
+        },
+        "0x7480/0x003F": {
+            "define": "QK_AUDIO"
+        },
+        "0x74C0/0x003F": {
+            "define": "QK_STENO"
+        },
+        // 0x7500/0x01FF - UNUSED
+        "0x7700/0x007F": {
+            "define": "QK_MACRO"
+        },
+        // 0x7780/0x007F - UNUSED
+        "0x7800/0x00FF": {
+            "define": "QK_LIGHTING"
+        },
+        // 0x7900/0x02FF - UNUSED
+        "0x7C00/0x01FF": {
+            "define": "QK_QUANTUM"
+        },
+        "0x7E00/0x00FF": {
+            "define": "QK_KB"
+        },
+        "0x7F00/0x00FF": {
+            "define": "QK_USER"
+        },
+        "0x8000/0x7FFF": {
+            "define": "QK_UNICODE"
+        }
+    },
+    "keycodes": {
+        "0x7E00": {
+            "key": "SAFE_RANGE"
+        }
+    }
+}

data/constants/keycodes/keycodes_0.0.1_audio.hjson

@@ -0,0 +1,112 @@
+{
+    "keycodes": {
+        "0x7480": {
+            "group": "audio",
+            "key": "QK_AUDIO_ON",
+            "aliases": [
+                "AU_ON"
+            ]
+        },
+        "0x7481": {
+            "group": "audio",
+            "key": "QK_AUDIO_OFF",
+            "aliases": [
+                "AU_OFF"
+            ]
+        },
+        "0x7482": {
+            "group": "audio",
+            "key": "QK_AUDIO_TOGGLE",
+            "aliases": [
+                "AU_TOGG"
+            ]
+        },
+
+        "0x748A": {
+            "group": "audio",
+            "key": "QK_AUDIO_CLICKY_TOGGLE",
+            "aliases": [
+                "CK_TOGG"
+            ]
+        },
+        "0x748B": {
+            "group": "audio",
+            "key": "QK_AUDIO_CLICKY_ON",
+            "aliases": [
+                "CK_ON"
+            ]
+        },
+        "0x748C": {
+            "group": "audio",
+            "key": "QK_AUDIO_CLICKY_OFF",
+            "aliases": [
+                "CK_OFF"
+            ]
+        },
+        "0x748D": {
+            "group": "audio",
+            "key": "QK_AUDIO_CLICKY_UP",
+            "aliases": [
+                "CK_UP"
+            ]
+        },
+        "0x748E": {
+            "group": "audio",
+            "key": "QK_AUDIO_CLICKY_DOWN",
+            "aliases": [
+                "CK_DOWN"
+            ]
+        },
+        "0x748F": {
+            "group": "audio",
+            "key": "QK_AUDIO_CLICKY_RESET",
+            "aliases": [
+                "CK_RST"
+            ]
+        },
+
+        "0x7490": {
+            "group": "audio",
+            "key": "QK_MUSIC_ON",
+            "aliases": [
+                "MU_ON"
+            ]
+        },
+        "0x7491": {
+            "group": "audio",
+            "key": "QK_MUSIC_OFF",
+            "aliases": [
+                "MU_OFF"
+            ]
+        },
+        "0x7492": {
+            "group": "audio",
+            "key": "QK_MUSIC_TOGGLE",
+            "aliases": [
+                "MU_TOGG"
+            ]
+        },
+        "0x7493": {
+            "group": "audio",
+            "key": "QK_MUSIC_MODE_NEXT",
+            "aliases": [
+                "MU_NEXT"
+            ]
+        },
+
+        "0x7494": {
+            "group": "audio",
+            "key": "QK_AUDIO_VOICE_NEXT",
+            "aliases": [
+                "AU_NEXT"
+            ]
+        },
+        "0x7495": {
+            "group": "audio",
+            "key": "QK_AUDIO_VOICE_PREVIOUS",
+            "aliases": [
+                "AU_PREV"
+            ]
+        }
+    }
+}

data/constants/keycodes/keycodes_0.0.1_joystick.hjson

@@ -0,0 +1,228 @@
+{
+    "keycodes": {
+        "0x7400": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_0",
+            "aliases": [
+                "JS_0"
+            ]
+        },
+        "0x7401": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_1",
+            "aliases": [
+                "JS_1"
+            ]
+        },
+        "0x7402": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_2",
+            "aliases": [
+                "JS_2"
+            ]
+        },
+        "0x7403": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_3",
+            "aliases": [
+                "JS_3"
+            ]
+        },
+        "0x7404": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_4",
+            "aliases": [
+                "JS_4"
+            ]
+        },
+        "0x7405": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_5",
+            "aliases": [
+                "JS_5"
+            ]
+        },
+        "0x7406": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_6",
+            "aliases": [
+                "JS_6"
+            ]
+        },
+        "0x7407": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_7",
+            "aliases": [
+                "JS_7"
+            ]
+        },
+        "0x7408": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_8",
+            "aliases": [
+                "JS_8"
+            ]
+        },
+        "0x7409": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_9",
+            "aliases": [
+                "JS_9"
+            ]
+        },
+        "0x740A": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_10",
+            "aliases": [
+                "JS_10"
+            ]
+        },
+        "0x740B": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_11",
+            "aliases": [
+                "JS_11"
+            ]
+        },
+        "0x740C": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_12",
+            "aliases": [
+                "JS_12"
+            ]
+        },
+        "0x740D": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_13",
+            "aliases": [
+                "JS_13"
+            ]
+        },
+        "0x740E": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_14",
+            "aliases": [
+                "JS_14"
+            ]
+        },
+        "0x740F": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_15",
+            "aliases": [
+                "JS_15"
+            ]
+        },
+        "0x7410": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_16",
+            "aliases": [
+                "JS_16"
+            ]
+        },
+        "0x7411": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_17",
+            "aliases": [
+                "JS_17"
+            ]
+        },
+        "0x7412": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_18",
+            "aliases": [
+                "JS_18"
+            ]
+        },
+        "0x7413": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_19",
+            "aliases": [
+                "JS_19"
+            ]
+        },
+        "0x7414": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_20",
+            "aliases": [
+                "JS_20"
+            ]
+        },
+        "0x7415": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_21",
+            "aliases": [
+                "JS_21"
+            ]
+        },
+        "0x7416": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_22",
+            "aliases": [
+                "JS_22"
+            ]
+        },
+        "0x7417": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_23",
+            "aliases": [
+                "JS_23"
+            ]
+        },
+        "0x7418": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_24",
+            "aliases": [
+                "JS_24"
+            ]
+        },
+        "0x7419": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_25",
+            "aliases": [
+                "JS_25"
+            ]
+        },
+        "0x741A": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_26",
+            "aliases": [
+                "JS_26"
+            ]
+        },
+        "0x741B": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_27",
+            "aliases": [
+                "JS_27"
+            ]
+        },
+        "0x741C": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_28",
+            "aliases": [
+                "JS_28"
+            ]
+        },
+        "0x741D": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_29",
+            "aliases": [
+                "JS_29"
+            ]
+        },
+        "0x741E": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_30",
+            "aliases": [
+                "JS_30"
+            ]
+        },
+        "0x741F": {
+            "group": "joystick",
+            "key": "QK_JOYSTICK_BUTTON_31",
+            "aliases": [
+                "JS_31"
+            ]
+        }
+    }
+}

data/constants/keycodes/keycodes_0.0.1_lighting.hjson

@@ -0,0 +1,175 @@
+{
+    "keycodes": {
+        "0x7800": {
+            "group": "backlight",
+            "key": "QK_BACKLIGHT_ON",
+            "aliases": [
+                "BL_ON"
+            ]
+        },
+        "0x7801": {
+            "group": "backlight",
+            "key": "QK_BACKLIGHT_OFF",
+            "aliases": [
+                "BL_OFF"
+            ]
+        },
+        "0x7802": {
+            "group": "backlight",
+            "key": "QK_BACKLIGHT_TOGGLE",
+            "aliases": [
+                "BL_TOGG"
+            ]
+        },
+        "0x7803": {
+            "group": "backlight",
+            "key": "QK_BACKLIGHT_DOWN",
+            "aliases": [
+                "BL_DOWN"
+            ]
+        },
+        "0x7804": {
+            "group": "backlight",
+            "key": "QK_BACKLIGHT_UP",
+            "aliases": [
+                "BL_UP"
+            ]
+        },
+        "0x7805": {
+            "group": "backlight",
+            "key": "QK_BACKLIGHT_STEP",
+            "aliases": [
+                "BL_STEP"
+            ]
+        },
+        "0x7806": {
+            "group": "backlight",
+            "key": "QK_BACKLIGHT_TOGGLE_BREATHING",
+            "aliases": [
+                "BL_BRTG"
+            ]
+        },
+
+        "0x7820": {
+            "group": "rgb",
+            "key": "RGB_TOG"
+        },
+        "0x7821": {
+            "group": "rgb",
+            "key": "RGB_MODE_FORWARD",
+            "aliases": [
+                "RGB_MOD"
+            ]
+        },
+        "0x7822": {
+            "group": "rgb",
+            "key": "RGB_MODE_REVERSE",
+            "aliases": [
+                "RGB_RMOD"
+            ]
+        },
+        "0x7823": {
+            "group": "rgb",
+            "key": "RGB_HUI"
+        },
+        "0x7824": {
+            "group": "rgb",
+            "key": "RGB_HUD"
+        },
+        "0x7825": {
+            "group": "rgb",
+            "key": "RGB_SAI"
+        },
+        "0x7826": {
+            "group": "rgb",
+            "key": "RGB_SAD"
+        },
+        "0x7827": {
+            "group": "rgb",
+            "key": "RGB_VAI"
+        },
+        "0x7828": {
+            "group": "rgb",
+            "key": "RGB_VAD"
+        },
+        "0x7829": {
+            "group": "rgb",
+            "key": "RGB_SPI"
+        },
+        "0x782A": {
+            "group": "rgb",
+            "key": "RGB_SPD"
+        },
+
+        "0x782B": {
+            "group": "rgb",
+            "key": "RGB_MODE_PLAIN",
+            "aliases": [
+                "RGB_M_P"
+            ]
+        },
+        "0x782C": {
+            "group": "rgb",
+            "key": "RGB_MODE_BREATHE",
+            "aliases": [
+                "RGB_M_B"
+            ]
+        },
+        "0x782D": {
+            "group": "rgb",
+            "key": "RGB_MODE_RAINBOW",
+            "aliases": [
+                "RGB_M_R"
+            ]
+        },
+        "0x782E": {
+            "group": "rgb",
+            "key": "RGB_MODE_SWIRL",
+            "aliases": [
+                "RGB_M_SW"
+            ]
+        },
+        "0x782F": {
+            "group": "rgb",
+            "key": "RGB_MODE_SNAKE",
+            "aliases": [
+                "RGB_M_SN"
+            ]
+        },
+        "0x7830": {
+            "group": "rgb",
+            "key": "RGB_MODE_KNIGHT",
+            "aliases": [
+                "RGB_M_K"
+            ]
+        },
+        "0x7831": {
+            "group": "rgb",
+            "key": "RGB_MODE_XMAS",
+            "aliases": [
+                "RGB_M_X"
+            ]
+        },
+        "0x7832": {
+            "group": "rgb",
+            "key": "RGB_MODE_GRADIENT",
+            "aliases": [
+                "RGB_M_G"
+            ]
+        },
+        "0x7833": {
+            "group": "rgb",
+            "key": "RGB_MODE_RGBTEST",
+            "aliases": [
+                "RGB_M_T"
+            ]
+        },
+        "0x7834": {
+            "group": "rgb",
+            "key": "RGB_MODE_TWINKLE",
+            "aliases": [
+                "RGB_M_TW"
+            ]
+        }
+    }
+}

data/constants/keycodes/keycodes_0.0.1_macro.hjson

@@ -0,0 +1,229 @@
+{
+    "keycodes": {
+
+        "0x7700": {
+            "group": "macro",
+            "key": "QK_MACRO_0",
+            "aliases": [
+                "MC_0"
+            ]
+        },
+        "0x7701": {
+            "group": "macro",
+            "key": "QK_MACRO_1",
+            "aliases": [
+                "MC_1"
+            ]
+        },
+        "0x7702": {
+            "group": "macro",
+            "key": "QK_MACRO_2",
+            "aliases": [
+                "MC_2"
+            ]
+        },
+        "0x7703": {
+            "group": "macro",
+            "key": "QK_MACRO_3",
+            "aliases": [
+                "MC_3"
+            ]
+        },
+        "0x7704": {
+            "group": "macro",
+            "key": "QK_MACRO_4",
+            "aliases": [
+                "MC_4"
+            ]
+        },
+        "0x7705": {
+            "group": "macro",
+            "key": "QK_MACRO_5",
+            "aliases": [
+                "MC_5"
+            ]
+        },
+        "0x7706": {
+            "group": "macro",
+            "key": "QK_MACRO_6",
+            "aliases": [
+                "MC_6"
+            ]
+        },
+        "0x7707": {
+            "group": "macro",
+            "key": "QK_MACRO_7",
+            "aliases": [
+                "MC_7"
+            ]
+        },
+        "0x7708": {
+            "group": "macro",
+            "key": "QK_MACRO_8",
+            "aliases": [
+                "MC_8"
+            ]
+        },
+        "0x7709": {
+            "group": "macro",
+            "key": "QK_MACRO_9",
+            "aliases": [
+                "MC_9"
+            ]
+        },
+        "0x770A": {
+            "group": "macro",
+            "key": "QK_MACRO_10",
+            "aliases": [
+                "MC_10"
+            ]
+        },
+        "0x770B": {
+            "group": "macro",
+            "key": "QK_MACRO_11",
+            "aliases": [
+                "MC_11"
+            ]
+        },
+        "0x770C": {
+            "group": "macro",
+            "key": "QK_MACRO_12",
+            "aliases": [
+                "MC_12"
+            ]
+        },
+        "0x770D": {
+            "group": "macro",
+            "key": "QK_MACRO_13",
+            "aliases": [
+                "MC_13"
+            ]
+        },
+        "0x770E": {
+            "group": "macro",
+            "key": "QK_MACRO_14",
+            "aliases": [
+                "MC_14"
+            ]
+        },
+        "0x770F": {
+            "group": "macro",
+            "key": "QK_MACRO_15",
+            "aliases": [
+                "MC_15"
+            ]
+        },
+        "0x7710": {
+            "group": "macro",
+            "key": "QK_MACRO_16",
+            "aliases": [
+                "MC_16"
+            ]
+        },
+        "0x7711": {
+            "group": "macro",
+            "key": "QK_MACRO_17",
+            "aliases": [
+                "MC_17"
+            ]
+        },
+        "0x7712": {
+            "group": "macro",
+            "key": "QK_MACRO_18",
+            "aliases": [
+                "MC_18"
+            ]
+        },
+        "0x7713": {
+            "group": "macro",
+            "key": "QK_MACRO_19",
+            "aliases": [
+                "MC_19"
+            ]
+        },
+        "0x7714": {
+            "group": "macro",
+            "key": "QK_MACRO_20",
+            "aliases": [
+                "MC_20"
+            ]
+        },
+        "0x7715": {
+            "group": "macro",
+            "key": "QK_MACRO_21",
+            "aliases": [
+                "MC_21"
+            ]
+        },
+        "0x7716": {
+            "group": "macro",
+            "key": "QK_MACRO_22",
+            "aliases": [
+                "MC_22"
+            ]
+        },
+        "0x7717": {
+            "group": "macro",
+            "key": "QK_MACRO_23",
+            "aliases": [
+                "MC_23"
+            ]
+        },
+        "0x7718": {
+            "group": "macro",
+            "key": "QK_MACRO_24",
+            "aliases": [
+                "MC_24"
+            ]
+        },
+        "0x7719": {
+            "group": "macro",
+            "key": "QK_MACRO_25",
+            "aliases": [
+                "MC_25"
+            ]
+        },
+        "0x771A": {
+            "group": "macro",
+            "key": "QK_MACRO_26",
+            "aliases": [
+                "MC_26"
+            ]
+        },
+        "0x771B": {
+            "group": "macro",
+            "key": "QK_MACRO_27",
+            "aliases": [
+                "MC_27"
+            ]
+        },
+        "0x771C": {
+            "group": "macro",
+            "key": "QK_MACRO_28",
+            "aliases": [
+                "MC_28"
+            ]
+        },
+        "0x771D": {
+            "group": "macro",
+            "key": "QK_MACRO_29",
+            "aliases": [
+                "MC_29"
+            ]
+        },
+        "0x771E": {
+            "group": "macro",
+            "key": "QK_MACRO_30",
+            "aliases": [
+                "MC_30"
+            ]
+        },
+        "0x771F": {
+            "group": "macro",
+            "key": "QK_MACRO_31",
+            "aliases": [
+                "MC_31"
+            ]
+        }
+    }
+}

data/constants/keycodes/keycodes_0.0.1_magic.hjson

@@ -0,0 +1,249 @@
+{
+    "keycodes": {
+        "0x7000": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_CONTROL_CAPSLOCK",
+            "aliases": [
+                "CL_SWAP"
+            ]
+        },
+        "0x7001": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_CONTROL_CAPSLOCK",
+            "aliases": [
+                "CL_NORM"
+            ]
+        },
+        "0x7002": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_CONTROL_CAPSLOCK",
+            "aliases": [
+                "CL_TOGG"
+            ]
+        },
+        "0x7003": {
+            "group": "magic",
+            "key": "MAGIC_UNCAPSLOCK_TO_CONTROL",
+            "aliases": [
+                "CL_CAPS"
+            ]
+        },
+        "0x7004": {
+            "group": "magic",
+            "key": "MAGIC_CAPSLOCK_TO_CONTROL",
+            "aliases": [
+                "CL_CTRL"
+            ]
+        },
+        "0x7005": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_LALT_LGUI",
+            "aliases": [
+                "LAG_SWP"
+            ]
+        },
+        "0x7006": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_LALT_LGUI",
+            "aliases": [
+                "LAG_NRM"
+            ]
+        },
+        "0x7007": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_RALT_RGUI",
+            "aliases": [
+                "RAG_SWP"
+            ]
+        },
+        "0x7008": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_RALT_RGUI",
+            "aliases": [
+                "RAG_NRM"
+            ]
+        },
+        "0x7009": {
+            "group": "magic",
+            "key": "MAGIC_UNNO_GUI",
+            "aliases": [
+                "GUI_ON"
+            ]
+        },
+        "0x700A": {
+            "group": "magic",
+            "key": "MAGIC_NO_GUI",
+            "aliases": [
+                "GUI_OFF"
+            ]
+        },
+        "0x700B": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_GUI",
+            "aliases": [
+                "GUI_TOG"
+            ]
+        },
+        "0x700C": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_GRAVE_ESC",
+            "aliases": [
+                "GE_SWAP"
+            ]
+        },
+        "0x700D": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_GRAVE_ESC",
+            "aliases": [
+                "GE_NORM"
+            ]
+        },
+        "0x700E": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_BACKSLASH_BACKSPACE",
+            "aliases": [
+                "BS_SWAP"
+            ]
+        },
+        "0x700F": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_BACKSLASH_BACKSPACE",
+            "aliases": [
+                "BS_NORM"
+            ]
+        },
+        "0x7010": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_BACKSLASH_BACKSPACE",
+            "aliases": [
+                "BS_TOGG"
+            ]
+        },
+        "0x7011": {
+            "group": "magic",
+            "key": "MAGIC_HOST_NKRO",
+            "aliases": [
+                "NK_ON"
+            ]
+        },
+        "0x7012": {
+            "group": "magic",
+            "key": "MAGIC_UNHOST_NKRO",
+            "aliases": [
+                "NK_OFF"
+            ]
+        },
+        "0x7013": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_NKRO",
+            "aliases": [
+                "NK_TOGG"
+            ]
+        },
+        "0x7014": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_ALT_GUI",
+            "aliases": [
+                "AG_SWAP"
+            ]
+        },
+        "0x7015": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_ALT_GUI",
+            "aliases": [
+                "AG_NORM"
+            ]
+        },
+        "0x7016": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_ALT_GUI",
+            "aliases": [
+                "AG_TOGG"
+            ]
+        },
+        "0x7017": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_LCTL_LGUI",
+            "aliases": [
+                "LCG_SWP"
+            ]
+        },
+        "0x7018": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_LCTL_LGUI",
+            "aliases": [
+                "LCG_NRM"
+            ]
+        },
+        "0x7019": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_RCTL_RGUI",
+            "aliases": [
+                "RCG_SWP"
+            ]
+        },
+        "0x701A": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_RCTL_RGUI",
+            "aliases": [
+                "RCG_NRM"
+            ]
+        },
+        "0x701B": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_CTL_GUI",
+            "aliases": [
+                "CG_SWAP"
+            ]
+        },
+        "0x701C": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_CTL_GUI",
+            "aliases": [
+                "CG_NORM"
+            ]
+        },
+        "0x701D": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_CTL_GUI",
+            "aliases": [
+                "CG_TOGG"
+            ]
+        },
+        "0x701E": {
+            "group": "magic",
+            "key": "MAGIC_EE_HANDS_LEFT",
+            "aliases": [
+                "EH_LEFT"
+            ]
+        },
+        "0x701F": {
+            "group": "magic",
+            "key": "MAGIC_EE_HANDS_RIGHT",
+            "aliases": [
+                "EH_RGHT"
+            ]
+        },
+        "0x7020": {
+            "group": "magic",
+            "key": "MAGIC_SWAP_ESCAPE_CAPSLOCK",
+            "aliases": [
+                "EC_SWAP"
+            ]
+        },
+        "0x7021": {
+            "group": "magic",
+            "key": "MAGIC_UNSWAP_ESCAPE_CAPSLOCK",
+            "aliases": [
+                "EC_NORM"
+            ]
+        },
+        "0x7022": {
+            "group": "magic",
+            "key": "MAGIC_TOGGLE_ESCAPE_CAPSLOCK",
+            "aliases": [
+                "EC_TOGG"
+            ]
+        }
+    }
+}