Merge remote-tracking branch 'upstream/develop' into data-repository

qmk · Jan 27, 2025 · 3ad737c · 3ad737c
2 parents b8ed900 + ee63d39
commit 3ad737c
Show file tree

Hide file tree

Showing 288 changed files with 3,842 additions and 3,598 deletions.
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
@@ -637,6 +637,10 @@ ifeq ($(strip $(VIA_ENABLE)), yes)
     TRI_LAYER_ENABLE := yes
 endif
 
+ifeq ($(strip $(DYNAMIC_KEYMAP_ENABLE)), yes)
+    SEND_STRING_ENABLE := yes
+endif
+
 VALID_CUSTOM_MATRIX_TYPES:= yes lite no
 
 CUSTOM_MATRIX ?= no
@@ -942,6 +946,8 @@ 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)

diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
@@ -55,5 +55,6 @@
     // Items we want flagged in lint
     "CTPC": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"},
     "CONVERT_TO_PROTON_C": {"info_key": "_deprecated.ctpc", "deprecated": true, "replace_with": "CONVERT_TO=proton_c"},
+    "DEFAULT_FOLDER": {"info_key": "_deprecated.default_folder", "deprecated": true},
     "VIAL_ENABLE": {"info_key": "_invalid.vial", "invalid": true}
 }