Merge remote-tracking branch 'origin/develop' into xap

* Refactor helix/rev3_{4,5}rows

rev3_4rows and rev3_5rows are identical, except for the extra row users
can snap off of their PCBs.

- Add alias for rev3_4rows
- Migrates legacy defines and configuration to keyboard.json
- Tidy's keymap and migrates to JSON
- Removes RGB Light configuration, enables RGB Matrix
- Removes DIP switch configuration, as they do not appear to be present
  on PCBs
- Adds an alternate 4 row layout for snappable PCB
- Tidy's up OLED code
- Enables standard features (bootmagic, extrakey, etc.)

* Alias for rev3_5rows -> rev3

* Add product URL

* Replace mistakenly removed DIP switch configuration

* Remove rebase artifact

.clangd

@@ -1,4 +1,33 @@
 CompileFlags:
-  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]
-  Compiler: clang
+    Add:
+        [
+            -Wno-unknown-attributes,
+            -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/workflows/docs.yml

@@ -36,6 +36,7 @@ jobs:
 
     - name: Install dependencies
       run: |
+        pip3 install -r requirements-dev.txt
         apt-get update && apt-get install -y rsync doxygen
         # install nvm
         touch $HOME/.bashrc

.github/workflows/format_push.yml

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

.github/workflows/regen.yml

@@ -21,6 +21,10 @@ jobs:
 
     - uses: actions/checkout@v4
 
+    - name: Install python reqs
+      run: |
+        python3 -m pip install -r requirements.txt
+
     - name: Run qmk generators
       run: |
         util/regen.sh

.github/workflows/regen_push.yml

@@ -21,12 +21,16 @@ jobs:
 
     - uses: actions/checkout@v4
 
+    - name: Install dependencies
+      run: |
+        pip3 install -r requirements-dev.txt
+
     - name: Run qmk generators
       run: |
         util/regen.sh
         git diff
 
-    - uses: rlespinasse/github-slug-action@v3.x
+    - uses: rlespinasse/github-slug-action@v5
 
     - name: Become QMK Bot
       run: |

.gitignore

@@ -64,6 +64,7 @@ build/
 cmake-build-debug
 CMakeLists.txt
 *.pdf
+*.zip
 
 # Let these ones be user specific, since we have so many different configurations
 *.code-workspace
@@ -103,6 +104,7 @@ secrets.tar
 # Python things
 __pycache__
 .python-version
+*.egg-info
 .venv
 
 # Prerequisites for updating ChibiOS

.vscode/settings.json

@@ -10,6 +10,13 @@
         "**/*.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",
@@ -28,7 +35,23 @@
     "[json]": {
         "editor.formatOnSave": false
     },
-    "clangd.arguments": [
-        "--header-insertion=never"
+    "clangd.arguments": ["--header-insertion=never"],
+    "json.schemas": [
+        {
+            "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,6 +59,7 @@ 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,7 +115,7 @@ endef
 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 
+# resolution of 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))
@@ -254,7 +255,7 @@ endef
 # if we are going to compile all keyboards, match the rest of the rule
 # for each of them
 define PARSE_ALL_KEYBOARDS
-    $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults)))
+    $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell $(QMK_BIN) list-keyboards)))
 endef
 
 # Prints a list of all known keymaps for the given keyboard
@@ -446,7 +447,7 @@ git-submodules: git-submodule
 
 .PHONY: list-keyboards
 list-keyboards:
-	$(QMK_BIN) list-keyboards --no-resolve-defaults | tr '\n' ' '
+	$(QMK_BIN) list-keyboards | tr '\n' ' '
 
 .PHONY: list-tests
 list-tests:
@@ -454,7 +455,7 @@ list-tests:
 
 .PHONY: generate-keyboards-file
 generate-keyboards-file:
-	$(QMK_BIN) list-keyboards --no-resolve-defaults
+	$(QMK_BIN) list-keyboards
 
 .PHONY: clean
 clean:

builddefs/build_full_test.mk

