.clangd

@@ -1,33 +1,4 @@
 CompileFlags:
-    Add:
+  Add: [-Wno-unknown-attributes, -Wno-maybe-uninitialized, -Wno-unknown-warning-option]
-        [
+  Remove: [-W*, -mmcu=*, -mcpu=*, -mfpu=*, -mfloat-abi=*, -mno-unaligned-access, -mno-thumb-interwork, -mcall-prologues]
-            -Wno-unknown-attributes,
+  Compiler: clang
-            -Wno-maybe-uninitialized,
-            -Wno-unknown-warning-option,
-            -Wno-pointer-to-int-cast,
-            -Wno-int-to-void-pointer-cast,
-            -DPROGMEM=,
-        ]
-    Remove:
-        [
-            -W*,
-            -mmcu=*,
-            -mcpu=*,
-            -mfpu=*,
-            -mfloat-abi=*,
-            -mno-unaligned-access,
-            -mno-thumb-interwork,
-            -mcall-prologues,
-            -D__has_include*,
-            -mlra,
-        ]
-    Compiler: clang
-Diagnostics:
-    UnusedIncludes: None
-    Suppress:
-        [
-            asm_invalid_output_constraint,
-            asm_invalid_input_constraint,
-            invalid_asm_value_for_constraint,
-            anyx86_interrupt_attribute,
-        ]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -38,4 +38,4 @@ body:
   - type: textarea
     attributes:
       label: Additional Context
-      description: Add any other relevant information about the problem here.
+      description: Add any other relevant information about the problem here.

.github/labeler.yml

@@ -54,7 +54,3 @@ dd:
       - data/constants/**
       - data/mappings/**
       - data/schemas/**
-community_module:
-  - changed-files:
-    - any-glob-to-any-file:
-      - modules/**

.github/workflows/auto_tag.yml

@@ -15,7 +15,6 @@ on:
     - quantum/**/*
     - tests/**/*
     - tmk_core/**/*
-    - lib/python/**/*
     - util/**/*
     - Makefile
     - '*.mk'

.github/workflows/docs.yml

@@ -56,7 +56,7 @@ jobs:
 
     - name: Deploy
       if: ${{ github.event_name == 'push' && github.repository == 'qmk/qmk_firmware' }}
-      uses: JamesIves/github-pages-deploy-action@v4.7.3
+      uses: JamesIves/github-pages-deploy-action@v4.6.9
       with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages

.github/workflows/format.yml

@@ -10,7 +10,6 @@ on:
     - 'lib/arm_atsam/**'
     - 'lib/lib8tion/**'
     - 'lib/python/**'
-    - 'modules/**'
     - 'platforms/**'
     - 'quantum/**'
     - 'tests/**'
@@ -36,7 +35,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v46
+      uses: tj-actions/changed-files@v45
       with:
         use_rest_api: true
 

.github/workflows/format_push.yml

@@ -39,7 +39,7 @@ jobs:
         qmk format-text -a
         git diff
 
-    - uses: rlespinasse/github-slug-action@v5
+    - uses: rlespinasse/github-slug-action@v3.x
 
     - name: Become QMK Bot
       run: |

.github/workflows/lint.yml

@@ -27,7 +27,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v46
+      uses: tj-actions/changed-files@v45
       with:
         use_rest_api: true
 

.github/workflows/regen_push.yml

@@ -26,7 +26,7 @@ jobs:
         util/regen.sh
         git diff
 
-    - uses: rlespinasse/github-slug-action@v5
+    - uses: rlespinasse/github-slug-action@v3.x
 
     - name: Become QMK Bot
       run: |

.github/workflows/stale.yml

@@ -45,7 +45,7 @@ jobs:
           stale-pr-label: stale
           days-before-pr-stale: 45
           days-before-pr-close: 30
-          exempt-pr-labels: bug,awaiting review,breaking_change,in progress,on hold,needs-core-wireless,crippled-firmware
+          exempt-pr-labels: bug,awaiting review,breaking_change,in progress,on hold
 
           stale-pr-message: >
             Thank you for your contribution!

.gitignore

@@ -64,7 +64,6 @@ build/
 cmake-build-debug
 CMakeLists.txt
 *.pdf
-*.zip
 
 # Let these ones be user specific, since we have so many different configurations
 *.code-workspace

.vscode/settings.json

@@ -10,13 +10,6 @@
         "**/*.uf2": true
     },
     "files.associations": {
-        // QMK Filetypes
-        "keyboard.json": "jsonc",
-        "info.json": "jsonc",
-        "keymap.json": "jsonc",
-        "qmk.json": "jsonc",
-        "qmk_module.json": "jsonc",
-        // Standard filetypes
         "*.h": "c",
         "*.c": "c",
         "*.inc": "c",
@@ -35,23 +28,7 @@
     "[json]": {
         "editor.formatOnSave": false
     },
-    "clangd.arguments": ["--header-insertion=never"],
+    "clangd.arguments": [
-    "json.schemas": [
+        "--header-insertion=never"
-        {
-            "fileMatch": ["qmk.json"],
-            "url": "./data/schemas/user_repo_v1_1.jsonschema"
-        },
-        {
-            "fileMatch": ["qmk_module.json"],
-            "url": "./data/schemas/community_module.jsonschema"
-        },
-        {
-            "fileMatch": ["keyboard.json", "info.json"],
-            "url": "./data/schemas/keyboard.jsonschema"
-        },
-        {
-            "fileMatch": ["keymap.json"],
-            "url": "./data/schemas/keymap.jsonschema"
-        }
     ]
 }

Makefile

@@ -59,7 +59,6 @@ ifeq ($(ROOT_DIR),)
 endif
 
 include paths.mk
-include $(BUILDDEFS_PATH)/support.mk
 
 TEST_OUTPUT_DIR := $(BUILD_DIR)/test
 ERROR_FILE := $(BUILD_DIR)/error_occurred
@@ -114,29 +113,6 @@ endef
 # Make it easier to call TRY_TO_MATCH_RULE_FROM_LIST
 TRY_TO_MATCH_RULE_FROM_LIST = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER,$1))$(RULE_FOUND)
 
-# As TRY_TO_MATCH_RULE_FROM_LIST_HELPER, but with additional
-# resolution of DEFAULT_FOLDER and keyboard_aliases.hjson for provided rule 
-define TRY_TO_MATCH_RULE_FROM_LIST_HELPER_KB
-    # Split on ":", padding with empty strings to avoid indexing issues
-    TOKEN1:=$$(shell python3 -c "import sys; print((sys.argv[1].split(':',1)+[''])[0])" $$(RULE))
-    TOKENr:=$$(shell python3 -c "import sys; print((sys.argv[1].split(':',1)+[''])[1])" $$(RULE))
-
-    TOKEN1:=$$(shell $(QMK_BIN) resolve-alias --allow-unknown $$(TOKEN1))
-
-    FOUNDx:=$$(shell echo $1 | tr " " "\n" | grep -Fx $$(TOKEN1))
-    ifneq ($$(FOUNDx),)
-        RULE := $$(TOKENr)
-        RULE_FOUND := true
-        MATCHED_ITEM := $$(TOKEN1)
-    else
-        RULE_FOUND := false
-        MATCHED_ITEM :=
-    endif
-endef
-
-# Make it easier to call TRY_TO_MATCH_RULE_FROM_LIST_KB
-TRY_TO_MATCH_RULE_FROM_LIST_KB = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER_KB,$1))$(RULE_FOUND)
-
 define ALL_IN_LIST_LOOP
     OLD_RULE$1 := $$(RULE)
     $$(eval $$(call $1,$$(ITEM$1)))
@@ -162,7 +138,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_KB,$$(shell $(QMK_BIN) list-keyboards)),true)
+    else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults)),true)
         KEYBOARD_RULE=$$(MATCHED_ITEM)
         $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
     else
@@ -194,6 +170,17 @@ define PARSE_KEYBOARD
     # include the correct makefile to determine the actual name of it
     CURRENT_KB := $1
 
+    # KEYBOARD_FOLDERS := $$(subst /, , $(CURRENT_KB))
+
+    DEFAULT_FOLDER := $$(CURRENT_KB)
+
+    # We assume that every rules.mk will contain the full default value
+    $$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/rules.mk)
+    ifneq ($$(DEFAULT_FOLDER),$$(CURRENT_KB))
+        $$(eval include $(ROOT_DIR)/keyboards/$$(DEFAULT_FOLDER)/rules.mk)
+    endif
+    CURRENT_KB := $$(DEFAULT_FOLDER)
+
     # 5/4/3/2/1
     KEYBOARD_FOLDER_PATH_1 := $$(CURRENT_KB)
     KEYBOARD_FOLDER_PATH_2 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_1)))

builddefs/build_full_test.mk

@@ -25,6 +25,8 @@ $(TEST_OUTPUT)_SRC := \
 	tests/test_common/test_driver.cpp \
 	tests/test_common/keyboard_report_util.cpp \
 	tests/test_common/mouse_report_util.cpp \
+	tests/test_common/keycode_util.cpp \
+	tests/test_common/keycode_table.cpp \
 	tests/test_common/test_fixture.cpp \
 	tests/test_common/test_keymap_key.cpp \
 	tests/test_common/test_logger.cpp \

builddefs/build_keyboard.mk

@@ -11,7 +11,6 @@ endif
 .DEFAULT_GOAL := all
 
 include paths.mk
-include $(BUILDDEFS_PATH)/support.mk
 include $(BUILDDEFS_PATH)/message.mk
 
 # Helper to add defines with a 'QMK_' prefix