@@ -25,8 +25,6 @@ $(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,6 +11,7 @@ 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
@@ -97,21 +98,12 @@ endif
 
 
 # Pull in rules.mk files from all our subfolders
-ifneq ("$(wildcard $(KEYBOARD_PATH_5)/rules.mk)","")
-    include $(KEYBOARD_PATH_5)/rules.mk
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_4)/rules.mk)","")
-    include $(KEYBOARD_PATH_4)/rules.mk
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_3)/rules.mk)","")
-    include $(KEYBOARD_PATH_3)/rules.mk
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_2)/rules.mk)","")
-    include $(KEYBOARD_PATH_2)/rules.mk
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_1)/rules.mk)","")
-    include $(KEYBOARD_PATH_1)/rules.mk
-endif
+-include $(KEYBOARD_PATH_5)/rules.mk
+-include $(KEYBOARD_PATH_4)/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)","")
@@ -260,6 +252,9 @@ 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))
@@ -280,10 +275,19 @@ $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.h: $(KEYMAP_JSON) $(D
 	$(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
-
+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
 
@@ -487,21 +491,11 @@ ifneq ("$(CONVERTER)","")
 endif
 
 # Pull in post_rules.mk files from all our subfolders
-ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_rules.mk)","")
-    include $(KEYBOARD_PATH_1)/post_rules.mk
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_2)/post_rules.mk)","")
-    include $(KEYBOARD_PATH_2)/post_rules.mk
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_3)/post_rules.mk)","")
-    include $(KEYBOARD_PATH_3)/post_rules.mk
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_4)/post_rules.mk)","")
-    include $(KEYBOARD_PATH_4)/post_rules.mk
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_rules.mk)","")
-    include $(KEYBOARD_PATH_5)/post_rules.mk
-endif
+-include $(KEYBOARD_PATH_1)/post_rules.mk
+-include $(KEYBOARD_PATH_2)/post_rules.mk
+-include $(KEYBOARD_PATH_3)/post_rules.mk
+-include $(KEYBOARD_PATH_4)/post_rules.mk
+-include $(KEYBOARD_PATH_5)/post_rules.mk
 
 define post_rules_mk_community_module_includer
 	ifneq ("$(wildcard $(1)/post_rules.mk)","")

builddefs/build_test.mk

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

builddefs/common_features.mk

@@ -29,6 +29,10 @@ QUANTUM_SRC += \
     $(QUANTUM_DIR)/logging/debug.c \
     $(QUANTUM_DIR)/logging/sendchar.c \
     $(QUANTUM_DIR)/process_keycode/process_default_layer.c \
+    $(QUANTUM_DIR)/process_keycode/process_oneshot.c \
+    $(QUANTUM_DIR)/process_keycode/process_quantum.c \
+
+include $(QUANTUM_DIR)/nvm/rules.mk
 
 VPATH += $(QUANTUM_DIR)/logging
 # Fall back to lib/printf if there is no platform provided print
@@ -45,6 +49,10 @@ else ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), api)
     OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
 endif
 
+ifeq ($(strip $(XAP_ENABLE)), yes)
+    include $(BUILDDEFS_PATH)/xap.mk
+endif
+
 AUDIO_ENABLE ?= no
 ifeq ($(strip $(AUDIO_ENABLE)), yes)
     ifeq ($(PLATFORM),CHIBIOS)
@@ -169,80 +177,82 @@ endif
 
 VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling legacy_stm32_flash
 EEPROM_DRIVER ?= vendor
-ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
+ifneq ($(strip $(EEPROM_DRIVER)),none)
+  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
-  OPT_DEFS += -DEEPROM_ENABLE
-  COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
-  COMMON_VPATH += $(DRIVER_PATH)/eeprom
-  COMMON_VPATH += $(PLATFORM_COMMON_DIR)
-  ifeq ($(strip $(EEPROM_DRIVER)), custom)
-    # Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
-    SRC += eeprom_driver.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)
-    # Wear-leveling EEPROM implementation
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-    SRC += eeprom_driver.c eeprom_wear_leveling.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
-    # External I2C EEPROM implementation
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
-    I2C_DRIVER_REQUIRED = yes
-    SRC += eeprom_driver.c eeprom_i2c.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), spi)
-    # External SPI EEPROM implementation
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
-    SPI_DRIVER_REQUIRED = yes
-    SRC += eeprom_driver.c eeprom_spi.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
-    # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
-    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
-    COMMON_VPATH += $(DRIVER_PATH)/flash
-    SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), transient)
-    # Transient EEPROM implementation -- no data storage but provides runtime area for it
-    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
-    SRC += eeprom_driver.c eeprom_transient.c
-  else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
-    # Vendor-implemented EEPROM
-    OPT_DEFS += -DEEPROM_VENDOR
-    ifeq ($(PLATFORM),AVR)
-      # Automatically provided by avr-libc, nothing required
-    else ifeq ($(PLATFORM),CHIBIOS)
-      ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
-        # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
-        COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
-        COMMON_VPATH += $(DRIVER_PATH)/flash
-        SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
-      else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G4xx WB32F3G71xx WB32FQ95xx AT32F415 GD32VF103),)
-        # Wear-leveling EEPROM implementation, backed by MCU flash
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-        SRC += eeprom_driver.c eeprom_wear_leveling.c
-        WEAR_LEVELING_DRIVER ?= embedded_flash
-      else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
-        # True EEPROM on STM32L0xx, L1xx
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
-        SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
-      else ifneq ($(filter $(MCU_SERIES),RP2040),)
-        # Wear-leveling EEPROM implementation, backed by RP2040 flash
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-        SRC += eeprom_driver.c eeprom_wear_leveling.c
-        WEAR_LEVELING_DRIVER ?= rp2040_flash
-      else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
-        # Teensy EEPROM implementations
-        OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
-        SRC += eeprom_kinetis_flexram.c
-      else
-        # Fall back to transient, i.e. non-persistent
-        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
-        SRC += eeprom_driver.c eeprom_transient.c
+  else
+    OPT_DEFS += -DEEPROM_ENABLE
+    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
+    COMMON_VPATH += $(DRIVER_PATH)/eeprom
+    COMMON_VPATH += $(PLATFORM_COMMON_DIR)
+    ifeq ($(strip $(EEPROM_DRIVER)), custom)
+      # Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
+      SRC += eeprom_driver.c
+    else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)
+      # Wear-leveling EEPROM implementation
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+      SRC += eeprom_driver.c eeprom_wear_leveling.c
+    else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
+      # External I2C EEPROM implementation
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
+      I2C_DRIVER_REQUIRED = yes
+      SRC += eeprom_driver.c eeprom_i2c.c
+    else ifeq ($(strip $(EEPROM_DRIVER)), spi)
+      # External SPI EEPROM implementation
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
+      SPI_DRIVER_REQUIRED = yes
+      SRC += eeprom_driver.c eeprom_spi.c
+    else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
+      # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
+      COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+      COMMON_VPATH += $(DRIVER_PATH)/flash
+      SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
+    else ifeq ($(strip $(EEPROM_DRIVER)), transient)
+      # Transient EEPROM implementation -- no data storage but provides runtime area for it
+      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
+      SRC += eeprom_driver.c eeprom_transient.c
+    else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
+      # Vendor-implemented EEPROM
+      OPT_DEFS += -DEEPROM_VENDOR
+      ifeq ($(PLATFORM),AVR)
+        # Automatically provided by avr-libc, nothing required
+      else ifeq ($(PLATFORM),CHIBIOS)
+        ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
+          # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
+          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
+          COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+          COMMON_VPATH += $(DRIVER_PATH)/flash
+          SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
+        else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G0xx STM32G4xx WB32F3G71xx WB32FQ95xx AT32F415 GD32VF103),)
+          # Wear-leveling EEPROM implementation, backed by MCU flash
+          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+          SRC += eeprom_driver.c eeprom_wear_leveling.c
+          WEAR_LEVELING_DRIVER ?= embedded_flash
+        else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
+          # True EEPROM on STM32L0xx, L1xx
+          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
+          SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
+        else ifneq ($(filter $(MCU_SERIES),RP2040),)
+          # Wear-leveling EEPROM implementation, backed by RP2040 flash
+          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+          SRC += eeprom_driver.c eeprom_wear_leveling.c
+          WEAR_LEVELING_DRIVER ?= rp2040_flash
+        else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
+          # Teensy EEPROM implementations
+          OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
+          SRC += eeprom_kinetis_flexram.c
+        else
+          # Fall back to transient, i.e. non-persistent
+          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
+          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
@@ -263,18 +273,14 @@ 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
@@ -633,6 +639,30 @@ ifeq ($(strip $(VIA_ENABLE)), yes)
     RAW_ENABLE := yes
     BOOTMAGIC_ENABLE := yes
     TRI_LAYER_ENABLE := yes