@@ -98,44 +97,20 @@ endif
 
 
 # Pull in rules.mk files from all our subfolders
--include $(KEYBOARD_PATH_5)/rules.mk
+ifneq ("$(wildcard $(KEYBOARD_PATH_5)/rules.mk)","")
--include $(KEYBOARD_PATH_4)/rules.mk
+    include $(KEYBOARD_PATH_5)/rules.mk
--include $(KEYBOARD_PATH_3)/rules.mk
--include $(KEYBOARD_PATH_2)/rules.mk
--include $(KEYBOARD_PATH_1)/rules.mk
-
-# Create dependencies on DD keyboard config - structure validated elsewhere
-DD_CONFIG_FILES :=
-ifneq ("$(wildcard $(KEYBOARD_PATH_1)/info.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/info.json
 endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_2)/info.json)","")
+ifneq ("$(wildcard $(KEYBOARD_PATH_4)/rules.mk)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/info.json
+    include $(KEYBOARD_PATH_4)/rules.mk
 endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_3)/info.json)","")
+ifneq ("$(wildcard $(KEYBOARD_PATH_3)/rules.mk)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/info.json
+    include $(KEYBOARD_PATH_3)/rules.mk
 endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_4)/info.json)","")
+ifneq ("$(wildcard $(KEYBOARD_PATH_2)/rules.mk)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/info.json
+    include $(KEYBOARD_PATH_2)/rules.mk
 endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
+ifneq ("$(wildcard $(KEYBOARD_PATH_1)/rules.mk)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/info.json
+    include $(KEYBOARD_PATH_1)/rules.mk
-endif
-
-ifneq ("$(wildcard $(KEYBOARD_PATH_1)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_2)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_3)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_4)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_5)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/keyboard.json
 endif
 
 MAIN_KEYMAP_PATH_1 := $(KEYBOARD_PATH_1)/keymaps/$(KEYMAP)
@@ -222,27 +197,25 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")
     KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c
     KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h
 
-    ifeq ($(OTHER_KEYMAP_C),)
+    # Load the keymap-level rules.mk if exists
-        # Load the keymap-level rules.mk if exists (and we havent already loaded it for keymap.c)
+    -include $(KEYMAP_PATH)/rules.mk
-        -include $(KEYMAP_PATH)/rules.mk
-    endif
 
     # Load any rules.mk content from keymap.json
     INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
     include $(INFO_RULES_MK)
 
 # Add rules to generate the keymap files - indentation here is important
-$(INTERMEDIATE_OUTPUT)/src/keymap.c: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
+$(INTERMEDIATE_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
-$(INTERMEDIATE_OUTPUT)/src/config.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
+$(INTERMEDIATE_OUTPUT)/src/config.h: $(KEYMAP_JSON)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --output $(KEYMAP_H) $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
-$(INTERMEDIATE_OUTPUT)/src/keymap.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
+$(INTERMEDIATE_OUTPUT)/src/keymap.h: $(KEYMAP_JSON)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) generate-keymap-h --quiet --output $(INTERMEDIATE_OUTPUT)/src/keymap.h $(KEYMAP_JSON))
 	@$(BUILD_CMD)
@@ -251,44 +224,6 @@ generated-files: $(INTERMEDIATE_OUTPUT)/src/config.h $(INTERMEDIATE_OUTPUT)/src/
 
 endif
 
-# Community modules
-COMMUNITY_RULES_MK = $(shell $(QMK_BIN) generate-community-modules-rules-mk -kb $(KEYBOARD) --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/community_rules.mk $(KEYMAP_JSON))
-include $(COMMUNITY_RULES_MK)
-
-$(INTERMEDIATE_OUTPUT)/src/community_modules.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-community-modules-h -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/community_modules.h $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-$(INTERMEDIATE_OUTPUT)/src/community_modules.c: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-community-modules-c -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/community_modules.c $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-$(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.c: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-community-modules-introspection-c -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.c $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-$(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-community-modules-introspection-h -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.h $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-$(INTERMEDIATE_OUTPUT)/src/led_matrix_community_modules.inc: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-led-matrix-community-modules-inc -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/led_matrix_community_modules.inc $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-$(INTERMEDIATE_OUTPUT)/src/rgb_matrix_community_modules.inc: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-rgb-matrix-community-modules-inc -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/rgb_matrix_community_modules.inc $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-SRC += $(INTERMEDIATE_OUTPUT)/src/community_modules.c
-
-generated-files: $(INTERMEDIATE_OUTPUT)/src/community_modules.h $(INTERMEDIATE_OUTPUT)/src/community_modules.c $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.c $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.h $(INTERMEDIATE_OUTPUT)/src/led_matrix_community_modules.inc $(INTERMEDIATE_OUTPUT)/src/rgb_matrix_community_modules.inc
-
 include $(BUILDDEFS_PATH)/converters.mk
 
 # Generate the board's version.h file.
@@ -378,14 +313,6 @@ endif
 
 # Find all of the config.h files and add them to our CONFIG_H define.
 CONFIG_H :=
-
-define config_h_community_module_appender
-	ifneq ("$(wildcard $(1)/config.h)","")
-		CONFIG_H += $(1)/config.h
-	endif
-endef
-$(foreach module,$(COMMUNITY_MODULE_PATHS),$(eval $(call config_h_community_module_appender,$(module))))
-
 ifneq ("$(wildcard $(KEYBOARD_PATH_5)/config.h)","")
     CONFIG_H += $(KEYBOARD_PATH_5)/config.h
 endif
@@ -403,14 +330,6 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_1)/config.h)","")
 endif
 
 POST_CONFIG_H :=
-
-define post_config_h_community_module_appender
-	ifneq ("$(wildcard $(1)/post_config.h)","")
-		POST_CONFIG_H += $(1)/post_config.h
-	endif
-endef
-$(foreach module,$(COMMUNITY_MODULE_PATHS),$(eval $(call post_config_h_community_module_appender,$(module))))
-
 ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_config.h)","")
     POST_CONFIG_H += $(KEYBOARD_PATH_1)/post_config.h
 endif
@@ -427,6 +346,40 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_config.h)","")
     POST_CONFIG_H += $(KEYBOARD_PATH_5)/post_config.h
 endif
 
+# Create dependencies on DD keyboard config - structure validated elsewhere
+DD_CONFIG_FILES :=
+ifneq ("$(wildcard $(KEYBOARD_PATH_1)/info.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/info.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_2)/info.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/info.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_3)/info.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/info.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_4)/info.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/info.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/info.json
+endif
+
+ifneq ("$(wildcard $(KEYBOARD_PATH_1)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_2)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_3)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_4)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_5)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/keyboard.json
+endif
+
 CONFIG_H += $(INTERMEDIATE_OUTPUT)/src/info_config.h
 KEYBOARD_SRC += $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c
 
@@ -491,18 +444,21 @@ ifneq ("$(CONVERTER)","")
 endif
 
 # Pull in post_rules.mk files from all our subfolders
--include $(KEYBOARD_PATH_1)/post_rules.mk
+ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_rules.mk)","")
--include $(KEYBOARD_PATH_2)/post_rules.mk
+    include $(KEYBOARD_PATH_1)/post_rules.mk
--include $(KEYBOARD_PATH_3)/post_rules.mk
+endif
--include $(KEYBOARD_PATH_4)/post_rules.mk
+ifneq ("$(wildcard $(KEYBOARD_PATH_2)/post_rules.mk)","")
--include $(KEYBOARD_PATH_5)/post_rules.mk
+    include $(KEYBOARD_PATH_2)/post_rules.mk
-
+endif
-define post_rules_mk_community_module_includer
+ifneq ("$(wildcard $(KEYBOARD_PATH_3)/post_rules.mk)","")
-	ifneq ("$(wildcard $(1)/post_rules.mk)","")
+    include $(KEYBOARD_PATH_3)/post_rules.mk
-		include $(1)/post_rules.mk
+endif
-	endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_4)/post_rules.mk)","")
-endef
+    include $(KEYBOARD_PATH_4)/post_rules.mk
-$(foreach module,$(COMMUNITY_MODULE_PATHS),$(eval $(call post_rules_mk_community_module_includer,$(module))))
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_rules.mk)","")
+    include $(KEYBOARD_PATH_5)/post_rules.mk
+endif
 
 ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
     CONFIG_H += $(KEYMAP_PATH)/config.h

builddefs/build_test.mk

@@ -7,7 +7,6 @@ endif
 OPT = g
 
 include paths.mk
-include $(BUILDDEFS_PATH)/support.mk
 include $(BUILDDEFS_PATH)/message.mk
 
 TARGET=test/$(TEST_OUTPUT)

builddefs/common_features.mk

@@ -30,8 +30,6 @@ QUANTUM_SRC += \
     $(QUANTUM_DIR)/logging/sendchar.c \
     $(QUANTUM_DIR)/process_keycode/process_default_layer.c \
 
-include $(QUANTUM_DIR)/nvm/rules.mk
-
 VPATH += $(QUANTUM_DIR)/logging
 # Fall back to lib/printf if there is no platform provided print
 ifeq ("$(wildcard $(PLATFORM_PATH)/$(PLATFORM_KEY)/printf.mk)","")
@@ -171,82 +169,80 @@ endif
 
 VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling legacy_stm32_flash
 EEPROM_DRIVER ?= vendor