+    ifeq ($(strip $(VIA_INSECURE)), yes)
+        OPT_DEFS += -DVIA_INSECURE
+    endif
+endif
+
+ifeq ($(strip $(XAP_ENABLE)), yes)
+    ifeq ($(strip $(VIA_ENABLE)), yes)
+        $(error 'XAP_ENABLE = $(XAP_ENABLE)' deprecates 'VIA_ENABLE = $(VIA_ENABLE)'. Please set 'VIA_ENABLE = no')
+    endif
+
+    DYNAMIC_KEYMAP_ENABLE := yes
+    FNV_ENABLE := yes
+    SECURE_ENABLE := yes
+    BOOTMAGIC_ENABLE := yes
+
+    OPT_DEFS += -DXAP_ENABLE
+    OPT_DEFS += -DBOOTLOADER_JUMP_SUPPORTED
+    VPATH += $(QUANTUM_DIR)/xap
+    SRC += $(QUANTUM_DIR)/xap/xap.c $(QUANTUM_DIR)/xap/xap_handlers.c
+endif
+
+ifeq ($(strip $(RAW_ENABLE)), yes)
+    OPT_DEFS += -DRAW_ENABLE
+    SRC += raw_hid.c
 endif
 
 ifeq ($(strip $(DYNAMIC_KEYMAP_ENABLE)), yes)
@@ -717,6 +747,7 @@ 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
 
@@ -888,19 +919,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 += outputselect.c process_connection.c
+    SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), bluefruit_le)
         SPI_DRIVER_REQUIRED = yes
-        ANALOG_DRIVER_REQUIRED = yes
-        SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
+        SRC += $(DRIVER_PATH)/bluetooth/bluetooth_drivers.c
         SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp
     endif
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), rn42)
         UART_DRIVER_REQUIRED = yes
-        SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
+        SRC += $(DRIVER_PATH)/bluetooth/bluetooth_drivers.c
         SRC += $(DRIVER_PATH)/bluetooth/rn42.c
     endif
 endif
@@ -934,6 +965,28 @@ 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

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)): INIT_HOOK_CFLAGS += -include $(TOP_DIR)/tmk_core/protocol/chibios/init_hooks.h
+$(INTERMEDIATE_OUTPUT)/$(patsubst %.c,%.o,$(patsubst ./%,%,$1)): FILE_SPECIFIC_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) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
+	$$(eval CMD := $$(CC_EXEC) -c $$($1_CFLAGS) $$(FILE_SPECIFIC_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
     ifneq ($$(DUMP_C_MACROS),)
-	$$(eval CMD := $$(CC) -E -dM $$($1_CFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$<)
+	$$(eval CMD := $$(CC) -E -dM $$($1_CFLAGS) $$(FILE_SPECIFIC_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) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
+	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(FILE_SPECIFIC_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) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
+	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(FILE_SPECIFIC_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
 
 # Assemble: create object files from assembler source files.

builddefs/converters.mk

@@ -1,10 +1,3 @@
-# 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.15",
+    "vite": "^5.4.19",
     "vitepress": "^1.1.0",
     "vitepress-plugin-tabs": "^0.5.0",
     "vue": "^3.4.24"

builddefs/docsgen/yarn.lock

@@ -766,10 +766,10 @@ 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.15:
-  version "5.4.15"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.15.tgz#2941547f10ebb4bf9b0fa0da863c06711eb7e5e5"
-  integrity sha512-6ANcZRivqL/4WtwPGTKNaosuNJr5tWiftOC7liM7G9+rMb8+oeJeyzymDu4rTN93seySBmbjSfsS3Vzr19KNtA==
+vite@^5.2.9, vite@^5.4.19:
+  version "5.4.19"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.19.tgz#20efd060410044b3ed555049418a5e7d1998f959"
+  integrity sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==
   dependencies:
     esbuild "^0.21.3"
     postcss "^8.4.43"

builddefs/generic_features.mk

@@ -25,6 +25,7 @@ GENERIC_FEATURES = \
     CAPS_WORD \
     COMBO \
     COMMAND \
+    CONNECTION \
     CRC \
     DEFERRED_EXEC \
     DIGITIZER \
@@ -34,6 +35,7 @@ GENERIC_FEATURES = \
     DYNAMIC_TAPPING_TERM \
     GRAVE_ESC \
     HAPTIC \
+    KEYCODE_STRING \
     KEY_LOCK \
     KEY_OVERRIDE \
     LAYER_LOCK \
@@ -60,6 +62,7 @@ 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

@@ -0,0 +1,11 @@
+# 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)
+, := ,

builddefs/xap.mk

@@ -0,0 +1,44 @@
+# Copyright 2022 Nick Brassel (@tzarc)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+XAP_FILES := $(shell ls -1 data/xap/* | sort | xargs echo)
+ifneq ("$(wildcard $(KEYBOARD_PATH_1)/xap.hjson)","")
+	XAP_FILES += $(KEYBOARD_PATH_1)/xap.hjson
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_2)/xap.hjson)","")
+	XAP_FILES += $(KEYBOARD_PATH_2)/xap.hjson
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_3)/xap.hjson)","")
+	XAP_FILES += $(KEYBOARD_PATH_3)/xap.hjson
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_4)/xap.hjson)","")
+	XAP_FILES += $(KEYBOARD_PATH_4)/xap.hjson
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_5)/xap.hjson)","")
+	XAP_FILES += $(KEYBOARD_PATH_5)/xap.hjson
+endif
+ifneq ("$(wildcard $(KEYMAP_PATH)/xap.hjson)","")
+	XAP_FILES += $(KEYMAP_PATH)/xap.hjson
+endif
+ifneq ("$(wildcard $(USER_NAME)/xap.hjson)","")
+	XAP_FILES += $(USER_NAME)/xap.hjson
+endif
+
+$(INTERMEDIATE_OUTPUT)/src/config_blob_gz.h: $(INFO_JSON_FILES)
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) xap-generate-qmk-blob-h -o "$(INTERMEDIATE_OUTPUT)/src/config_blob_gz.h" -kb $(KEYBOARD) -km $(KEYMAP))
+	@$(BUILD_CMD)
+
+$(INTERMEDIATE_OUTPUT)/src/xap_generated.inl: $(XAP_FILES)
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) xap-generate-qmk-inc -o "$(INTERMEDIATE_OUTPUT)/src/xap_generated.inl" -kb $(KEYBOARD) -km $(KEYMAP))
+	@$(BUILD_CMD)
+
+$(INTERMEDIATE_OUTPUT)/src/xap_generated.h: $(XAP_FILES)
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) xap-generate-qmk-h -o "$(INTERMEDIATE_OUTPUT)/src/xap_generated.h" -kb $(KEYBOARD) -km $(KEYMAP))
+	@$(BUILD_CMD)
+
+generated-files: $(INTERMEDIATE_OUTPUT)/src/config_blob_gz.h $(INTERMEDIATE_OUTPUT)/src/xap_generated.inl $(INTERMEDIATE_OUTPUT)/src/xap_generated.h
+
+VPATH += $(INTERMEDIATE_OUTPUT)/src

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

@@ -593,4 +593,4 @@
             "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_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/lighting/led_matrix_0.0.1.hjson

@@ -0,0 +1,82 @@
+{
+    "groups": {
+        "reactive": {
+            "define": "LED_MATRIX_KEYREACTIVE_ENABLED"
+        }
+    },
+    "effects": {
+        "0x00": {
+            "key": "SOLID"
+        },
+        "0x01": {
+            "key": "ALPHAS_MODS"
+        },
+        "0x02": {
+            "key": "BREATHING"
+        },
+        "0x03": {
+            "key": "BAND"
+        },
+        "0x04": {
+            "key": "BAND_PINWHEEL"
+        },
+        "0x05": {
+            "key": "BAND_SPIRAL"
+        },
+        "0x06": {
+            "key": "CYCLE_LEFT_RIGHT"
+        },
+        "0x07": {
+            "key": "CYCLE_UP_DOWN"
+        },
+        "0x08": {
+            "key": "CYCLE_OUT_IN"
+        },
+        "0x09": {
+            "key": "DUAL_BEACON"
+        },
+        "0x0A": {
+            "key": "WAVE_LEFT_RIGHT"
+        },
+        "0x0B": {
+            "key": "WAVE_UP_DOWN"
+        },
+
+        "0x0C": {
+            "key": "SOLID_REACTIVE_SIMPLE",
+            "group": "reactive"
+        },
+        "0x0D": {
+            "key": "SOLID_REACTIVE_WIDE",
+            "group": "reactive"
+        },
+        "0x0E": {
+            "key": "SOLID_REACTIVE_MULTIWIDE",
+            "group": "reactive"
+        },
+        "0x0F": {
+            "key": "SOLID_REACTIVE_CROSS",
+            "group": "reactive"
+        },
+        "0x10": {
+            "key": "SOLID_REACTIVE_MULTICROSS",
+            "group": "reactive"
+        },
+        "0x11": {
+            "key": "SOLID_REACTIVE_NEXUS",
+            "group": "reactive"
+        },
+        "0x12": {
+            "key": "SOLID_REACTIVE_MULTINEXUS",
+            "group": "reactive"
+        },
+        "0x13": {
+            "key": "SOLID_SPLASH",
+            "group": "reactive"
+        },
+        "0x14": {
+            "key": "SOLID_MULTISPLASH",
+            "group": "reactive"
+        }
+    }
+}