-ifneq ($(strip $(EEPROM_DRIVER)),none)
+ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
-  ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
   $(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
-  else
+else
-    OPT_DEFS += -DEEPROM_ENABLE
+  OPT_DEFS += -DEEPROM_ENABLE
-    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
+  COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
-    COMMON_VPATH += $(DRIVER_PATH)/eeprom
+  COMMON_VPATH += $(DRIVER_PATH)/eeprom
-    COMMON_VPATH += $(PLATFORM_COMMON_DIR)
+  COMMON_VPATH += $(PLATFORM_COMMON_DIR)
-    ifeq ($(strip $(EEPROM_DRIVER)), custom)
+  ifeq ($(strip $(EEPROM_DRIVER)), custom)
-      # Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
+    # Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
-      SRC += eeprom_driver.c
+    SRC += eeprom_driver.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)
+  else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)
-      # Wear-leveling EEPROM implementation
+    # Wear-leveling EEPROM implementation
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-      SRC += eeprom_driver.c eeprom_wear_leveling.c
+    SRC += eeprom_driver.c eeprom_wear_leveling.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
+  else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
-      # External I2C EEPROM implementation
+    # External I2C EEPROM implementation
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
-      I2C_DRIVER_REQUIRED = yes
+    I2C_DRIVER_REQUIRED = yes
-      SRC += eeprom_driver.c eeprom_i2c.c
+    SRC += eeprom_driver.c eeprom_i2c.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), spi)
+  else ifeq ($(strip $(EEPROM_DRIVER)), spi)
-      # External SPI EEPROM implementation
+    # External SPI EEPROM implementation
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
-      SPI_DRIVER_REQUIRED = yes
+    SPI_DRIVER_REQUIRED = yes
-      SRC += eeprom_driver.c eeprom_spi.c
+    SRC += eeprom_driver.c eeprom_spi.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
+  else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
-      # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
+    # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
-      COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
-      COMMON_VPATH += $(DRIVER_PATH)/flash
+    COMMON_VPATH += $(DRIVER_PATH)/flash
-      SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
+    SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), transient)
+  else ifeq ($(strip $(EEPROM_DRIVER)), transient)
-      # Transient EEPROM implementation -- no data storage but provides runtime area for it
+    # Transient EEPROM implementation -- no data storage but provides runtime area for it
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
-      SRC += eeprom_driver.c eeprom_transient.c
+    SRC += eeprom_driver.c eeprom_transient.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
+  else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
-      # Vendor-implemented EEPROM
+    # Vendor-implemented EEPROM
-      OPT_DEFS += -DEEPROM_VENDOR
+    OPT_DEFS += -DEEPROM_VENDOR
-      ifeq ($(PLATFORM),AVR)
+    ifeq ($(PLATFORM),AVR)
-        # Automatically provided by avr-libc, nothing required
+      # Automatically provided by avr-libc, nothing required
-      else ifeq ($(PLATFORM),CHIBIOS)
+    else ifeq ($(PLATFORM),CHIBIOS)
-        ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
+      ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
-          # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
+        # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
-          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
-          COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+        COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
-          COMMON_VPATH += $(DRIVER_PATH)/flash
+        COMMON_VPATH += $(DRIVER_PATH)/flash
-          SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
+        SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
-        else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G0xx STM32G4xx WB32F3G71xx WB32FQ95xx AT32F415 GD32VF103),)
+      else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G4xx WB32F3G71xx WB32FQ95xx AT32F415 GD32VF103),)
-          # Wear-leveling EEPROM implementation, backed by MCU flash
+        # Wear-leveling EEPROM implementation, backed by MCU flash
-          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-          SRC += eeprom_driver.c eeprom_wear_leveling.c
+        SRC += eeprom_driver.c eeprom_wear_leveling.c
-          WEAR_LEVELING_DRIVER ?= embedded_flash
+        WEAR_LEVELING_DRIVER ?= embedded_flash
-        else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
+      else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
-          # True EEPROM on STM32L0xx, L1xx
+        # True EEPROM on STM32L0xx, L1xx
-          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
-          SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
+        SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
-        else ifneq ($(filter $(MCU_SERIES),RP2040),)
+      else ifneq ($(filter $(MCU_SERIES),RP2040),)
-          # Wear-leveling EEPROM implementation, backed by RP2040 flash
+        # Wear-leveling EEPROM implementation, backed by RP2040 flash
-          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-          SRC += eeprom_driver.c eeprom_wear_leveling.c
+        SRC += eeprom_driver.c eeprom_wear_leveling.c
-          WEAR_LEVELING_DRIVER ?= rp2040_flash
+        WEAR_LEVELING_DRIVER ?= rp2040_flash
-        else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
+      else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
-          # Teensy EEPROM implementations
+        # Teensy EEPROM implementations
-          OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
+        OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
-          SRC += eeprom_kinetis_flexram.c
+        SRC += eeprom_kinetis_flexram.c
-        else
+      else
-          # Fall back to transient, i.e. non-persistent
+        # Fall back to transient, i.e. non-persistent
-          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
-          SRC += eeprom_driver.c eeprom_transient.c
+        SRC += eeprom_driver.c eeprom_transient.c
-        endif
-      else ifeq ($(PLATFORM),TEST)
-        # Test harness "EEPROM"
-        OPT_DEFS += -DEEPROM_TEST_HARNESS
-        SRC += eeprom.c
       endif
+    else ifeq ($(PLATFORM),TEST)
+      # Test harness "EEPROM"
+      OPT_DEFS += -DEEPROM_TEST_HARNESS
+      SRC += eeprom.c
     endif
   endif
 endif
@@ -267,14 +263,18 @@ ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
     ifeq ($(strip $(WEAR_LEVELING_DRIVER)), embedded_flash)
       OPT_DEFS += -DHAL_USE_EFL
       SRC += wear_leveling_efl.c
+      POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_efl_config.h
     else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), spi_flash)
       FLASH_DRIVER := spi
       SRC += wear_leveling_flash_spi.c
+      POST_CONFIG_H += $(DRIVER_PATH)/wear_leveling/wear_leveling_flash_spi_config.h
     else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), rp2040_flash)
       SRC += wear_leveling_rp2040_flash.c
+      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 += 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
 endif
@@ -433,13 +433,6 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
         SRC += snled27351-mono.c
     endif
 
-    ifeq ($(strip $(LED_MATRIX_CUSTOM_KB)), yes)
-        OPT_DEFS += -DLED_MATRIX_CUSTOM_KB
-    endif
-
-    ifeq ($(strip $(LED_MATRIX_CUSTOM_USER)), yes)
-        OPT_DEFS += -DLED_MATRIX_CUSTOM_USER
-    endif
 endif
 
 # Deprecated driver names - do not use
@@ -635,15 +628,6 @@ ifeq ($(strip $(VIA_ENABLE)), yes)
     TRI_LAYER_ENABLE := yes
 endif
 
-ifeq ($(strip $(RAW_ENABLE)), yes)
-    OPT_DEFS += -DRAW_ENABLE
-    SRC += raw_hid.c
-endif
-
-ifeq ($(strip $(DYNAMIC_KEYMAP_ENABLE)), yes)
-    SEND_STRING_ENABLE := yes
-endif
-
 VALID_CUSTOM_MATRIX_TYPES:= yes lite no
 
 CUSTOM_MATRIX ?= no
@@ -722,7 +706,6 @@ ifeq ($(strip $(LIB8TION_ENABLE)), yes)
         # ATmegaxxU2 does not have hardware MUL instruction - lib8tion must be told to use software multiplication routines
         OPT_DEFS += -DLIB8_ATTINY
     endif
-    OPT_DEFS += -DFASTLED_SCALE8_FIXED=1 -DFASTLED_BLEND_FIXED=1
     SRC += $(LIB_PATH)/lib8tion/lib8tion.c
 endif
 
@@ -894,19 +877,19 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     OPT_DEFS += -DBLUETOOTH_ENABLE
     OPT_DEFS += -DBLUETOOTH_$(strip $(shell echo $(BLUETOOTH_DRIVER) | tr '[:lower:]' '[:upper:]'))
     NO_USB_STARTUP_CHECK := yes
-    CONNECTION_ENABLE := yes
     COMMON_VPATH += $(DRIVER_PATH)/bluetooth
-    SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
+    SRC += outputselect.c process_connection.c
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), bluefruit_le)
         SPI_DRIVER_REQUIRED = yes
-        SRC += $(DRIVER_PATH)/bluetooth/bluetooth_drivers.c
+        ANALOG_DRIVER_REQUIRED = yes
+        SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
         SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp
     endif
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), rn42)
         UART_DRIVER_REQUIRED = yes
-        SRC += $(DRIVER_PATH)/bluetooth/bluetooth_drivers.c
+        SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
         SRC += $(DRIVER_PATH)/bluetooth/rn42.c
     endif
 endif
@@ -940,28 +923,6 @@ ifeq ($(strip $(DIP_SWITCH_ENABLE)), yes)
     endif
 endif
 
-VALID_BATTERY_DRIVER_TYPES := adc custom vendor
-
-BATTERY_DRIVER ?= adc
-ifeq ($(strip $(BATTERY_DRIVER_REQUIRED)), yes)
-    ifeq ($(filter $(BATTERY_DRIVER),$(VALID_BATTERY_DRIVER_TYPES)),)
-        $(call CATASTROPHIC_ERROR,Invalid BATTERY_DRIVER,BATTERY_DRIVER="$(BATTERY_DRIVER)" is not a valid battery driver)
-    endif
-
-    OPT_DEFS += -DBATTERY_DRIVER
-    OPT_DEFS += -DBATTERY_$(strip $(shell echo $(BATTERY_DRIVER) | tr '[:lower:]' '[:upper:]'))
-
-    COMMON_VPATH += $(DRIVER_PATH)/battery
-
-    SRC += battery.c
-    SRC += battery_$(strip $(BATTERY_DRIVER)).c
-
-    # add extra deps
-    ifeq ($(strip $(BATTERY_DRIVER)), adc)
-        ANALOG_DRIVER_REQUIRED = yes
-    endif
-endif
-
 VALID_WS2812_DRIVER_TYPES := bitbang custom i2c pwm spi vendor
 
 WS2812_DRIVER ?= bitbang