data/constants/lighting/rgb_matrix_0.0.1.hjson

@@ -0,0 +1,175 @@
+{
+    "groups": {
+        "framebuffer": {
+            "define": "RGB_MATRIX_FRAMEBUFFER_EFFECTS"
+        },
+        "reactive": {
+            "define": "RGB_MATRIX_KEYREACTIVE_ENABLED"
+        }
+    },
+    "effects": {
+        "0x00": {
+            "key": "SOLID_COLOR"
+        },
+        "0x01": {
+            "key": "ALPHAS_MODS"
+        },
+        "0x02": {
+            "key": "GRADIENT_UP_DOWN"
+        },
+        "0x03": {
+            "key": "GRADIENT_LEFT_RIGHT"
+        },
+        "0x04": {
+            "key": "BREATHING"
+        },
+        "0x05": {
+            "key": "BAND_SAT"
+        },
+        "0x06": {
+            "key": "BAND_VAL"
+        },
+        "0x07": {
+            "key": "BAND_PINWHEEL_SAT"
+        },
+        "0x08": {
+            "key": "BAND_PINWHEEL_VAL"
+        },
+        "0x09": {
+            "key": "BAND_SPIRAL_SAT"
+        },
+        "0x0A": {
+            "key": "BAND_SPIRAL_VAL"
+        },
+        "0x0B": {
+            "key": "CYCLE_ALL"
+        },
+        "0x0C": {
+            "key": "CYCLE_LEFT_RIGHT"
+        },
+        "0x0D": {
+            "key": "CYCLE_UP_DOWN"
+        },
+        "0x0E": {
+            "key": "CYCLE_OUT_IN"
+        },
+        "0x0F": {
+            "key": "CYCLE_OUT_IN_DUAL"
+        },
+        "0x10": {
+            "key": "RAINBOW_MOVING_CHEVRON"
+        },
+        "0x11": {
+            "key": "CYCLE_PINWHEEL"
+        },
+        "0x12": {
+            "key": "CYCLE_SPIRAL"
+        },
+        "0x13": {
+            "key": "DUAL_BEACON"
+        },
+        "0x14": {
+            "key": "RAINBOW_BEACON"
+        },
+        "0x15": {
+            "key": "RAINBOW_PINWHEELS"
+        },
+        "0x16": {
+            "key": "RAINDROPS"
+        },
+        "0x17": {
+            "key": "JELLYBEAN_RAINDROPS"
+        },
+        "0x18": {
+            "key": "HUE_BREATHING"
+        },
+        "0x19": {
+            "key": "HUE_PENDULUM"
+        },
+        "0x1A": {
+            "key": "HUE_WAVE"
+        },
+        "0x1B": {
+            "key": "PIXEL_FRACTAL"
+        },
+        "0x1C": {
+            "key": "PIXEL_FLOW"
+        },
+        "0x1D": {
+            "key": "PIXEL_RAIN"
+        },
+
+        "0x1E": {
+            "key": "TYPING_HEATMAP",
+            "group": "framebuffer"
+        },
+        "0x1F": {
+            "key": "DIGITAL_RAIN",
+            "group": "framebuffer"
+        },
+
+        "0x20": {
+            "key": "SOLID_REACTIVE_SIMPLE",
+            "group": "reactive"
+        },
+        "0x21": {
+            "key": "SOLID_REACTIVE",
+            "group": "reactive"
+        },
+        "0x22": {
+            "key": "SOLID_REACTIVE_WIDE",
+            "group": "reactive"
+        },
+        "0x23": {
+            "key": "SOLID_REACTIVE_MULTIWIDE",
+            "group": "reactive"
+        },
+        "0x24": {
+            "key": "SOLID_REACTIVE_CROSS",
+            "group": "reactive"
+        },
+        "0x25": {
+            "key": "SOLID_REACTIVE_MULTICROSS",
+            "group": "reactive"
+        },
+        "0x26": {
+            "key": "SOLID_REACTIVE_NEXUS",
+            "group": "reactive"
+        },
+        "0x27": {
+            "key": "SOLID_REACTIVE_MULTINEXUS",
+            "group": "reactive"
+        },
+        "0x28": {
+            "key": "SPLASH",
+            "group": "reactive"
+        },
+        "0x29": {
+            "key": "MULTISPLASH",
+            "group": "reactive"
+        },
+        "0x2A": {
+            "key": "SOLID_SPLASH",
+            "group": "reactive"
+        },
+        "0x2B": {
+            "key": "SOLID_MULTISPLASH",
+            "group": "reactive"
+        },
+        "0x2C": {
+            "key": "FLOWER_BLOOMING"
+        },
+        "0x2D": {
+            "key": "STARLIGHT"
+        },
+        "0x2E": {
+            "key": "STARLIGHT_DUAL_SAT"
+        },
+        "0x2F": {
+            "key": "STARLIGHT_DUAL_HUE"
+        },
+        "0x30": {
+            "key": "RIVERFLOW"
+        }
+    }
+}