@@ -972,8 +933,6 @@ ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
 
     OPT_DEFS += -DWS2812_$(strip $(shell echo $(WS2812_DRIVER) | tr '[:lower:]' '[:upper:]'))
 
-    COMMON_VPATH += $(DRIVER_PATH)/led
-
     SRC += ws2812.c ws2812_$(strip $(WS2812_DRIVER)).c
 
     ifeq ($(strip $(PLATFORM)), CHIBIOS)

builddefs/common_rules.mk

@@ -168,7 +168,7 @@ MOVE_DEP = mv -f $(patsubst %.o,%.td,$@) $(patsubst %.o,%.d,$@)
 
 # For a ChibiOS build, ensure that the board files have the hook overrides injected
 define BOARDSRC_INJECT_HOOKS
-$(INTERMEDIATE_OUTPUT)/$(patsubst %.c,%.o,$(patsubst ./%,%,$1)): FILE_SPECIFIC_CFLAGS += -include $(TOP_DIR)/tmk_core/protocol/chibios/init_hooks.h
+$(INTERMEDIATE_OUTPUT)/$(patsubst %.c,%.o,$(patsubst ./%,%,$1)): INIT_HOOK_CFLAGS += -include $(TOP_DIR)/tmk_core/protocol/chibios/init_hooks.h
 endef
 $(foreach LOBJ, $(BOARDSRC), $(eval $(call BOARDSRC_INJECT_HOOKS,$(LOBJ))))
 
@@ -289,10 +289,10 @@ $1/%.o : %.c $1/%.d $1/cflags.txt $1/compiler.txt | $(BEGIN)
     ifneq ($$(VERBOSE_C_INCLUDE),)
 	$$(if $$(filter $$(notdir $$(VERBOSE_C_INCLUDE)),$$(notdir $$<)),$$(eval CC_EXEC += -H))
     endif
-	$$(eval CMD := $$(CC_EXEC) -c $$($1_CFLAGS) $$(FILE_SPECIFIC_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
+	$$(eval CMD := $$(CC_EXEC) -c $$($1_CFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
     ifneq ($$(DUMP_C_MACROS),)
-	$$(eval CMD := $$(CC) -E -dM $$($1_CFLAGS) $$(FILE_SPECIFIC_CFLAGS) $$(GENDEPFLAGS) $$<)
+	$$(eval CMD := $$(CC) -E -dM $$($1_CFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$<)
 	@$$(if $$(filter $$(notdir $$(DUMP_C_MACROS)),$$(notdir $$<)),$$(BUILD_CMD))
     endif
 
@@ -300,13 +300,13 @@ $1/%.o : %.c $1/%.d $1/cflags.txt $1/compiler.txt | $(BEGIN)
 $1/%.o : %.cpp $1/%.d $1/cxxflags.txt $1/compiler.txt | $(BEGIN)
 	@mkdir -p $$(@D)
 	@$$(SILENT) || printf "$$(MSG_COMPILING_CXX) $$<" | $$(AWK_CMD)
-	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(FILE_SPECIFIC_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
+	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
 
 $1/%.o : %.cc $1/%.d $1/cxxflags.txt $1/compiler.txt | $(BEGIN)
 	@mkdir -p $$(@D)
 	@$$(SILENT) || printf "$$(MSG_COMPILING_CXX) $$<" | $$(AWK_CMD)
-	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(FILE_SPECIFIC_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
+	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
 
 # Assemble: create object files from assembler source files.

builddefs/converters.mk

@@ -1,3 +1,10 @@
+# Note for new boards -- CTPC and CONVERT_TO_PROTON_C are deprecated terms
+# and should not be replicated for new boards. These will be removed from
+# documentation as well as existing keymaps in due course.
+ifneq ($(findstring yes, $(CTPC)$(CONVERT_TO_PROTON_C)),)
+$(call CATASTROPHIC_ERROR,The `CONVERT_TO_PROTON_C` and `CTPC` options are now deprecated. `CONVERT_TO=proton_c` should be used instead.)
+endif
+
 ifneq (,$(filter $(MCU),atmega32u4))
     # TODO: opt in rather than assume everything uses a pro micro
     PIN_COMPATIBLE ?= promicro

builddefs/docsgen/package.json

@@ -1,7 +1,7 @@
 {
   "license": "GPL-2.0-or-later",
   "devDependencies": {
-    "vite": "^5.4.19",
+    "vite": "^5.2.14",
     "vitepress": "^1.1.0",
     "vitepress-plugin-tabs": "^0.5.0",
     "vue": "^3.4.24"

builddefs/docsgen/yarn.lock

@@ -178,220 +178,205 @@
     "@docsearch/css" "3.6.0"
     algoliasearch "^4.19.1"
 
-"@esbuild/aix-ppc64@0.21.5":
+"@esbuild/aix-ppc64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
-  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
+  integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==
 
-"@esbuild/android-arm64@0.21.5":
+"@esbuild/android-arm64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9"
-  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
+  integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==
 
-"@esbuild/android-arm@0.21.5":
+"@esbuild/android-arm@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995"
-  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
+  integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==
 
-"@esbuild/android-x64@0.21.5":
+"@esbuild/android-x64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98"
-  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
+  integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==
 
-"@esbuild/darwin-arm64@0.21.5":
+"@esbuild/darwin-arm64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb"
-  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
+  integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
 
-"@esbuild/darwin-x64@0.21.5":
+"@esbuild/darwin-x64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
-  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
+  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
 
-"@esbuild/freebsd-arm64@0.21.5":
+"@esbuild/freebsd-arm64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911"
-  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
+  integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==
 
-"@esbuild/freebsd-x64@0.21.5":
+"@esbuild/freebsd-x64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c"
-  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
+  integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==
 
-"@esbuild/linux-arm64@0.21.5":
+"@esbuild/linux-arm64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5"
-  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
+  integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==
 
-"@esbuild/linux-arm@0.21.5":
+"@esbuild/linux-arm@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c"
-  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
+  integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==
 
-"@esbuild/linux-ia32@0.21.5":
+"@esbuild/linux-ia32@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa"
-  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
+  integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==
 
-"@esbuild/linux-loong64@0.21.5":
+"@esbuild/linux-loong64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5"
-  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
+  integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==
 
-"@esbuild/linux-mips64el@0.21.5":
+"@esbuild/linux-mips64el@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa"
-  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
+  integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==
 
-"@esbuild/linux-ppc64@0.21.5":
+"@esbuild/linux-ppc64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20"
-  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
+  integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==
 
-"@esbuild/linux-riscv64@0.21.5":
+"@esbuild/linux-riscv64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300"
-  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
+  integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==
 
-"@esbuild/linux-s390x@0.21.5":
+"@esbuild/linux-s390x@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685"
-  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
+  integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==
 
-"@esbuild/linux-x64@0.21.5":
+"@esbuild/linux-x64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff"
-  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
+  integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
 
-"@esbuild/netbsd-x64@0.21.5":
+"@esbuild/netbsd-x64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6"
-  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
+  integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==
 
-"@esbuild/openbsd-x64@0.21.5":
+"@esbuild/openbsd-x64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf"
-  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
+  integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==
 
-"@esbuild/sunos-x64@0.21.5":
+"@esbuild/sunos-x64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f"
-  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
+  integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==
 
-"@esbuild/win32-arm64@0.21.5":
+"@esbuild/win32-arm64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90"
-  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
+  integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==
 
-"@esbuild/win32-ia32@0.21.5":
+"@esbuild/win32-ia32@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23"
-  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
+  integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==
 
-"@esbuild/win32-x64@0.21.5":
+"@esbuild/win32-x64@0.20.2":
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
-  integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
+  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
 
 "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@rollup/rollup-android-arm-eabi@4.31.0":
+"@rollup/rollup-android-arm-eabi@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz#d4dd60da0075a6ce9a6c76d71b8204f3e1822285"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz#8b613b9725e8f9479d142970b106b6ae878610d5"
-  integrity sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==
+  integrity sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==
 
-"@rollup/rollup-android-arm64@4.31.0":
+"@rollup/rollup-android-arm64@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz#25c4d33259a7a2ccd2f52a5ffcc0bb3ab3f0729d"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz#654ca1049189132ff602bfcf8df14c18da1f15fb"
-  integrity sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==
+  integrity sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==
 
-"@rollup/rollup-darwin-arm64@4.31.0":
+"@rollup/rollup-darwin-arm64@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz#d137dff254b19163a6b52ac083a71cd055dae844"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz#6d241d099d1518ef0c2205d96b3fa52e0fe1954b"
-  integrity sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==
+  integrity sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==
 
-"@rollup/rollup-darwin-x64@4.31.0":
+"@rollup/rollup-darwin-x64@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz#58ff20b5dacb797d3adca19f02a21c532f9d55bf"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz#42bd19d292a57ee11734c980c4650de26b457791"
-  integrity sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==
+  integrity sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==
 
-"@rollup/rollup-freebsd-arm64@4.31.0":
+"@rollup/rollup-linux-arm-gnueabihf@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz#96ce1a241c591ec3e068f4af765d94eddb24e60c"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz#f23555ee3d8fe941c5c5fd458cd22b65eb1c2232"
-  integrity sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==
+  integrity sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==
 
-"@rollup/rollup-freebsd-x64@4.31.0":
+"@rollup/rollup-linux-arm-musleabihf@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz#e59e7ede505be41f0b4311b0b943f8eb44938467"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz#f3bbd1ae2420f5539d40ac1fde2b38da67779baa"
-  integrity sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==
+  integrity sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==
 
-"@rollup/rollup-linux-arm-gnueabihf@4.31.0":
+"@rollup/rollup-linux-arm64-gnu@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz#e455ca6e4ff35bd46d62201c153352e717000a7b"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz#7abe900120113e08a1f90afb84c7c28774054d15"
-  integrity sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==
+  integrity sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==
 
-"@rollup/rollup-linux-arm-musleabihf@4.31.0":
+"@rollup/rollup-linux-arm64-musl@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz#bc1a93d807d19e70b1e343a5bfea43723bcd6327"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz#9e655285c8175cd44f57d6a1e8e5dedfbba1d820"
-  integrity sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==
+  integrity sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==
 
-"@rollup/rollup-linux-arm64-gnu@4.31.0":
+"@rollup/rollup-linux-powerpc64le-gnu@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz#f38bf843f1dc3d5de680caf31084008846e3efae"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz#9a79ae6c9e9d8fe83d49e2712ecf4302db5bef5e"
-  integrity sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==
+  integrity sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==
 
-"@rollup/rollup-linux-arm64-musl@4.31.0":
+"@rollup/rollup-linux-riscv64-gnu@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz#b3987a96c18b7287129cf735be2dbf83e94d9d05"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz#67ac70eca4ace8e2942fabca95164e8874ab8128"
-  integrity sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==
+  integrity sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==
 
-"@rollup/rollup-linux-loongarch64-gnu@4.31.0":
+"@rollup/rollup-linux-s390x-gnu@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz#0f0324044e71c4f02e9f49e7ec4e347b655b34ee"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz#9f883a7440f51a22ed7f99e1d070bd84ea5005fc"
-  integrity sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==
+  integrity sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==
 
-"@rollup/rollup-linux-powerpc64le-gnu@4.31.0":
+"@rollup/rollup-linux-x64-gnu@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz#809479f27f1fd5b4eecd2aa732132ad952d454ba"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz#70116ae6c577fe367f58559e2cffb5641a1dd9d0"
-  integrity sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==
+  integrity sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==
 
-"@rollup/rollup-linux-riscv64-gnu@4.31.0":
+"@rollup/rollup-linux-x64-musl@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz#7bc75c4f22db04d3c972f83431739cfa41c6a36e"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz#f473f88219feb07b0b98b53a7923be716d1d182f"
-  integrity sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==
+  integrity sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==
 
-"@rollup/rollup-linux-s390x-gnu@4.31.0":
+"@rollup/rollup-win32-arm64-msvc@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz#cfe8052345c55864d83ae343362cf1912480170e"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz#4349482d17f5d1c58604d1c8900540d676f420e0"
-  integrity sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==
+  integrity sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==
 
-"@rollup/rollup-linux-x64-gnu@4.31.0":
+"@rollup/rollup-win32-ia32-msvc@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz#c6b048f1e25f3fea5b4bd246232f4d07a159c5a0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz#a6fc39a15db618040ec3c2a24c1e26cb5f4d7422"
-  integrity sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==
+  integrity sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==
 
-"@rollup/rollup-linux-x64-musl@4.31.0":
+"@rollup/rollup-win32-x64-msvc@4.22.4":
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz#615273ac52d1a201f4de191cbd3389016a9d7d80"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz#3dd5d53e900df2a40841882c02e56f866c04d202"
-  integrity sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==
+  integrity sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==
-
-"@rollup/rollup-win32-arm64-msvc@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz#32ed85810c1b831c648eca999d68f01255b30691"
-  integrity sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==
-
-"@rollup/rollup-win32-ia32-msvc@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz#d47effada68bcbfdccd30c4a788d42e4542ff4d3"
-  integrity sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==
-
-"@rollup/rollup-win32-x64-msvc@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz#7a2d89a82cf0388d60304964217dd7beac6de645"
-  integrity sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==
 
 "@shikijs/core@1.3.0", "@shikijs/core@^1.3.0":
   version "1.3.0"
@@ -405,10 +390,10 @@
   dependencies:
     shiki "1.3.0"
 
-"@types/estree@1.0.6":
+"@types/estree@1.0.5":
-  version "1.0.6"
+  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/linkify-it@*":
   version "3.0.5"
@@ -604,34 +589,34 @@ entities@^4.5.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
-esbuild@^0.21.3:
+esbuild@^0.20.1:
-  version "0.21.5"
+  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1"
-  integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
+  integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.21.5"
+    "@esbuild/aix-ppc64" "0.20.2"
-    "@esbuild/android-arm" "0.21.5"
+    "@esbuild/android-arm" "0.20.2"
-    "@esbuild/android-arm64" "0.21.5"
+    "@esbuild/android-arm64" "0.20.2"
-    "@esbuild/android-x64" "0.21.5"
+    "@esbuild/android-x64" "0.20.2"
-    "@esbuild/darwin-arm64" "0.21.5"
+    "@esbuild/darwin-arm64" "0.20.2"
-    "@esbuild/darwin-x64" "0.21.5"
+    "@esbuild/darwin-x64" "0.20.2"
-    "@esbuild/freebsd-arm64" "0.21.5"
+    "@esbuild/freebsd-arm64" "0.20.2"
-    "@esbuild/freebsd-x64" "0.21.5"
+    "@esbuild/freebsd-x64" "0.20.2"
-    "@esbuild/linux-arm" "0.21.5"
+    "@esbuild/linux-arm" "0.20.2"
-    "@esbuild/linux-arm64" "0.21.5"
+    "@esbuild/linux-arm64" "0.20.2"
-    "@esbuild/linux-ia32" "0.21.5"
+    "@esbuild/linux-ia32" "0.20.2"
-    "@esbuild/linux-loong64" "0.21.5"
+    "@esbuild/linux-loong64" "0.20.2"
-    "@esbuild/linux-mips64el" "0.21.5"
+    "@esbuild/linux-mips64el" "0.20.2"
-    "@esbuild/linux-ppc64" "0.21.5"
+    "@esbuild/linux-ppc64" "0.20.2"
-    "@esbuild/linux-riscv64" "0.21.5"
+    "@esbuild/linux-riscv64" "0.20.2"
-    "@esbuild/linux-s390x" "0.21.5"
+    "@esbuild/linux-s390x" "0.20.2"
-    "@esbuild/linux-x64" "0.21.5"
+    "@esbuild/linux-x64" "0.20.2"
-    "@esbuild/netbsd-x64" "0.21.5"
+    "@esbuild/netbsd-x64" "0.20.2"
-    "@esbuild/openbsd-x64" "0.21.5"
+    "@esbuild/openbsd-x64" "0.20.2"
-    "@esbuild/sunos-x64" "0.21.5"
+    "@esbuild/sunos-x64" "0.20.2"
-    "@esbuild/win32-arm64" "0.21.5"
+    "@esbuild/win32-arm64" "0.20.2"
-    "@esbuild/win32-ia32" "0.21.5"
+    "@esbuild/win32-ia32" "0.20.2"
-    "@esbuild/win32-x64" "0.21.5"
+    "@esbuild/win32-x64" "0.20.2"
 
 estree-walker@^2.0.2:
   version "2.0.2"
@@ -677,29 +662,29 @@ mitt@^3.0.1:
   resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1"
   integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==
 
-nanoid@^3.3.8:
+nanoid@^3.3.7:
-  version "3.3.8"
+  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
 perfect-debounce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/perfect-debounce/-/perfect-debounce-1.0.0.tgz#9c2e8bc30b169cc984a58b7d5b28049839591d2a"
   integrity sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==
 
-picocolors@^1.1.1:
+picocolors@^1.0.0:
-  version "1.1.1"
+  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-postcss@^8.4.38, postcss@^8.4.43:
+postcss@^8.4.38:
-  version "8.5.1"
+  version "8.4.38"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.1.tgz#e2272a1f8a807fafa413218245630b5db10a3214"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
-  integrity sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
   dependencies:
-    nanoid "^3.3.8"
+    nanoid "^3.3.7"
-    picocolors "^1.1.1"
+    picocolors "^1.0.0"
-    source-map-js "^1.2.1"
+    source-map-js "^1.2.0"
 
 preact@^10.0.0:
   version "10.20.2"
@@ -711,32 +696,29 @@ rfdc@^1.3.1:
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f"
   integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==
 
-rollup@^4.20.0:
+rollup@^4.13.0:
-  version "4.31.0"
+  version "4.22.4"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.31.0.tgz#b84af969a0292cb047dce2c0ec5413a9457597a4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.22.4.tgz#4135a6446671cd2a2453e1ad42a45d5973ec3a0f"
-  integrity sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==
+  integrity sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==
   dependencies:
-    "@types/estree" "1.0.6"
+    "@types/estree" "1.0.5"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.31.0"
+    "@rollup/rollup-android-arm-eabi" "4.22.4"
-    "@rollup/rollup-android-arm64" "4.31.0"
+    "@rollup/rollup-android-arm64" "4.22.4"
-    "@rollup/rollup-darwin-arm64" "4.31.0"
+    "@rollup/rollup-darwin-arm64" "4.22.4"
-    "@rollup/rollup-darwin-x64" "4.31.0"
+    "@rollup/rollup-darwin-x64" "4.22.4"
-    "@rollup/rollup-freebsd-arm64" "4.31.0"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.22.4"
-    "@rollup/rollup-freebsd-x64" "4.31.0"
+    "@rollup/rollup-linux-arm-musleabihf" "4.22.4"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.31.0"
+    "@rollup/rollup-linux-arm64-gnu" "4.22.4"
-    "@rollup/rollup-linux-arm-musleabihf" "4.31.0"
+    "@rollup/rollup-linux-arm64-musl" "4.22.4"
-    "@rollup/rollup-linux-arm64-gnu" "4.31.0"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.22.4"
-    "@rollup/rollup-linux-arm64-musl" "4.31.0"
+    "@rollup/rollup-linux-riscv64-gnu" "4.22.4"
-    "@rollup/rollup-linux-loongarch64-gnu" "4.31.0"
+    "@rollup/rollup-linux-s390x-gnu" "4.22.4"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.31.0"
+    "@rollup/rollup-linux-x64-gnu" "4.22.4"
-    "@rollup/rollup-linux-riscv64-gnu" "4.31.0"
+    "@rollup/rollup-linux-x64-musl" "4.22.4"
-    "@rollup/rollup-linux-s390x-gnu" "4.31.0"
+    "@rollup/rollup-win32-arm64-msvc" "4.22.4"
-    "@rollup/rollup-linux-x64-gnu" "4.31.0"
+    "@rollup/rollup-win32-ia32-msvc" "4.22.4"
-    "@rollup/rollup-linux-x64-musl" "4.31.0"
+    "@rollup/rollup-win32-x64-msvc" "4.22.4"
-    "@rollup/rollup-win32-arm64-msvc" "4.31.0"
-    "@rollup/rollup-win32-ia32-msvc" "4.31.0"
-    "@rollup/rollup-win32-x64-msvc" "4.31.0"
     fsevents "~2.3.2"
 
 shiki@1.3.0, shiki@^1.3.0:
@@ -751,11 +733,6 @@ source-map-js@^1.2.0:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
-source-map-js@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
-  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
-
 speakingurl@^14.0.1:
   version "14.0.1"
   resolved "https://registry.yarnpkg.com/speakingurl/-/speakingurl-14.0.1.tgz#f37ec8ddc4ab98e9600c1c9ec324a8c48d772a53"
@@ -766,14 +743,14 @@ tabbable@^6.2.0:
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
   integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
 
-vite@^5.2.9, vite@^5.4.19:
+vite@^5.2.14, vite@^5.2.9:
-  version "5.4.19"
+  version "5.2.14"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.19.tgz#20efd060410044b3ed555049418a5e7d1998f959"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.14.tgz#fd5f60facf6b5f90ec7da6323c467a365d380c3d"
-  integrity sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==
+  integrity sha512-TFQLuwWLPms+NBNlh0D9LZQ+HXW471COABxw/9TEUBrjuHMo9BrYBPrN/SYAwIuVL+rLerycxiLT41t4f5MZpA==
   dependencies:
-    esbuild "^0.21.3"
+    esbuild "^0.20.1"
-    postcss "^8.4.43"
+    postcss "^8.4.38"
-    rollup "^4.20.0"
+    rollup "^4.13.0"
   optionalDependencies:
     fsevents "~2.3.3"
 

builddefs/generic_features.mk

@@ -25,7 +25,6 @@ GENERIC_FEATURES = \
     CAPS_WORD \
     COMBO \
     COMMAND \
-    CONNECTION \
     CRC \
     DEFERRED_EXEC \
     DIGITIZER \
@@ -35,7 +34,6 @@ GENERIC_FEATURES = \
     DYNAMIC_TAPPING_TERM \
     GRAVE_ESC \
     HAPTIC \
-    KEYCODE_STRING \
     KEY_LOCK \
     KEY_OVERRIDE \
     LAYER_LOCK \
@@ -62,7 +60,6 @@ define HANDLE_GENERIC_FEATURE
     SRC += $$(wildcard $$(QUANTUM_DIR)/process_keycode/process_$2.c)
     SRC += $$(wildcard $$(QUANTUM_DIR)/$2/$2.c)
     SRC += $$(wildcard $$(QUANTUM_DIR)/$2.c)
-    SRC += $$(wildcard $$(QUANTUM_DIR)/nvm/$$(NVM_DRIVER_LOWER)/nvm_$2.c)
     VPATH += $$(wildcard $$(QUANTUM_DIR)/$2/)
     OPT_DEFS += -D$1_ENABLE
 endef

builddefs/support.mk

@@ -1,11 +0,0 @@
-# Helper to determine if a compiler option is supported
-# Args:
-#   $(1) = option to test, if successful will be output
-#   $(2) = option to use if $(1) is not supported
-#   $(3) = additional arguments to pass to the compiler during the test, but aren't contained in the output
-cc-option = $(shell \
-	if { echo 'int main(){return 0;}' | $(CC) $(1) $(3) -o /dev/null -x c /dev/null >/dev/null 2>&1; }; \
-	then echo "$(1)"; else echo "$(2)"; fi)
-
-# Helper to pass comma character to make functions (use with `$(,)` to pass in `$(call ...)` arguments)
-, := ,

data/constants/keycodes/extras/keycodes_belgian_0.0.1.hjson

@@ -372,4 +372,4 @@
             "label": "~",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_bepo_0.0.1.hjson

@@ -629,4 +629,4 @@
             "label": "(narrow non-breaking space)",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_brazilian_abnt2_0.0.1.hjson

@@ -376,4 +376,4 @@
             "label": "₢",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_canadian_multilingual_0.0.1.hjson

@@ -638,4 +638,4 @@
             "label": "÷",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_colemak_0.0.1.hjson

@@ -299,4 +299,4 @@
             "label": "?",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_croatian_0.0.1.hjson

@@ -400,4 +400,4 @@
             "label": "§",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_czech_0.0.1.hjson

@@ -432,4 +432,4 @@
             "label": "*",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_danish_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_dvorak_0.0.1.hjson

@@ -299,4 +299,4 @@
             "label": ":",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_dvorak_fr_0.0.1.hjson

@@ -314,4 +314,4 @@
             "label": "@",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_dvorak_programmer_0.0.1.hjson

@@ -299,4 +299,4 @@
             "label": "\"",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_estonian_0.0.1.hjson

@@ -364,4 +364,4 @@
             "label": "ž",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_eurkey_0.0.1.hjson

@@ -1,596 +0,0 @@
-{
-    "aliases": {
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │        │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │          │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "KC_GRV": {
-            "key": "EU_GRV",
-            "label": "`",
-        }
-        "KC_1": {
-            "key": "EU_1",
-            "label": "1",
-        }
-        "KC_2": {
-            "key": "EU_2",
-            "label": "2",
-        }
-        "KC_3": {
-            "key": "EU_3",
-            "label": "3",
-        }
-        "KC_4": {
-            "key": "EU_4",
-            "label": "4",
-        }
-        "KC_5": {
-            "key": "EU_5",
-            "label": "5",
-        }
-        "KC_6": {
-            "key": "EU_6",
-            "label": "6",
-        }
-        "KC_7": {
-            "key": "EU_7",
-            "label": "7",
-        }
-        "KC_8": {
-            "key": "EU_8",
-            "label": "8",
-        }
-        "KC_9": {
-            "key": "EU_9",
-            "label": "9",
-        }
-        "KC_0": {
-            "key": "EU_0",
-            "label": "0",
-        }
-        "KC_MINS": {
-            "key": "EU_MINS",
-            "label": "-",
-        }
-        "KC_EQL": {
-            "key": "EU_EQL",
-            "label": "=",
-        }
-        "KC_Q": {
-            "key": "EU_Q",
-            "label": "Q",
-        }
-        "KC_W": {
-            "key": "EU_W",
-            "label": "W",
-        }
-        "KC_E": {
-            "key": "EU_E",
-            "label": "E",
-        }
-        "KC_R": {
-            "key": "EU_R",
-            "label": "R",
-        }
-        "KC_T": {
-            "key": "EU_T",
-            "label": "T",
-        }
-        "KC_Y": {
-            "key": "EU_Y",
-            "label": "Y",
-        }
-        "KC_U": {
-            "key": "EU_U",
-            "label": "U",
-        }
-        "KC_I": {
-            "key": "EU_I",
-            "label": "I",
-        }
-        "KC_O": {
-            "key": "EU_O",
-            "label": "O",
-        }
-        "KC_P": {
-            "key": "EU_P",
-            "label": "P",
-        }
-        "KC_LBRC": {
-            "key": "EU_LBRC",
-            "label": "[",
-        }
-        "KC_RBRC": {
-            "key": "EU_RBRC",
-            "label": "]",
-        }
-        "KC_BSLS": {
-            "key": "EU_BSLS",
-            "label": "\\",
-        }
-        "KC_A": {
-            "key": "EU_A",
-            "label": "A",
-        }
-        "KC_S": {
-            "key": "EU_S",
-            "label": "S",
-        }
-        "KC_D": {
-            "key": "EU_D",
-            "label": "D",
-        }
-        "KC_F": {
-            "key": "EU_F",
-            "label": "F",
-        }
-        "KC_G": {
-            "key": "EU_G",
-            "label": "G",
-        }
-        "KC_H": {
-            "key": "EU_H",
-            "label": "H",
-        }
-        "KC_J": {
-            "key": "EU_J",
-            "label": "J",
-        }
-        "KC_K": {
-            "key": "EU_K",
-            "label": "K",
-        }
-        "KC_L": {
-            "key": "EU_L",
-            "label": "L",
-        }
-        "KC_SCLN": {
-            "key": "EU_SCLN",
-            "label": ";",
-        }
-        "KC_QUOT": {
-            "key": "EU_QUOT",
-            "label": "'",
-        }
-        "KC_Z": {
-            "key": "EU_Z",
-            "label": "Z",
-        }
-        "KC_X": {
-            "key": "EU_X",
-            "label": "X",
-        }
-        "KC_C": {
-            "key": "EU_C",
-            "label": "C",
-        }
-        "KC_V": {
-            "key": "EU_V",
-            "label": "V",
-        }
-        "KC_B": {
-            "key": "EU_B",
-            "label": "B",
-        }
-        "KC_N": {
-            "key": "EU_N",
-            "label": "N",
-        }
-        "KC_M": {
-            "key": "EU_M",
-            "label": "M",
-        }
-        "KC_COMM": {
-            "key": "EU_COMM",
-            "label": ",",
-        }
-        "KC_DOT": {
-            "key": "EU_DOT",
-            "label": ".",
-        }
-        "KC_SLSH": {
-            "key": "EU_SLSH",
-            "label": "/",
-        }
-/* Shifted symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │   │   │ { │ } │  |  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │   │   │   │   │   │   │   │   │   │ : │ " │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │        │   │   │   │   │   │   │   │ < │ > │ ? │          │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "S(EU_GRV)": {
-            "key": "EU_TILD",
-            "label": "~",
-        }
-        "S(EU_1)": {
-            "key": "EU_EXLM",
-            "label": "!",
-        }
-        "S(EU_2)": {
-            "key": "EU_AT",
-            "label": "@",
-        }
-        "S(EU_3)": {
-            "key": "EU_HASH",
-            "label": "#",
-        }
-        "S(EU_4)": {
-            "key": "EU_DLR",
-            "label": "$",
-        }
-        "S(EU_5)": {
-            "key": "EU_PERC",
-            "label": "%",
-        }
-        "S(EU_6)": {
-            "key": "EU_CIRC",
-            "label": "^",
-        }
-        "S(EU_7)": {
-            "key": "EU_AMPR",
-            "label": "&",
-        }
-        "S(EU_8)": {
-            "key": "EU_ASTR",
-            "label": "*",
-        }
-        "S(EU_9)": {
-            "key": "EU_LPRN",
-            "label": "(",
-        }
-        "S(EU_0)": {
-            "key": "EU_RPRN",
-            "label": ")",
-        }
-        "S(EU_MINS)": {
-            "key": "EU_UNDS",
-            "label": "_",
-        }
-        "S(EU_EQL)": {
-            "key": "EU_PLUS",
-            "label": "+",
-        }
-        "S(EU_LBRC)": {
-            "key": "EU_LCBR",
-            "label": "{",
-        }
-        "S(EU_RBRC)": {
-            "key": "EU_RCBR",
-            "label": "}",
-        }
-        "S(EU_BSLS)": {
-            "key": "EU_PIPE",
-            "label": "|",
-        }
-        "S(EU_SCLN)": {
-            "key": "EU_COLN",
-            "label": ":",
-        }
-        "S(EU_QUOT)": {
-            "key": "EU_DQUO",
-            "label": "\"",
-        }
-        "S(EU_COMM)": {
-            "key": "EU_LABK",
-            "label": "<",
-        }
-        "S(EU_DOT)": {
-            "key": "EU_RABK",
-            "label": ">",
-        }
-        "S(EU_SLSH)": {
-            "key": "EU_QUES",
-            "label": "?",
-        }
-/* AltGr symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ` │ ¡ │ ª │ º │ £ │ € │ ^ │ ˚ │ „ │ “ │ ” │ – │ × │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │ æ │ å │ ë │ ý │ þ │ ÿ │ ü │ ï │ ö │ œ │ « │ » │  ¬  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │ ä │ ß │ ð │ è │ é │ ù │ ú │ ij │ ø │ ° │ ´ │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │        │ à │ á │ ç │ ì │ í │ ñ │ μ │ ò │ ó │ ¿ │          │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "ALGR(EU_GRV)": {
-            "key": "EU_DGRV",
-            "label": "` (dead)",
-        }
-        "ALGR(EU_1)": {
-            "key": "EU_IEXL",
-            "label": "¡",
-        }
-        "ALGR(EU_2)": {
-            "key": "EU_FORD",
-            "label": "ª",
-        }
-        "ALGR(EU_3)": {
-            "key": "EU_MORD",
-            "label": "º",
-        }
-        "ALGR(EU_4)": {
-            "key": "EU_PND",
-            "label": "£",
-        }
-        "ALGR(EU_5)": {
-            "key": "EU_EURO",
-            "label": "€",
-        }
-        "ALGR(EU_6)": {
-            "key": "EU_DCIR",
-            "label": "^ (dead)",
-        }
-        "ALGR(EU_7)": {
-            "key": "EU_RNGA",
-            "label": "˚ (dead)",
-        }
-        "ALGR(EU_8)": {
-            "key": "EU_DLQU",
-            "label": "„",
-        }
-        "ALGR(EU_9)": {
-            "key": "EU_LDQU",
-            "label": "“",
-        }
-        "ALGR(EU_0)": {
-            "key": "EU_RDQU",
-            "label": "”",
-        }
-        "ALGR(EU_MINS)": {
-            "key": "EU_NDSH",
-            "label": "–",
-        }
-        "ALGR(EU_EQL)": {
-            "key": "EU_MUL",
-            "label": "×",
-        }
-        "ALGR(EU_Q)": {
-            "key": "EU_AE",
-            "label": "æ",
-        }
-        "ALGR(EU_W)": {
-            "key": "EU_ARNG",
-            "label": "Å",
-        }
-        "ALGR(EU_E)": {
-            "key": "EU_EDIA",
-            "label": "Ë",
-        }
-        "ALGR(EU_R)": {
-            "key": "EU_YACU",
-            "label": "Ý",
-        }
-        "ALGR(EU_T)": {
-            "key": "EU_THRN",
-            "label": "Þ",
-        }
-        "ALGR(EU_Y)": {
-            "key": "EU_YDIA",
-            "label": "Ÿ",
-        }
-        "ALGR(EU_U)": {
-            "key": "EU_UDIA",
-            "label": "Ü",
-        }
-        "ALGR(EU_I)": {
-            "key": "EU_IDIA",
-            "label": "Ï",
-        }
-        "ALGR(EU_O)": {
-            "key": "EU_ODIA",
-            "label": "Ö",
-        }
-        "ALGR(EU_P)": {
-            "key": "EU_OE",
-            "label": "Œ",
-        }
-        "ALGR(EU_LBRC)": {
-            "key": "EU_LDAQ",
-            "label": "«",
-        }
-        "ALGR(EU_RBRC)": {
-            "key": "EU_RDAQ",
-            "label": "»",
-        }
-        "ALGR(EU_BSLS)": {
-            "key": "EU_NOT",
-            "label": "¬",
-        }
-        "ALGR(EU_A)": {
-            "key": "EU_ADIA",
-            "label": "Ä",
-        }
-        "ALGR(EU_S)": {
-            "key": "EU_SS",
-            "label": "ß",
-        }
-        "ALGR(EU_D)": {
-            "key": "EU_ETH",
-            "label": "Ð",
-        }
-        "ALGR(EU_F)": {
-            "key": "EU_EGRV",
-            "label": "È",
-        }
-        "ALGR(EU_G)": {
-            "key": "EU_EACU",
-            "label": "É",
-        }
-        "ALGR(EU_H)": {
-            "key": "EU_UGRV",
-            "label": "Ù",
-        }
-        "ALGR(EU_J)": {
-            "key": "EU_UACU",
-            "label": "Ú",
-        }
-        "ALGR(EU_K)": {
-            "key": "EU_IJ",
-            "label": "IJ",
-        }
-        "ALGR(EU_L)": {
-            "key": "EU_OSTR",
-            "label": "Ø",
-        }
-        "ALGR(EU_SCLN)": {
-            "key": "EU_DEG",
-            "label": "°",
-        }
-        "ALGR(EU_QUOT)": {
-            "key": "EU_ACUT",
-            "label": "´ (dead)",
-        }
-        "ALGR(EU_Z)": {
-            "key": "EU_AGRV",
-            "label": "À",
-        }
-        "ALGR(EU_X)": {
-            "key": "EU_AACU",
-            "label": "Á",
-        }
-        "ALGR(EU_C)": {
-            "key": "EU_CCED",
-            "label": "Ç",
-        }
-        "ALGR(EU_V)": {
-            "key": "EU_IGRV",
-            "label": "Ì",
-        }
-        "ALGR(EU_B)": {
-            "key": "EU_IACU",
-            "label": "Í",
-        }
-        "ALGR(EU_N)": {
-            "key": "EU_NTIL",
-            "label": "Ñ",
-        }
-        "ALGR(EU_M)": {
-            "key": "EU_DGRK",
-            "label": "μ (dead Greek key)",
-        }
-        "ALGR(EU_COMM)": {
-            "key": "EU_OGRV",
-            "label": "Ò",
-        }
-        "ALGR(EU_DOT)": {
-            "key": "EU_OACU",
-            "label": "Ó",
-        }
-        "ALGR(EU_SLSH)": {
-            "key": "EU_IQUE",
-            "label": "¿",
-        }
-/* Shift+AltGr symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ~ │ ¹ │ ² │ ³ │ ¥ │ ¢ │ ˇ │ ¯ │ ‚ │ ‘ │ ’ │ — │ ÷ │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │   │   │ ‹ │ › │  ¦  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │   │ § │   │   │   │   │   │   │   │ · │ ¨ │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │        │   │   │   │   │   │   │   │   │   │ … │          │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "ALGR(EU_TILD)": {
-            "key": "EU_DTIL",
-            "label": "~ (dead)",
-        }
-        "S(ALGR(EU_1))": {
-            "key": "EU_SUP1",
-            "label": "¹",
-        }
-        "S(ALGR(EU_2))": {
-            "key": "EU_SUP2",
-            "label": "²",
-        }
-        "S(ALGR(EU_3))": {
-            "key": "EU_SUP3",
-            "label": "³",
-        }
-        "ALGR(EU_DLR)": {
-            "key": "EU_YEN",
-            "label": "¥",
-        }
-        "S(EU_EURO)": {
-            "key": "EU_CENT",
-            "label": "¢",
-        }
-        "S(EU_DCIR)": {
-            "key": "EU_CARN",
-            "label": "ˇ (dead)",
-        }
-        "S(ALGR(EU_7))": {
-            "key": "EU_MACR",
-            "label": "¯ (dead)",
-        }
-        "S(EU_DLQU)": {
-            "key": "EU_SLQU",
-            "label": "‚",
-        }
-        "S(EU_LDQU)": {
-            "key": "EU_LSQU",
-            "label": "‘",
-        }
-        "S(EU_RDQU)": {
-            "key": "EU_RSQU",
-            "label": "’",
-        }
-        "S(EU_NDSH)": {
-            "key": "EU_MDSH",
-            "label": "—",
-        }
-        "S(EU_MUL)": {
-            "key": "EU_DIV",
-            "label": "÷",
-        }
-        "S(EU_LDAQ)": {
-            "key": "EU_LSAQ",
-            "label": "‹",
-        }
-        "S(EU_RDAQ)": {
-            "key": "EU_RSAQ",
-            "label": "›",
-        }
-        "S(ALGR(EU_BSLS))": {
-            "key": "EU_BRKP",
-            "label": "¦",
-        }
-        "S(ALGR(EU_S))": {
-            "key": "EU_SECT",
-            "label": "§",
-        }
-        "S(ALGR(EU_SCLN))": {
-            "key": "EU_MDDT",
-            "label": "·",
-        }
-        "ALGR(EU_DQUO)": {
-            "key": "EU_DIAE",
-            "label": "¨ (dead)",
-        }
-        "ALGR(EU_QUES)": {
-            "key": "EU_ELLP",
-            "label": "…",
-        }
-    }
-}

data/constants/keycodes/extras/keycodes_farsi_0.0.1.hjson

@@ -527,7 +527,7 @@
             "key": "FA_PIPE",
             "label": "|",
         }
-        "ALGR(FA_RE)": {
+        "ALGR(FA_RA)": {
             "key": "FA_SUBA",
             "label": "ٖ",
         }

data/constants/keycodes/extras/keycodes_finnish_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_french_0.0.1.hjson

@@ -364,4 +364,4 @@
             "label": "¤",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_french_afnor_0.0.1.hjson

@@ -620,4 +620,4 @@
             "label": "≠",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_french_mac_iso_0.0.1.hjson

@@ -673,4 +673,4 @@
             "label": "±",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_german_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_german_mac_iso_0.0.1.hjson

@@ -653,4 +653,4 @@
             "label": "—",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_greek_0.0.1.hjson

@@ -388,4 +388,4 @@
             "label": "©",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_hebrew_0.0.1.hjson

@@ -344,4 +344,4 @@
             "label": "÷",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_hungarian_0.0.1.hjson

@@ -432,4 +432,4 @@
             "label": "*",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_icelandic_0.0.1.hjson

@@ -352,4 +352,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_irish_0.0.1.hjson

@@ -352,4 +352,4 @@
             "label": "´ (dead)",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_italian_0.0.1.hjson

@@ -361,4 +361,4 @@
             "label": "}",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_italian_mac_ansi_0.0.1.hjson

@@ -681,4 +681,4 @@
             "label": "—",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_italian_mac_iso_0.0.1.hjson

@@ -685,4 +685,4 @@
             "label": "—",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_japanese_0.0.1.hjson

@@ -327,4 +327,4 @@
             "label": "_",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_korean_0.0.1.hjson

@@ -307,4 +307,4 @@
             "label": "?",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_latvian_0.0.1.hjson

@@ -437,4 +437,4 @@
             "label": "¨ (dead)",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_lithuanian_azerty_0.0.1.hjson

@@ -372,4 +372,4 @@
             "label": "\\",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_lithuanian_qwerty_0.0.1.hjson

@@ -365,4 +365,4 @@
             "label": "+",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_neo2_0.0.1.hjson

@@ -214,4 +214,4 @@
             "label": "(layer 4)",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_nordic_0.0.1.hjson

@@ -113,4 +113,4 @@
             "key": "NO_MU"
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_norman_0.0.1.hjson

@@ -299,4 +299,4 @@
             "label": "?",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_norwegian_0.0.1.hjson

@@ -352,4 +352,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_plover_0.0.1.hjson

@@ -83,4 +83,4 @@
             "key": "PV_U"
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_plover_dvorak_0.0.1.hjson

@@ -70,4 +70,4 @@
             "key": "PD_U"
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_polish_0.0.1.hjson

@@ -352,4 +352,4 @@
             "label": "Ń",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_portuguese_0.0.1.hjson

@@ -352,4 +352,4 @@
             "label": "€",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_portuguese_mac_iso_0.0.1.hjson

@@ -617,4 +617,4 @@
             "label": "–",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_romanian_0.0.1.hjson

@@ -441,4 +441,4 @@
             "label": "»",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_russian_0.0.1.hjson

@@ -288,4 +288,4 @@
             "label": "₽",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_serbian_0.0.1.hjson

@@ -304,4 +304,4 @@
             "label": "€",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_serbian_latin_0.0.1.hjson

@@ -404,4 +404,4 @@
             "label": "§",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_slovak_0.0.1.hjson

@@ -440,4 +440,4 @@
             "label": "}",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_slovenian_0.0.1.hjson

@@ -400,4 +400,4 @@
             "label": "§",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_spanish_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "}",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_spanish_dvorak_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "}",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson

@@ -340,4 +340,4 @@
             "label": "`",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_swedish_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_swedish_mac_ansi_0.0.1.hjson

@@ -639,4 +639,4 @@
             "label": "—",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_swedish_mac_iso_0.0.1.hjson

@@ -637,4 +637,4 @@
             "label": "—",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_swedish_pro_mac_ansi_0.0.1.hjson

@@ -639,4 +639,4 @@
             "label": "—",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_swedish_pro_mac_iso_0.0.1.hjson

@@ -637,4 +637,4 @@
             "label": "—",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_swiss_de_0.0.1.hjson

@@ -376,4 +376,4 @@
             "label": "\\",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_swiss_fr_0.0.1.hjson

@@ -376,4 +376,4 @@
             "label": "\\",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_turkish_f_0.0.1.hjson

@@ -477,4 +477,4 @@
             "label": "º",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_turkish_q_0.0.1.hjson

@@ -372,4 +372,4 @@
             "label": "` (dead)",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_uk_0.0.1.hjson

@@ -350,4 +350,4 @@
             "label": "Á"
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_ukrainian_0.0.1.hjson

@@ -292,4 +292,4 @@
             "label": "ґ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_us_extended_0.0.1.hjson

@@ -585,4 +585,4 @@
             "label": "̉ (dead)",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_us_international_0.0.1.hjson

@@ -505,4 +505,4 @@
             "label": "¢",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_us_international_linux_0.0.1.hjson

@@ -573,4 +573,4 @@
             "label": "̉ (dead)",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_workman_0.0.1.hjson

@@ -299,4 +299,4 @@
             "label": "?",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_workman_zxcvm_0.0.1.hjson

@@ -299,4 +299,4 @@
             "label": "?",
         }
     }
-}
+}

data/constants/keycodes/keycodes_0.0.1.hjson

@@ -93,4 +93,4 @@
             "key": "SAFE_RANGE"
         }
     }
-}
+}

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

@@ -1140,7 +1140,7 @@
         "0x00AE": {
             "group": "media",
             "key": "KC_MEDIA_PLAY_PAUSE",
-            "label": "Play/Pause Track",
+            "label": "Mute",
             "aliases": [
                 "KC_MPLY"
             ]

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

@@ -225,4 +225,4 @@
             ]
         }
     }
-}
+}

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

@@ -246,4 +246,4 @@
             ]
         }
     }
-}
+}

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

@@ -225,4 +225,4 @@
             ]
         }
     }
-}
+}

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

@@ -37,4 +37,4 @@
             "key": "SQ_SCLR"
         }
     }
-}
+}

data/constants/keycodes/keycodes_0.0.2_basic.hjson

@@ -17,4 +17,4 @@
             ]
         }
     }
-}
+}

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

@@ -248,4 +248,4 @@
             ]
         }
     }
-}
+}

data/constants/keycodes/keycodes_0.0.2_sequencer.hjson

@@ -66,4 +66,4 @@
             ]
         }
     }
-}
+}

data/constants/keycodes/keycodes_0.0.7.hjson

@@ -1,7 +0,0 @@
-{
-    "ranges": {
-        "0x77C0/0x003F": {
-            "define": "QK_COMMUNITY_MODULE"
-        }
-    }
-}