data/constants/lighting/rgblight_0.0.1.hjson

@@ -0,0 +1,130 @@
+{
+    "effects": {
+        "0x00": {
+            "key": "STATIC_LIGHT"
+        },
+        "0x01": {
+            "key": "BREATHING"
+        },
+        "0x02": {
+            "key": "BREATHING_2"
+        },
+        "0x03": {
+            "key": "BREATHING_3"
+        },
+        "0x04": {
+            "key": "BREATHING_4"
+        },
+        "0x05": {
+            "key": "RAINBOW_MOOD"
+        },
+        "0x06": {
+            "key": "RAINBOW_MOOD_2"
+        },
+        "0x07": {
+            "key": "RAINBOW_MOOD_3"
+        },
+        "0x08": {
+            "key": "RAINBOW_SWIRL"
+        },
+        "0x09": {
+            "key": "RAINBOW_SWIRL_2"
+        },
+        "0x0A": {
+            "key": "RAINBOW_SWIRL_3"
+        },
+        "0x0B": {
+            "key": "RAINBOW_SWIRL_4"
+        },
+        "0x0C": {
+            "key": "RAINBOW_SWIRL_5"
+        },
+        "0x0D": {
+            "key": "RAINBOW_SWIRL_6"
+        },
+        "0x0E": {
+            "key": "SNAKE"
+        },
+        "0x0F": {
+            "key": "SNAKE_2"
+        },
+        "0x10": {
+            "key": "SNAKE_3"
+        },
+        "0x11": {
+            "key": "SNAKE_4"
+        },
+        "0x12": {
+            "key": "SNAKE_5"
+        },
+        "0x13": {
+            "key": "SNAKE_6"
+        },
+        "0x14": {
+            "key": "KNIGHT"
+        },
+        "0x15": {
+            "key": "KNIGHT_2"
+        },
+        "0x16": {
+            "key": "KNIGHT_3"
+        },
+        "0x17": {
+            "key": "CHRISTMAS"
+        },
+        "0x18": {
+            "key": "STATIC_GRADIENT"
+        },
+        "0x19": {
+            "key": "STATIC_GRADIENT_2"
+        },
+        "0x1A": {
+            "key": "STATIC_GRADIENT_3"
+        },
+        "0x1B": {
+            "key": "STATIC_GRADIENT_4"
+        },
+        "0x1C": {
+            "key": "STATIC_GRADIENT_5"
+        },
+        "0x1D": {
+            "key": "STATIC_GRADIENT_6"
+        },
+        "0x1E": {
+            "key": "STATIC_GRADIENT_7"
+        },
+        "0x1F": {
+            "key": "STATIC_GRADIENT_8"
+        },
+        "0x20": {
+            "key": "STATIC_GRADIENT_9"
+        },
+        "0x21": {
+            "key": "STATIC_GRADIENT_10"
+        },
+        "0x22": {
+            "key": "RGB_TEST"
+        },
+        "0x23": {
+            "key": "ALTERNATING"
+        },
+        "0x24": {
+            "key": "TWINKLE"
+        },
+        "0x25": {
+            "key": "TWINKLE_2"
+        },
+        "0x26": {
+            "key": "TWINKLE_3"
+        },
+        "0x27": {
+            "key": "TWINKLE_4"
+        },
+        "0x28": {
+            "key": "TWINKLE_5"
+        },
+        "0x29": {
+            "key": "TWINKLE_6"
+        }
+    }
+}

data/constants/module_hooks/1.1.0.hjson

@@ -0,0 +1,55 @@
+{
+    pointing_device_init: {
+        ret_type: void
+        args: void
+        guard: defined(POINTING_DEVICE_ENABLE)
+    }
+    pointing_device_task: {
+        ret_type: report_mouse_t
+        args: report_mouse_t mouse_report
+        call_params: mouse_report
+        guard: defined(POINTING_DEVICE_ENABLE)
+        header: report.h
+    }
+    rgb_matrix_indicators: {
+        ret_type: bool
+        args: void
+        guard: defined(RGB_MATRIX_ENABLE)
+        header: rgb_matrix.h
+    }
+    rgb_matrix_indicators_advanced: {
+        ret_type: bool
+        args: uint8_t led_min, uint8_t led_max
+        call_params: led_min, led_max
+        guard: defined(RGB_MATRIX_ENABLE)
+        header: rgb_matrix.h
+    }
+    led_matrix_indicators: {
+        ret_type: bool
+        args: void
+        guard: defined(LED_MATRIX_ENABLE)
+        header: led_matrix.h
+    }
+    led_matrix_indicators_advanced: {
+        ret_type: bool
+        args: uint8_t led_min, uint8_t led_max
+        call_params: led_min, led_max
+        guard: defined(LED_MATRIX_ENABLE)
+        header: led_matrix.h
+    }
+    default_layer_state_set: {
+        ret_type: layer_state_t
+        args: layer_state_t state
+        call_params: state
+        guard: !defined(NO_ACTION_LAYER)
+        header: action_layer.h
+    }
+    layer_state_set: {
+        ret_type: layer_state_t
+        args: layer_state_t state
+        call_params: state
+        guard: !defined(NO_ACTION_LAYER)
+        header: action_layer.h
+    }
+
+}

data/constants/module_hooks/1.1.1.hjson

@@ -0,0 +1,3 @@
+{
+    // This version exists to signify addition of LED/RGB effect support.
+}

data/mappings/info_config.hjson

@@ -64,6 +64,9 @@
     "WEAR_LEVELING_BACKING_SIZE": {"info_key": "eeprom.wear_leveling.backing_size", "value_type": "int", "to_json": false},
     "WEAR_LEVELING_LOGICAL_SIZE": {"info_key": "eeprom.wear_leveling.logical_size", "value_type": "int", "to_json": false},
 
+    // host
+    "NKRO_DEFAULT_ON": {"info_key": "host.default.nkro", "value_type": "bool"},
+
     // Layer locking
     "LAYER_LOCK_IDLE_TIMEOUT": {"info_key": "layer_lock.timeout", "value_type": "int"},
 
@@ -117,6 +120,7 @@
     "MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "flag"},
     "MATRIX_INPUT_PRESSED_STATE": {"info_key": "matrix_pins.input_pressed_state", "value_type": "int"},
     "MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"},
+    "MATRIX_MASKED": {"info_key": "matrix_pins.masked", "value_type": "flag"},
 
     // Mouse Keys
     "MOUSEKEY_DELAY": {"info_key": "mousekey.delay", "value_type": "int"},
@@ -201,6 +205,7 @@
 
     // Tapping
     "CHORDAL_HOLD": {"info_key": "tapping.chordal_hold", "value_type": "flag"},
+    "FLOW_TAP_TERM": {"info_key": "tapping.flow_tap_term", "value_type": "int"},
     "HOLD_ON_OTHER_KEY_PRESS": {"info_key": "tapping.hold_on_other_key_press", "value_type": "flag"},
     "HOLD_ON_OTHER_KEY_PRESS_PER_KEY": {"info_key": "tapping.hold_on_other_key_press_per_key", "value_type": "flag"},
     "PERMISSIVE_HOLD": {"info_key": "tapping.permissive_hold", "value_type": "flag"},
@@ -214,7 +219,6 @@
     "TAPPING_TOGGLE": {"info_key": "tapping.toggle", "value_type": "int"},
 
     // USB
-    "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "flag"},
     "USB_MAX_POWER_CONSUMPTION": {"info_key": "usb.max_power", "value_type": "int"},
     "USB_POLLING_INTERVAL_MS": {"info_key": "usb.polling_interval", "value_type": "int"},
     "USB_SUSPEND_WAKEUP_DELAY": {"info_key": "usb.suspend_wakeup_delay", "value_type": "int"},
@@ -252,6 +256,7 @@
     "PRODUCT": {"info_key": "keyboard_name", "warn_duplicate": false, "value_type": "str", "deprecated": true, "replace_with": "`keyboard_name` in info.json"},
     "PRODUCT_ID": {"info_key": "usb.pid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.pid` in info.json"},
     "VENDOR_ID": {"info_key": "usb.vid", "value_type": "hex", "deprecated": true, "replace_with": "`usb.vid` in info.json"},
+    "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "flag", "deprecated": true, "replace_with": "`host.default.nkro` in info.json"},
 
     // Items we want flagged in lint
     "VIAL_KEYBOARD_UID": {"info_key": "_invalid.vial_uid", "invalid": true},