Branch point for 2026q2 Breaking Change

* Allow custom data sync for community modules

* Stub out community_config.h codegen

* Fix SPLIT_TRANSACTION_RPC logic

Makefile

@@ -190,41 +190,9 @@ endef
 # Parses a rule in the format <keymap>:<target>
 # the keyboard is already known when entering this function
 define PARSE_KEYBOARD
-    # If we want to compile the default subproject, then we need to
-    # include the correct makefile to determine the actual name of it
     CURRENT_KB := $1
 
-    # 5/4/3/2/1
+    KEYMAPS := $(shell $(QMK_BIN) list-keymaps --keyboard $1)
-    KEYBOARD_FOLDER_PATH_1 := $$(CURRENT_KB)
-    KEYBOARD_FOLDER_PATH_2 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_1)))
-    KEYBOARD_FOLDER_PATH_3 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_2)))
-    KEYBOARD_FOLDER_PATH_4 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_3)))
-    KEYBOARD_FOLDER_PATH_5 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_4)))
-
-    KEYMAPS :=
-    # get a list of all keymaps
-    KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_1)/keymaps/*/.)))
-    KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_2)/keymaps/*/.)))
-    KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/keymaps/*/.)))
-    KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/keymaps/*/.)))
-    KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/keymaps/*/.)))
-
-    ifneq ($(QMK_USERSPACE),)
-        KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_1)/keymaps/*/.)))
-        KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_2)/keymaps/*/.)))
-        KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/keymaps/*/.)))
-        KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/keymaps/*/.)))
-        KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/keymaps/*/.)))
-    endif
-
-    KEYBOARD_LAYOUTS := $(shell $(QMK_BIN) list-layouts --keyboard $1)
-    LAYOUT_KEYMAPS :=
-    $$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/layouts/*/$$(LAYOUT)/*/.)))))
-    ifneq ($(QMK_USERSPACE),)
-        $$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(QMK_USERSPACE)/layouts/$$(LAYOUT)/*/.)))))
-    endif
-
-    KEYMAPS := $$(sort $$(KEYMAPS) $$(LAYOUT_KEYMAPS))
 
     # if the rule after removing the start of it is empty (we haven't specified a kemap or target)
     # compile all the keymaps

builddefs/build_json.mk

@@ -1,36 +0,0 @@
-# Look for a json keymap file
-ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.json)","")
-    KEYMAP_JSON := $(MAIN_KEYMAP_PATH_5)/keymap.json
-    KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_5)
-else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.json)","")
-    KEYMAP_JSON := $(MAIN_KEYMAP_PATH_4)/keymap.json
-    KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_4)
-else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.json)","")
-    KEYMAP_JSON := $(MAIN_KEYMAP_PATH_3)/keymap.json
-    KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_3)
-else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.json)","")
-    KEYMAP_JSON := $(MAIN_KEYMAP_PATH_2)/keymap.json
-    KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_2)
-else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.json)","")
-    KEYMAP_JSON := $(MAIN_KEYMAP_PATH_1)/keymap.json
-    KEYMAP_JSON_PATH := $(MAIN_KEYMAP_PATH_1)
-endif
-
-ifneq ($(QMK_USERSPACE),)
-    ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/keymap.json)","")
-        KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/keymap.json
-        KEYMAP_JSON_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)
-    else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/keymap.json)","")
-        KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/keymap.json
-        KEYMAP_JSON_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)
-    else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/keymap.json)","")
-        KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/keymap.json
-        KEYMAP_JSON_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)
-    else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/keymap.json)","")
-        KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/keymap.json
-        KEYMAP_JSON_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)
-    else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/keymap.json)","")
-        KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/keymap.json
-        KEYMAP_JSON_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)
-    endif
-endif

builddefs/build_keyboard.mk

@@ -138,75 +138,12 @@ 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)
-MAIN_KEYMAP_PATH_2 := $(KEYBOARD_PATH_2)/keymaps/$(KEYMAP)
-MAIN_KEYMAP_PATH_3 := $(KEYBOARD_PATH_3)/keymaps/$(KEYMAP)
-MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP)
-MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
-
 # Pull in rules from DD keyboard config
 INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_rules.mk)
 include $(INFO_RULES_MK)
 
-# Check for keymap.json first, so we can regenerate keymap.c
+include $(BUILDDEFS_PATH)/locate_keymap.mk
-include $(BUILDDEFS_PATH)/build_json.mk
+-include $(KEYMAP_PATH)/rules.mk
-
-# Pull in keymap level rules.mk
-ifeq ("$(wildcard $(KEYMAP_PATH))", "")
-    # Look through the possible keymap folders until we find a matching keymap.c
-    ifneq ($(QMK_USERSPACE),)
-        ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/keymap.c)","")
-            -include $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/rules.mk
-            KEYMAP_C := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/keymap.c
-            KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)
-        else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/keymap.c)","")
-            -include $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/rules.mk
-            KEYMAP_C := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/keymap.c
-            KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)
-        else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/keymap.c)","")
-            -include $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/rules.mk
-            KEYMAP_C := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/keymap.c
-            KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)
-        else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/keymap.c)","")
-            -include $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/rules.mk
-            KEYMAP_C := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/keymap.c
-            KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)
-        else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/keymap.c)","")
-            -include $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/rules.mk
-            KEYMAP_C := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/keymap.c
-            KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)
-        endif
-    endif
-    ifeq ($(KEYMAP_PATH),)
-        ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.c)","")
-            -include $(MAIN_KEYMAP_PATH_1)/rules.mk
-            KEYMAP_C := $(MAIN_KEYMAP_PATH_1)/keymap.c
-            KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
-        else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.c)","")
-            -include $(MAIN_KEYMAP_PATH_2)/rules.mk
-            KEYMAP_C := $(MAIN_KEYMAP_PATH_2)/keymap.c
-            KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2)
-        else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.c)","")
-            -include $(MAIN_KEYMAP_PATH_3)/rules.mk
-            KEYMAP_C := $(MAIN_KEYMAP_PATH_3)/keymap.c
-            KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
-        else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.c)","")
-            -include $(MAIN_KEYMAP_PATH_4)/rules.mk
-            KEYMAP_C := $(MAIN_KEYMAP_PATH_4)/keymap.c
-            KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
-        else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.c)","")
-            -include $(MAIN_KEYMAP_PATH_5)/rules.mk
-            KEYMAP_C := $(MAIN_KEYMAP_PATH_5)/keymap.c
-            KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
-        else ifneq ($(LAYOUTS),)
-            # If we haven't found a keymap yet fall back to community layouts
-            include $(BUILDDEFS_PATH)/build_layout.mk
-        else ifeq ("$(wildcard $(KEYMAP_JSON_PATH))", "") # Not finding keymap.c is fine if we found a keymap.json
-            $(call CATASTROPHIC_ERROR,Invalid keymap,Could not find keymap)
-            # this state should never be reached
-        endif
-    endif
-endif
 
 # Have we found a keymap.json?
 ifneq ("$(wildcard $(KEYMAP_JSON))", "")
@@ -217,16 +154,9 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")
         OPT_DEFS += -DOTHER_KEYMAP_C=\"$(OTHER_KEYMAP_C)\"
     endif
 
-    KEYMAP_PATH := $(KEYMAP_JSON_PATH)
-
     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 (and we havent already loaded it for keymap.c)
-        -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)
@@ -257,6 +187,11 @@ include $(COMMUNITY_RULES_MK)
 
 ifneq ($(COMMUNITY_MODULES),)
 
+$(INTERMEDIATE_OUTPUT)/src/community_config.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) generate-community-config-h -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/community_config.h $(KEYMAP_JSON))
+	@$(BUILD_CMD)
+
 $(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))
@@ -287,9 +222,15 @@ $(INTERMEDIATE_OUTPUT)/src/rgb_matrix_community_modules.inc: $(KEYMAP_JSON) $(DD
 	$(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)
 
+$(INTERMEDIATE_OUTPUT)/src/split_transaction_id_community_modules.inc: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) generate-split-transaction-id-community-modules-inc -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/split_transaction_id_community_modules.inc $(KEYMAP_JSON))
+	@$(BUILD_CMD)
+
+COMMUNITY_CONFIG_H = $(INTERMEDIATE_OUTPUT)/src/community_config.h
 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
+generated-files: $(INTERMEDIATE_OUTPUT)/src/community_config.h $(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 $(INTERMEDIATE_OUTPUT)/src/split_transaction_id_community_modules.inc
 
 endif
 
@@ -390,6 +331,10 @@ define config_h_community_module_appender
 endef
 $(foreach module,$(COMMUNITY_MODULE_PATHS),$(eval $(call config_h_community_module_appender,$(module))))
 
+ifneq ($(COMMUNITY_CONFIG_H),)
+    CONFIG_H += $(COMMUNITY_CONFIG_H)
+endif
+
 ifneq ("$(wildcard $(KEYBOARD_PATH_5)/config.h)","")
     CONFIG_H += $(KEYBOARD_PATH_5)/config.h
 endif

builddefs/build_layout.mk

@@ -1,36 +0,0 @@
-LAYOUTS_PATH := layouts
-LAYOUTS_REPOS := $(patsubst %/,%,$(sort $(dir $(wildcard $(LAYOUTS_PATH)/*/))))
-
-ifneq ($(QMK_USERSPACE),)
-    LAYOUTS_REPOS += $(patsubst %/,%,$(QMK_USERSPACE)/$(LAYOUTS_PATH))
-endif
-
-define SEARCH_LAYOUTS_REPO
-    LAYOUT_KEYMAP_PATH := $$(LAYOUTS_REPO)/$$(LAYOUT)/$$(KEYMAP)
-    LAYOUT_KEYMAP_JSON := $$(LAYOUT_KEYMAP_PATH)/keymap.json
-    LAYOUT_KEYMAP_C := $$(LAYOUT_KEYMAP_PATH)/keymap.c
-    ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_JSON))","")
-        KEYMAP_JSON := $$(LAYOUT_KEYMAP_JSON)
-        KEYMAP_JSON_PATH := $$(LAYOUT_KEYMAP_PATH)
-    endif
-    ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","")
-        -include $$(LAYOUT_KEYMAP_PATH)/rules.mk
-        KEYMAP_C := $$(LAYOUT_KEYMAP_C)
-        KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH)
-    endif
-endef
-
-define SEARCH_LAYOUTS
-    $$(foreach LAYOUTS_REPO,$$(LAYOUTS_REPOS),$$(eval $$(call SEARCH_LAYOUTS_REPO)))
-endef
-
-ifneq ($(FORCE_LAYOUT),)
-    ifneq (,$(findstring $(FORCE_LAYOUT),$(LAYOUTS)))
-        $(info Forcing layout: $(FORCE_LAYOUT))
-        LAYOUTS := $(FORCE_LAYOUT)
-    else
-        $(call CATASTROPHIC_ERROR,Invalid layout,Forced layout does not exist)
-    endif
-endif
-
-$(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS)))

builddefs/locate_keymap.mk

@@ -0,0 +1,64 @@
+MAIN_KEYMAP_PATH_1 := $(KEYBOARD_PATH_1)/keymaps/$(KEYMAP)
+MAIN_KEYMAP_PATH_2 := $(KEYBOARD_PATH_2)/keymaps/$(KEYMAP)
+MAIN_KEYMAP_PATH_3 := $(KEYBOARD_PATH_3)/keymaps/$(KEYMAP)
+MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP)
+MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
+
+POTENTIAL_KEYMAP_PATHS += $(MAIN_KEYMAP_PATH_1)
+POTENTIAL_KEYMAP_PATHS += $(MAIN_KEYMAP_PATH_2)
+POTENTIAL_KEYMAP_PATHS += $(MAIN_KEYMAP_PATH_3)
+POTENTIAL_KEYMAP_PATHS += $(MAIN_KEYMAP_PATH_4)
+POTENTIAL_KEYMAP_PATHS += $(MAIN_KEYMAP_PATH_5)
+
+ifneq ($(QMK_USERSPACE),)
+    POTENTIAL_KEYMAP_PATHS += $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)
+    POTENTIAL_KEYMAP_PATHS += $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)
+    POTENTIAL_KEYMAP_PATHS += $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)
+    POTENTIAL_KEYMAP_PATHS += $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)
+    POTENTIAL_KEYMAP_PATHS += $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)
+endif
+
+define SEARCH_POTENTIAL_LOCATION
+    POTENTIAL_DIR := $1
+    ifeq ("$$(wildcard $$(KEYMAP_PATH))", "")
+        POTENTIAL_KEYMAP_JSON := $$(POTENTIAL_DIR)/keymap.json
+        POTENTIAL_KEYMAP_C := $$(POTENTIAL_DIR)/keymap.c
+        ifneq ("$$(wildcard $$(POTENTIAL_KEYMAP_JSON))","")
+            KEYMAP_JSON := $$(POTENTIAL_KEYMAP_JSON)
+            KEYMAP_PATH := $$(POTENTIAL_DIR)
+        endif
+        ifneq ("$$(wildcard $$(POTENTIAL_KEYMAP_C))","")
+            KEYMAP_C := $$(POTENTIAL_KEYMAP_C)
+            KEYMAP_PATH := $$(POTENTIAL_DIR)
+        endif
+    endif
+endef
+
+$(foreach KM_DIR,$(POTENTIAL_KEYMAP_PATHS),$(eval $(call SEARCH_POTENTIAL_LOCATION, $(KM_DIR))))
+
+LAYOUTS_PATH := layouts
+LAYOUTS_REPOS := $(patsubst %/,%,$(sort $(dir $(wildcard $(LAYOUTS_PATH)/*/))))
+
+ifneq ($(QMK_USERSPACE),)
+    LAYOUTS_REPOS += $(patsubst %/,%,$(QMK_USERSPACE)/$(LAYOUTS_PATH))
+endif
+
+define SEARCH_LAYOUTS
+    $$(foreach LAYOUTS_REPO,$$(LAYOUTS_REPOS),$$(eval $$(call SEARCH_POTENTIAL_LOCATION,$$(LAYOUTS_REPO)/$$(LAYOUT)/$$(KEYMAP))))
+endef
+
+ifneq ($(FORCE_LAYOUT),)
+    ifneq (,$(findstring $(FORCE_LAYOUT),$(LAYOUTS)))
+        $(info Forcing layout: $(FORCE_LAYOUT))
+        LAYOUTS := $(FORCE_LAYOUT)
+    else
+        $(call CATASTROPHIC_ERROR,Invalid layout,Forced layout does not exist)
+    endif
+endif
+
+$(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS)))
+
+ifeq ("$$(wildcard $$(KEYMAP_PATH))", "")
+    $(call CATASTROPHIC_ERROR,Invalid keymap,Could not find keymap)
+    # this state should never be reached
+endif

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

@@ -3,6 +3,7 @@
         "0x7480": {
             "group": "audio",
             "key": "QK_AUDIO_ON",
+            "label": "Audio On",
             "aliases": [
                 "AU_ON"
             ]
@@ -10,6 +11,7 @@
         "0x7481": {
             "group": "audio",
             "key": "QK_AUDIO_OFF",
+            "label": "Audio Off",
             "aliases": [
                 "AU_OFF"
             ]
@@ -17,6 +19,7 @@
         "0x7482": {
             "group": "audio",
             "key": "QK_AUDIO_TOGGLE",
+            "label": "Toggle Audio",
             "aliases": [
                 "AU_TOGG"
             ]
@@ -25,6 +28,7 @@
         "0x748A": {
             "group": "audio",
             "key": "QK_AUDIO_CLICKY_TOGGLE",
+            "label": "Toggle Audio Clicky",
             "aliases": [
                 "CK_TOGG"
             ]
@@ -32,6 +36,7 @@
         "0x748B": {
             "group": "audio",
             "key": "QK_AUDIO_CLICKY_ON",
+            "label": "Audio Clicky On",
             "aliases": [
                 "CK_ON"
             ]
@@ -39,6 +44,7 @@
         "0x748C": {
             "group": "audio",
             "key": "QK_AUDIO_CLICKY_OFF",
+            "label": "Audio Clicky Off",
             "aliases": [
                 "CK_OFF"
             ]
@@ -46,6 +52,7 @@
         "0x748D": {
             "group": "audio",
             "key": "QK_AUDIO_CLICKY_UP",
+            "label": "Audio Clicky Up",
             "aliases": [
                 "CK_UP"
             ]
@@ -53,6 +60,7 @@
         "0x748E": {
             "group": "audio",
             "key": "QK_AUDIO_CLICKY_DOWN",
+            "label": "Audio Clicky Down",
             "aliases": [
                 "CK_DOWN"
             ]
@@ -60,6 +68,7 @@
         "0x748F": {
             "group": "audio",
             "key": "QK_AUDIO_CLICKY_RESET",
+            "label": "Audio Clicky Reset",
             "aliases": [
                 "CK_RST"
             ]
@@ -68,6 +77,7 @@
         "0x7490": {
             "group": "audio",
             "key": "QK_MUSIC_ON",
+            "label": "Music On",
             "aliases": [
                 "MU_ON"
             ]
@@ -75,6 +85,7 @@
         "0x7491": {
             "group": "audio",
             "key": "QK_MUSIC_OFF",
+            "label": "Music Off",
             "aliases": [
                 "MU_OFF"
             ]
@@ -82,6 +93,7 @@
         "0x7492": {
             "group": "audio",
             "key": "QK_MUSIC_TOGGLE",
+            "label": "Toggle Music",
             "aliases": [
                 "MU_TOGG"
             ]
@@ -89,6 +101,7 @@
         "0x7493": {
             "group": "audio",
             "key": "QK_MUSIC_MODE_NEXT",
+            "label": "Music Next",
             "aliases": [
                 "MU_NEXT"
             ]
@@ -97,6 +110,7 @@
         "0x7494": {
             "group": "audio",
             "key": "QK_AUDIO_VOICE_NEXT",
+            "label": "Audio Voice Next",
             "aliases": [
                 "AU_NEXT"
             ]
@@ -104,6 +118,7 @@
         "0x7495": {
             "group": "audio",
             "key": "QK_AUDIO_VOICE_PREVIOUS",
+            "label": "Audio Voice Previous",
             "aliases": [
                 "AU_PREV"
             ]

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

@@ -3,7 +3,7 @@
         "0x0000": {
             "group": "internal",
             "key": "KC_NO",
-            "label": "",
+            "label": "N/A",
             "aliases": [
                 "XXXXXXX"
             ]
@@ -11,7 +11,7 @@
         "0x0001": {
             "group": "internal",
             "key": "KC_TRANSPARENT",
-            "label": "",
+            "label": "Transparent",
             "aliases": [
                 "_______",
                 "KC_TRNS"
@@ -634,7 +634,7 @@
         "0x0065": {
             "group": "basic",
             "key": "KC_APPLICATION",
-            "label": "Application",
+            "label": "App",
             "aliases": [
                 "KC_APP"
             ]
@@ -642,7 +642,7 @@
         "0x0066": {
             "group": "basic",
             "key": "KC_KB_POWER",
-            "label": "Application"
+            "label": "Power"
         },
         "0x0067": {
             "group": "basic",
@@ -1068,7 +1068,7 @@
         "0x00A5": {
             "group": "system",
             "key": "KC_SYSTEM_POWER",
-            "label": "System Power Down",
+            "label": "Power",
             "aliases": [
                 "KC_PWR"
             ]
@@ -1076,7 +1076,7 @@
         "0x00A6": {
             "group": "system",
             "key": "KC_SYSTEM_SLEEP",
-            "label": "System Sleep",
+            "label": "Sleep",
             "aliases": [
                 "KC_SLEP"
             ]
@@ -1084,7 +1084,7 @@
         "0x00A7": {
             "group": "system",
             "key": "KC_SYSTEM_WAKE",
-            "label": "System Wake",
+            "label": "Wake",
             "aliases": [
                 "KC_WAKE"
             ]
@@ -1140,7 +1140,7 @@
         "0x00AE": {
             "group": "media",
             "key": "KC_MEDIA_PLAY_PAUSE",
-            "label": "Play/Pause Track",
+            "label": "Play/Pause",
             "aliases": [
                 "KC_MPLY"
             ]
@@ -1148,7 +1148,7 @@
         "0x00AF": {
             "group": "media",
             "key": "KC_MEDIA_SELECT",
-            "label": "Launch Player",
+            "label": "Media",
             "aliases": [
                 "KC_MSEL"
             ]
@@ -1164,12 +1164,12 @@
         "0x00B1": {
             "group": "media",
             "key": "KC_MAIL",
-            "label": "Launch Mail"
+            "label": "Mail",
         },
         "0x00B2": {
             "group": "media",
             "key": "KC_CALCULATOR",
-            "label": "Launch Calculator",
+            "label": "Calculator",
             "aliases": [
                 "KC_CALC"
             ]
@@ -1177,7 +1177,7 @@
         "0x00B3": {
             "group": "media",
             "key": "KC_MY_COMPUTER",
-            "label": "Launch My Computer",
+            "label": "My Computer",
             "aliases": [
                 "KC_MYCM"
             ]
@@ -1185,7 +1185,7 @@
         "0x00B4": {
             "group": "media",
             "key": "KC_WWW_SEARCH",
-            "label": "Browser Search",
+            "label": "Search",
             "aliases": [
                 "KC_WSCH"
             ]
@@ -1193,7 +1193,7 @@
         "0x00B5": {
             "group": "media",
             "key": "KC_WWW_HOME",
-            "label": "Browser Home",
+            "label": "Home",
             "aliases": [
                 "KC_WHOM"
             ]
@@ -1201,7 +1201,7 @@
         "0x00B6": {
             "group": "media",
             "key": "KC_WWW_BACK",
-            "label": "Browser Back",
+            "label": "Back",
             "aliases": [
                 "KC_WBAK"
             ]
@@ -1209,7 +1209,7 @@
         "0x00B7": {
             "group": "media",
             "key": "KC_WWW_FORWARD",
-            "label": "Browser Forward",
+            "label": "Forward",
             "aliases": [
                 "KC_WFWD"
             ]
@@ -1217,7 +1217,7 @@
         "0x00B8": {
             "group": "media",
             "key": "KC_WWW_STOP",
-            "label": "Browser Stop",
+            "label": "Stop",
             "aliases": [
                 "KC_WSTP"
             ]
@@ -1225,7 +1225,7 @@
         "0x00B9": {
             "group": "media",
             "key": "KC_WWW_REFRESH",
-            "label": "Browser Refresh",
+            "label": "Refresh",
             "aliases": [
                 "KC_WREF"
             ]
@@ -1233,7 +1233,7 @@
         "0x00BA": {
             "group": "media",
             "key": "KC_WWW_FAVORITES",
-            "label": "Browser Favorites",
+            "label": "Favorites",
             "aliases": [
                 "KC_WFAV"
             ]
@@ -1241,7 +1241,7 @@
         "0x00BB": {
             "group": "media",
             "key": "KC_MEDIA_FAST_FORWARD",
-            "label": "Next Track",
+            "label": "Fast Forward",
             "aliases": [
                 "KC_MFFD"
             ]
@@ -1249,7 +1249,7 @@
         "0x00BC": {
             "group": "media",
             "key": "KC_MEDIA_REWIND",
-            "label": "Previous Track",
+            "label": "Rewind",
             "aliases": [
                 "KC_MRWD"
             ]
@@ -1273,7 +1273,7 @@
         "0x00BF": {
             "group": "media",
             "key": "KC_CONTROL_PANEL",
-            "label": "Open Control Panel",
+            "label": "Control Panel",
             "aliases": [
                 "KC_CPNL"
             ]
@@ -1281,7 +1281,7 @@
         "0x00C0": {
             "group": "media",
             "key": "KC_ASSISTANT",
-            "label": "Launch Assistant",
+            "label": "Assistant",
             "aliases": [
                 "KC_ASST"
             ]

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

@@ -3,6 +3,7 @@
         "0x7400": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_0",
+            "label": "Button 0",
             "aliases": [
                 "JS_0"
             ]
@@ -10,6 +11,7 @@
         "0x7401": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_1",
+            "label": "Button 1",
             "aliases": [
                 "JS_1"
             ]
@@ -17,6 +19,7 @@
         "0x7402": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_2",
+            "label": "Button 2",
             "aliases": [
                 "JS_2"
             ]
@@ -24,6 +27,7 @@
         "0x7403": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_3",
+            "label": "Button 3",
             "aliases": [
                 "JS_3"
             ]
@@ -31,6 +35,7 @@
         "0x7404": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_4",
+            "label": "Button 4",
             "aliases": [
                 "JS_4"
             ]
@@ -38,6 +43,7 @@
         "0x7405": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_5",
+            "label": "Button 5",
             "aliases": [
                 "JS_5"
             ]
@@ -45,6 +51,7 @@
         "0x7406": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_6",
+            "label": "Button 6",
             "aliases": [
                 "JS_6"
             ]
@@ -52,6 +59,7 @@
         "0x7407": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_7",
+            "label": "Button 7",
             "aliases": [
                 "JS_7"
             ]
@@ -59,6 +67,7 @@
         "0x7408": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_8",
+            "label": "Button 8",
             "aliases": [
                 "JS_8"
             ]
@@ -66,6 +75,7 @@
         "0x7409": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_9",
+            "label": "Button 9",
             "aliases": [
                 "JS_9"
             ]
@@ -73,6 +83,7 @@
         "0x740A": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_10",
+            "label": "Button 10",
             "aliases": [
                 "JS_10"
             ]
@@ -80,6 +91,7 @@
         "0x740B": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_11",
+            "label": "Button 11",
             "aliases": [
                 "JS_11"
             ]
@@ -87,6 +99,7 @@
         "0x740C": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_12",
+            "label": "Button 12",
             "aliases": [
                 "JS_12"
             ]
@@ -94,6 +107,7 @@
         "0x740D": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_13",
+            "label": "Button 13",
             "aliases": [
                 "JS_13"
             ]
@@ -101,6 +115,7 @@
         "0x740E": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_14",
+            "label": "Button 14",
             "aliases": [
                 "JS_14"
             ]
@@ -108,6 +123,7 @@
         "0x740F": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_15",
+            "label": "Button 15",
             "aliases": [
                 "JS_15"
             ]
@@ -115,6 +131,7 @@
         "0x7410": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_16",
+            "label": "Button 16",
             "aliases": [
                 "JS_16"
             ]
@@ -122,6 +139,7 @@
         "0x7411": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_17",
+            "label": "Button 17",
             "aliases": [
                 "JS_17"
             ]
@@ -129,6 +147,7 @@
         "0x7412": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_18",
+            "label": "Button 18",
             "aliases": [
                 "JS_18"
             ]
@@ -136,6 +155,7 @@
         "0x7413": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_19",
+            "label": "Button 19",
             "aliases": [
                 "JS_19"
             ]
@@ -143,6 +163,7 @@
         "0x7414": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_20",
+            "label": "Button 20",
             "aliases": [
                 "JS_20"
             ]
@@ -150,6 +171,7 @@
         "0x7415": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_21",
+            "label": "Button 21",
             "aliases": [
                 "JS_21"
             ]
@@ -157,6 +179,7 @@
         "0x7416": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_22",
+            "label": "Button 22",
             "aliases": [
                 "JS_22"
             ]
@@ -164,6 +187,7 @@
         "0x7417": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_23",
+            "label": "Button 23",
             "aliases": [
                 "JS_23"
             ]
@@ -171,6 +195,7 @@
         "0x7418": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_24",
+            "label": "Button 24",
             "aliases": [
                 "JS_24"
             ]
@@ -178,6 +203,7 @@
         "0x7419": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_25",
+            "label": "Button 25",
             "aliases": [
                 "JS_25"
             ]
@@ -185,6 +211,7 @@
         "0x741A": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_26",
+            "label": "Button 26",
             "aliases": [
                 "JS_26"
             ]
@@ -192,6 +219,7 @@
         "0x741B": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_27",
+            "label": "Button 27",
             "aliases": [
                 "JS_27"
             ]
@@ -199,6 +227,7 @@
         "0x741C": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_28",
+            "label": "Button 28",
             "aliases": [
                 "JS_28"
             ]
@@ -206,6 +235,7 @@
         "0x741D": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_29",
+            "label": "Button 29",
             "aliases": [
                 "JS_29"
             ]
@@ -213,6 +243,7 @@
         "0x741E": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_30",
+            "label": "Button 30",
             "aliases": [
                 "JS_30"
             ]
@@ -220,6 +251,7 @@
         "0x741F": {
             "group": "joystick",
             "key": "QK_JOYSTICK_BUTTON_31",
+            "label": "Button 31",
             "aliases": [
                 "JS_31"
             ]

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

@@ -3,6 +3,7 @@
         "0x7800": {
             "group": "backlight",
             "key": "QK_BACKLIGHT_ON",
+            "label": "Backlight On",
             "aliases": [
                 "BL_ON"
             ]
@@ -10,6 +11,7 @@
         "0x7801": {
             "group": "backlight",
             "key": "QK_BACKLIGHT_OFF",
+            "label": "Backlight Off",
             "aliases": [
                 "BL_OFF"
             ]
@@ -17,6 +19,7 @@
         "0x7802": {
             "group": "backlight",
             "key": "QK_BACKLIGHT_TOGGLE",
+            "label": "Toggle Backlight",
             "aliases": [
                 "BL_TOGG"
             ]
@@ -24,6 +27,7 @@
         "0x7803": {
             "group": "backlight",
             "key": "QK_BACKLIGHT_DOWN",
+            "label": "Backlight Down",
             "aliases": [
                 "BL_DOWN"
             ]
@@ -31,6 +35,7 @@
         "0x7804": {
             "group": "backlight",
             "key": "QK_BACKLIGHT_UP",
+            "label": "Backlight Up",
             "aliases": [
                 "BL_UP"
             ]
@@ -38,6 +43,7 @@
         "0x7805": {
             "group": "backlight",
             "key": "QK_BACKLIGHT_STEP",
+            "label": "Backlight Step",
             "aliases": [
                 "BL_STEP"
             ]
@@ -45,6 +51,7 @@
         "0x7806": {
             "group": "backlight",
             "key": "QK_BACKLIGHT_TOGGLE_BREATHING",
+            "label": "Toggle Breathing",
             "aliases": [
                 "BL_BRTG"
             ]

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

@@ -1,9 +1,9 @@
 {
     "keycodes": {
-
         "0x7700": {
             "group": "macro",
             "key": "QK_MACRO_0",
+            "label": "Macro 0",
             "aliases": [
                 "MC_0"
             ]
@@ -11,6 +11,7 @@
         "0x7701": {
             "group": "macro",
             "key": "QK_MACRO_1",
+            "label": "Macro 1",
             "aliases": [
                 "MC_1"
             ]
@@ -18,6 +19,7 @@
         "0x7702": {
             "group": "macro",
             "key": "QK_MACRO_2",
+            "label": "Macro 2",
             "aliases": [
                 "MC_2"
             ]
@@ -25,6 +27,7 @@
         "0x7703": {
             "group": "macro",
             "key": "QK_MACRO_3",
+            "label": "Macro 3",
             "aliases": [
                 "MC_3"
             ]
@@ -32,6 +35,7 @@
         "0x7704": {
             "group": "macro",
             "key": "QK_MACRO_4",
+            "label": "Macro 4",
             "aliases": [
                 "MC_4"
             ]
@@ -39,6 +43,7 @@
         "0x7705": {
             "group": "macro",
             "key": "QK_MACRO_5",
+            "label": "Macro 5",
             "aliases": [
                 "MC_5"
             ]
@@ -46,6 +51,7 @@
         "0x7706": {
             "group": "macro",
             "key": "QK_MACRO_6",
+            "label": "Macro 6",
             "aliases": [
                 "MC_6"
             ]
@@ -53,6 +59,7 @@
         "0x7707": {
             "group": "macro",
             "key": "QK_MACRO_7",
+            "label": "Macro 7",
             "aliases": [
                 "MC_7"
             ]
@@ -60,6 +67,7 @@
         "0x7708": {
             "group": "macro",
             "key": "QK_MACRO_8",
+            "label": "Macro 8",
             "aliases": [
                 "MC_8"
             ]
@@ -67,6 +75,7 @@
         "0x7709": {
             "group": "macro",
             "key": "QK_MACRO_9",
+            "label": "Macro 9",
             "aliases": [
                 "MC_9"
             ]
@@ -74,6 +83,7 @@
         "0x770A": {
             "group": "macro",
             "key": "QK_MACRO_10",
+            "label": "Macro 10",
             "aliases": [
                 "MC_10"
             ]
@@ -81,6 +91,7 @@
         "0x770B": {
             "group": "macro",
             "key": "QK_MACRO_11",
+            "label": "Macro 11",
             "aliases": [
                 "MC_11"
             ]
@@ -88,6 +99,7 @@
         "0x770C": {
             "group": "macro",
             "key": "QK_MACRO_12",
+            "label": "Macro 12",
             "aliases": [
                 "MC_12"
             ]
@@ -95,6 +107,7 @@
         "0x770D": {
             "group": "macro",
             "key": "QK_MACRO_13",
+            "label": "Macro 13",
             "aliases": [
                 "MC_13"
             ]
@@ -102,6 +115,7 @@
         "0x770E": {
             "group": "macro",
             "key": "QK_MACRO_14",
+            "label": "Macro 14",
             "aliases": [
                 "MC_14"
             ]
@@ -109,6 +123,7 @@
         "0x770F": {
             "group": "macro",
             "key": "QK_MACRO_15",
+            "label": "Macro 15",
             "aliases": [
                 "MC_15"
             ]
@@ -116,6 +131,7 @@
         "0x7710": {
             "group": "macro",
             "key": "QK_MACRO_16",
+            "label": "Macro 16",
             "aliases": [
                 "MC_16"
             ]
@@ -123,6 +139,7 @@
         "0x7711": {
             "group": "macro",
             "key": "QK_MACRO_17",
+            "label": "Macro 17",
             "aliases": [
                 "MC_17"
             ]
@@ -130,6 +147,7 @@
         "0x7712": {
             "group": "macro",
             "key": "QK_MACRO_18",
+            "label": "Macro 18",
             "aliases": [
                 "MC_18"
             ]
@@ -137,6 +155,7 @@
         "0x7713": {
             "group": "macro",
             "key": "QK_MACRO_19",
+            "label": "Macro 19",
             "aliases": [
                 "MC_19"
             ]
@@ -144,6 +163,7 @@
         "0x7714": {
             "group": "macro",
             "key": "QK_MACRO_20",
+            "label": "Macro 20",
             "aliases": [
                 "MC_20"
             ]
@@ -151,6 +171,7 @@
         "0x7715": {
             "group": "macro",
             "key": "QK_MACRO_21",
+            "label": "Macro 21",
             "aliases": [
                 "MC_21"
             ]
@@ -158,6 +179,7 @@
         "0x7716": {
             "group": "macro",
             "key": "QK_MACRO_22",
+            "label": "Macro 22",
             "aliases": [
                 "MC_22"
             ]
@@ -165,6 +187,7 @@
         "0x7717": {
             "group": "macro",
             "key": "QK_MACRO_23",
+            "label": "Macro 23",
             "aliases": [
                 "MC_23"
             ]
@@ -172,6 +195,7 @@
         "0x7718": {
             "group": "macro",
             "key": "QK_MACRO_24",
+            "label": "Macro 24",
             "aliases": [
                 "MC_24"
             ]
@@ -179,6 +203,7 @@
         "0x7719": {
             "group": "macro",
             "key": "QK_MACRO_25",
+            "label": "Macro 25",
             "aliases": [
                 "MC_25"
             ]
@@ -186,6 +211,7 @@
         "0x771A": {
             "group": "macro",
             "key": "QK_MACRO_26",
+            "label": "Macro 26",
             "aliases": [
                 "MC_26"
             ]
@@ -193,6 +219,7 @@
         "0x771B": {
             "group": "macro",
             "key": "QK_MACRO_27",
+            "label": "Macro 27",
             "aliases": [
                 "MC_27"
             ]
@@ -200,6 +227,7 @@
         "0x771C": {
             "group": "macro",
             "key": "QK_MACRO_28",
+            "label": "Macro 28",
             "aliases": [
                 "MC_28"
             ]
@@ -207,6 +235,7 @@
         "0x771D": {
             "group": "macro",
             "key": "QK_MACRO_29",
+            "label": "Macro 29",
             "aliases": [
                 "MC_29"
             ]
@@ -214,6 +243,7 @@
         "0x771E": {
             "group": "macro",
             "key": "QK_MACRO_30",
+            "label": "Macro 30",
             "aliases": [
                 "MC_30"
             ]
@@ -221,6 +251,7 @@
         "0x771F": {
             "group": "macro",
             "key": "QK_MACRO_31",
+            "label": "Macro 31",
             "aliases": [
                 "MC_31"
             ]

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

@@ -3,6 +3,7 @@
         "0x7440": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_1",
+            "label": "Button 1",
             "aliases": [
                 "PB_1"
             ]
@@ -10,6 +11,7 @@
         "0x7441": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_2",
+            "label": "Button 2",
             "aliases": [
                 "PB_2"
             ]
@@ -17,6 +19,7 @@
         "0x7442": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_3",
+            "label": "Button 3",
             "aliases": [
                 "PB_3"
             ]
@@ -24,6 +27,7 @@
         "0x7443": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_4",
+            "label": "Button 4",
             "aliases": [
                 "PB_4"
             ]
@@ -31,6 +35,7 @@
         "0x7444": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_5",
+            "label": "Button 5",
             "aliases": [
                 "PB_5"
             ]
@@ -38,6 +43,7 @@
         "0x7445": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_6",
+            "label": "Button 6",
             "aliases": [
                 "PB_6"
             ]
@@ -45,6 +51,7 @@
         "0x7446": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_7",
+            "label": "Button 7",
             "aliases": [
                 "PB_7"
             ]
@@ -52,6 +59,7 @@
         "0x7447": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_8",
+            "label": "Button 8",
             "aliases": [
                 "PB_8"
             ]
@@ -59,6 +67,7 @@
         "0x7448": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_9",
+            "label": "Button 9",
             "aliases": [
                 "PB_9"
             ]
@@ -66,6 +75,7 @@
         "0x7449": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_10",
+            "label": "Button 10",
             "aliases": [
                 "PB_10"
             ]
@@ -73,6 +83,7 @@
         "0x744A": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_11",
+            "label": "Button 11",
             "aliases": [
                 "PB_11"
             ]
@@ -80,6 +91,7 @@
         "0x744B": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_12",
+            "label": "Button 12",
             "aliases": [
                 "PB_12"
             ]
@@ -87,6 +99,7 @@
         "0x744C": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_13",
+            "label": "Button 13",
             "aliases": [
                 "PB_13"
             ]
@@ -94,6 +107,7 @@
         "0x744D": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_14",
+            "label": "Button 14",
             "aliases": [
                 "PB_14"
             ]
@@ -101,6 +115,7 @@
         "0x744E": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_15",
+            "label": "Button 15",
             "aliases": [
                 "PB_15"
             ]
@@ -108,6 +123,7 @@
         "0x744F": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_16",
+            "label": "Button 16",
             "aliases": [
                 "PB_16"
             ]
@@ -115,6 +131,7 @@
         "0x7450": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_17",
+            "label": "Button 17",
             "aliases": [
                 "PB_17"
             ]
@@ -122,6 +139,7 @@
         "0x7451": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_18",
+            "label": "Button 18",
             "aliases": [
                 "PB_18"
             ]
@@ -129,6 +147,7 @@
         "0x7452": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_19",
+            "label": "Button 19",
             "aliases": [
                 "PB_19"
             ]
@@ -136,6 +155,7 @@
         "0x7453": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_20",
+            "label": "Button 20",
             "aliases": [
                 "PB_20"
             ]
@@ -143,6 +163,7 @@
         "0x7454": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_21",
+            "label": "Button 21",
             "aliases": [
                 "PB_21"
             ]
@@ -150,6 +171,7 @@
         "0x7455": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_22",
+            "label": "Button 22",
             "aliases": [
                 "PB_22"
             ]
@@ -157,6 +179,7 @@
         "0x7456": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_23",
+            "label": "Button 23",
             "aliases": [
                 "PB_23"
             ]
@@ -164,6 +187,7 @@
         "0x7457": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_24",
+            "label": "Button 24",
             "aliases": [
                 "PB_24"
             ]
@@ -171,6 +195,7 @@
         "0x7458": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_25",
+            "label": "Button 25",
             "aliases": [
                 "PB_25"
             ]
@@ -178,6 +203,7 @@
         "0x7459": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_26",
+            "label": "Button 26",
             "aliases": [
                 "PB_26"
             ]
@@ -185,6 +211,7 @@
         "0x745A": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_27",
+            "label": "Button 27",
             "aliases": [
                 "PB_27"
             ]
@@ -192,6 +219,7 @@
         "0x745B": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_28",
+            "label": "Button 28",
             "aliases": [
                 "PB_28"
             ]
@@ -199,6 +227,7 @@
         "0x745C": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_29",
+            "label": "Button 29",
             "aliases": [
                 "PB_29"
             ]
@@ -206,6 +235,7 @@
         "0x745D": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_30",
+            "label": "Button 30",
             "aliases": [
                 "PB_30"
             ]
@@ -213,6 +243,7 @@
         "0x745E": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_31",
+            "label": "Button 31",
             "aliases": [
                 "PB_31"
             ]
@@ -220,6 +251,7 @@
         "0x745F": {
             "group": "programmable_button",
             "key": "QK_PROGRAMMABLE_BUTTON_32",
+            "label": "Button 32",
             "aliases": [
                 "PB_32"
             ]

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

@@ -3,6 +3,7 @@
         "0x7C00": {
             "group": "quantum",
             "key": "QK_BOOTLOADER",
+            "label": "Bootloader",
             "aliases": [
                 "QK_BOOT"
             ]
@@ -10,6 +11,7 @@
         "0x7C01": {
             "group": "quantum",
             "key": "QK_REBOOT",
+            "label": "Reboot",
             "aliases": [
                 "QK_RBT"
             ]
@@ -17,6 +19,7 @@
         "0x7C02": {
             "group": "quantum",
             "key": "QK_DEBUG_TOGGLE",
+            "label": "Toggle Debug",
             "aliases": [
                 "DB_TOGG"
             ]
@@ -24,18 +27,21 @@
         "0x7C03": {
             "group": "quantum",
             "key": "QK_CLEAR_EEPROM",
+            "label": "Clear EEPROM",
             "aliases": [
                 "EE_CLR"
             ]
         },
         "0x7C04": {
             "group": "quantum",
-            "key": "QK_MAKE"
+            "key": "QK_MAKE",
+            "label": "Make"
         },
 
         "0x7C10": {
             "group": "quantum",
             "key": "QK_AUTO_SHIFT_DOWN",
+            "label": "Auto Shift Down",
             "aliases": [
                 "AS_DOWN"
             ]
@@ -43,6 +49,7 @@
         "0x7C11": {
             "group": "quantum",
             "key": "QK_AUTO_SHIFT_UP",
+            "label": "Auto Shift Up",
             "aliases": [
                 "AS_UP"
             ]
@@ -50,6 +57,7 @@
         "0x7C12": {
             "group": "quantum",
             "key": "QK_AUTO_SHIFT_REPORT",
+            "label": "Auto Shift Report",
             "aliases": [
                 "AS_RPT"
             ]
@@ -57,6 +65,7 @@
         "0x7C13": {
             "group": "quantum",
             "key": "QK_AUTO_SHIFT_ON",
+            "label": "Auto Shift On",
             "aliases": [
                 "AS_ON"
             ]
@@ -64,6 +73,7 @@
         "0x7C14": {
             "group": "quantum",
             "key": "QK_AUTO_SHIFT_OFF",
+            "label": "Auto Shift Off",
             "aliases": [
                 "AS_OFF"
             ]
@@ -71,6 +81,7 @@
         "0x7C15": {
             "group": "quantum",
             "key": "QK_AUTO_SHIFT_TOGGLE",
+            "label": "Toggle Auto Shift",
             "aliases": [
                 "AS_TOGG"
             ]
@@ -79,6 +90,7 @@
         "0x7C16": {
             "group": "quantum",
             "key": "QK_GRAVE_ESCAPE",
+            "label": "Grave Esc",
             "aliases": [
                 "QK_GESC"
             ]
@@ -95,6 +107,7 @@
         "0x7C18": {
             "group": "quantum",
             "key": "QK_SPACE_CADET_LEFT_CTRL_PARENTHESIS_OPEN",
+            "label": "LCtl/(",
             "aliases": [
                 "SC_LCPO"
             ]
@@ -102,6 +115,7 @@
         "0x7C19": {
             "group": "quantum",
             "key": "QK_SPACE_CADET_RIGHT_CTRL_PARENTHESIS_CLOSE",
+            "label": "RCtl/)",
             "aliases": [
                 "SC_RCPC"
             ]
@@ -109,6 +123,7 @@
         "0x7C1A": {
             "group": "quantum",
             "key": "QK_SPACE_CADET_LEFT_SHIFT_PARENTHESIS_OPEN",
+            "label": "LSft/)",
             "aliases": [
                 "SC_LSPO"
             ]
@@ -116,6 +131,7 @@
         "0x7C1B": {
             "group": "quantum",
             "key": "QK_SPACE_CADET_RIGHT_SHIFT_PARENTHESIS_CLOSE",
+            "label": "RSft/)",
             "aliases": [
                 "SC_RSPC"
             ]
@@ -123,6 +139,7 @@
         "0x7C1C": {
             "group": "quantum",
             "key": "QK_SPACE_CADET_LEFT_ALT_PARENTHESIS_OPEN",
+            "label": "LAlt/(",
             "aliases": [
                 "SC_LAPO"
             ]
@@ -130,6 +147,7 @@
         "0x7C1D": {
             "group": "quantum",
             "key": "QK_SPACE_CADET_RIGHT_ALT_PARENTHESIS_CLOSE",
+            "label": "RAlt/)",
             "aliases": [
                 "SC_RAPC"
             ]
@@ -137,6 +155,7 @@
         "0x7C1E": {
             "group": "quantum",
             "key": "QK_SPACE_CADET_RIGHT_SHIFT_ENTER",
+            "label": "RSft/Ent",
             "aliases": [
                 "SC_SENT"
             ]
@@ -167,6 +186,7 @@
         "0x7C30": {
             "group": "quantum",
             "key": "QK_UNICODE_MODE_NEXT",
+            "label": "Unicode Mode Next",
             "aliases": [
                 "UC_NEXT"
             ]
@@ -174,6 +194,7 @@
         "0x7C31": {
             "group": "quantum",
             "key": "QK_UNICODE_MODE_PREVIOUS",
+            "label": "Unicode Mode Previous",
             "aliases": [
                 "UC_PREV"
             ]
@@ -181,6 +202,7 @@
         "0x7C32": {
             "group": "quantum",
             "key": "QK_UNICODE_MODE_MACOS",
+            "label": "Unicode Mode macOS",
             "aliases": [
                 "UC_MAC"
             ]
@@ -188,6 +210,7 @@
         "0x7C33": {
             "group": "quantum",
             "key": "QK_UNICODE_MODE_LINUX",
+            "label": "Unicode Mode Linux",
             "aliases": [
                 "UC_LINX"
             ]
@@ -195,6 +218,7 @@
         "0x7C34": {
             "group": "quantum",
             "key": "QK_UNICODE_MODE_WINDOWS",
+            "label": "Unicode Mode Windows",
             "aliases": [
                 "UC_WIN"
             ]
@@ -202,6 +226,7 @@
         "0x7C35": {
             "group": "quantum",
             "key": "QK_UNICODE_MODE_BSD",
+            "label": "Unicode Mode BSD",
             "aliases": [
                 "UC_BSD"
             ]
@@ -209,6 +234,7 @@
         "0x7C36": {
             "group": "quantum",
             "key": "QK_UNICODE_MODE_WINCOMPOSE",
+            "label": "Unicode Mode WinCompose",
             "aliases": [
                 "UC_WINC"
             ]
@@ -216,6 +242,7 @@
         "0x7C37": {
             "group": "quantum",
             "key": "QK_UNICODE_MODE_EMACS",
+            "label": "Unicode Mode emacs",
             "aliases": [
                 "UC_EMAC"
             ]
@@ -224,6 +251,7 @@
         "0x7C40": {
             "group": "quantum",
             "key": "QK_HAPTIC_ON",
+            "label": "Haptic On",
             "aliases": [
                 "HF_ON"
             ]
@@ -231,6 +259,7 @@
         "0x7C41": {
             "group": "quantum",
             "key": "QK_HAPTIC_OFF",
+            "label": "Haptic Off",
             "aliases": [
                 "HF_OFF"
             ]
@@ -238,6 +267,7 @@
         "0x7C42": {
             "group": "quantum",
             "key": "QK_HAPTIC_TOGGLE",
+            "label": "Toggle Haptic",
             "aliases": [
                 "HF_TOGG"
             ]
@@ -245,6 +275,7 @@
         "0x7C43": {
             "group": "quantum",
             "key": "QK_HAPTIC_RESET",
+            "label": "Haptic Reset",
             "aliases": [
                 "HF_RST"
             ]
@@ -252,6 +283,7 @@
         "0x7C44": {
             "group": "quantum",
             "key": "QK_HAPTIC_FEEDBACK_TOGGLE",
+            "label": "Toggle Haptic Feedback",
             "aliases": [
                 "HF_FDBK"
             ]
@@ -259,6 +291,7 @@
         "0x7C45": {
             "group": "quantum",
             "key": "QK_HAPTIC_BUZZ_TOGGLE",
+            "label": "Toggle Haptic Buzz",
             "aliases": [
                 "HF_BUZZ"
             ]
@@ -266,6 +299,7 @@
         "0x7C46": {
             "group": "quantum",
             "key": "QK_HAPTIC_MODE_NEXT",
+            "label": "Haptic Mode Next",
             "aliases": [
                 "HF_NEXT"
             ]
@@ -273,6 +307,7 @@
         "0x7C47": {
             "group": "quantum",
             "key": "QK_HAPTIC_MODE_PREVIOUS",
+            "label": "Haptic Mode Previous",
             "aliases": [
                 "HF_PREV"
             ]
@@ -280,6 +315,7 @@
         "0x7C48": {
             "group": "quantum",
             "key": "QK_HAPTIC_CONTINUOUS_TOGGLE",
+            "label": "Toggle Haptic Continuous",
             "aliases": [
                 "HF_CONT"
             ]
@@ -287,6 +323,7 @@
         "0x7C49": {
             "group": "quantum",
             "key": "QK_HAPTIC_CONTINUOUS_UP",
+            "label": "Haptic Continuous Up",
             "aliases": [
                 "HF_CONU"
             ]
@@ -294,6 +331,7 @@
         "0x7C4A": {
             "group": "quantum",
             "key": "QK_HAPTIC_CONTINUOUS_DOWN",
+            "label": "Haptic Continuous Down",
             "aliases": [
                 "HF_COND"
             ]
@@ -301,6 +339,7 @@
         "0x7C4B": {
             "group": "quantum",
             "key": "QK_HAPTIC_DWELL_UP",
+            "label": "Haptic Dwell Up",
             "aliases": [
                 "HF_DWLU"
             ]
@@ -308,6 +347,7 @@
         "0x7C4C": {
             "group": "quantum",
             "key": "QK_HAPTIC_DWELL_DOWN",
+            "label": "Haptic Dwell Down",
             "aliases": [
                 "HF_DWLD"
             ]
@@ -316,6 +356,7 @@
         "0x7C50": {
             "group": "quantum",
             "key": "QK_COMBO_ON",
+            "label": "Combo On",
             "aliases": [
                 "CM_ON"
             ]
@@ -323,6 +364,7 @@
         "0x7C51": {
             "group": "quantum",
             "key": "QK_COMBO_OFF",
+            "label": "Combo Off",
             "aliases": [
                 "CM_OFF"
             ]
@@ -330,6 +372,7 @@
         "0x7C52": {
             "group": "quantum",
             "key": "QK_COMBO_TOGGLE",
+            "label": "Toggle Combo",
             "aliases": [
                 "CM_TOGG"
             ]
@@ -338,6 +381,7 @@
         "0x7C53": {
             "group": "quantum",
             "key": "QK_DYNAMIC_MACRO_RECORD_START_1",
+            "label": "Dynamic Macro Record 1",
             "aliases": [
                 "DM_REC1"
             ]
@@ -345,6 +389,7 @@
         "0x7C54": {
             "group": "quantum",
             "key": "QK_DYNAMIC_MACRO_RECORD_START_2",
+            "label": "Dynamic Macro Record 2",
             "aliases": [
                 "DM_REC2"
             ]
@@ -352,6 +397,7 @@
         "0x7C55": {
             "group": "quantum",
             "key": "QK_DYNAMIC_MACRO_RECORD_STOP",
+            "label": "Dynamic Macro Stop Recording",
             "aliases": [
                 "DM_RSTP"
             ]
@@ -359,6 +405,7 @@
         "0x7C56": {
             "group": "quantum",
             "key": "QK_DYNAMIC_MACRO_PLAY_1",
+            "label": "Dynamic Macro Play 1",
             "aliases": [
                 "DM_PLY1"
             ]
@@ -366,6 +413,7 @@
         "0x7C57": {
             "group": "quantum",
             "key": "QK_DYNAMIC_MACRO_PLAY_2",
+            "label": "Dynamic Macro Play 2",
             "aliases": [
                 "DM_PLY2"
             ]
@@ -374,6 +422,7 @@
         "0x7C58": {
             "group": "quantum",
             "key": "QK_LEADER",
+            "label": "Leader",
             "aliases": [
                 "QK_LEAD"
             ]
@@ -381,12 +430,14 @@
 
         "0x7C59": {
             "group": "quantum",
-            "key": "QK_LOCK"
+            "key": "QK_LOCK",
+            "label": "Lock"
         },
 
         "0x7C5A": {
             "group": "quantum",
             "key": "QK_ONE_SHOT_ON",
+            "label": "One Shot On",
             "aliases": [
                 "OS_ON"
             ]
@@ -394,6 +445,7 @@
         "0x7C5B": {
             "group": "quantum",
             "key": "QK_ONE_SHOT_OFF",
+            "label": "One Shot Off",
             "aliases": [
                 "OS_OFF"
             ]
@@ -401,6 +453,7 @@
         "0x7C5C": {
             "group": "quantum",
             "key": "QK_ONE_SHOT_TOGGLE",
+            "label": "Toggle One Shot",
             "aliases": [
                 "OS_TOGG"
             ]
@@ -409,6 +462,7 @@
         "0x7C5D": {
             "group": "quantum",
             "key": "QK_KEY_OVERRIDE_TOGGLE",
+            "label": "Toggle Key Overrides",
             "aliases": [
                 "KO_TOGG"
             ]
@@ -416,6 +470,7 @@
         "0x7C5E": {
             "group": "quantum",
             "key": "QK_KEY_OVERRIDE_ON",
+            "label": "Key Overrides On",
             "aliases": [
                 "KO_ON"
             ]
@@ -423,6 +478,7 @@
         "0x7C5F": {
             "group": "quantum",
             "key": "QK_KEY_OVERRIDE_OFF",
+            "label": "Key Overrides Off",
             "aliases": [
                 "KO_OFF"
             ]
@@ -431,6 +487,7 @@
         "0x7C60": {
             "group": "quantum",
             "key": "QK_SECURE_LOCK",
+            "label": "Lock",
             "aliases": [
                 "SE_LOCK"
             ]
@@ -438,6 +495,7 @@
         "0x7C61": {
             "group": "quantum",
             "key": "QK_SECURE_UNLOCK",
+            "label": "Unlock",
             "aliases": [
                 "SE_UNLK"
             ]
@@ -445,6 +503,7 @@
         "0x7C62": {
             "group": "quantum",
             "key": "QK_SECURE_TOGGLE",
+            "label": "Toggle Lock",
             "aliases": [
                 "SE_TOGG"
             ]
@@ -452,6 +511,7 @@
         "0x7C63": {
             "group": "quantum",
             "key": "QK_SECURE_REQUEST",
+            "label": "Request Unlock",
             "aliases": [
                 "SE_REQ"
             ]
@@ -460,6 +520,7 @@
         "0x7C70": {
             "group": "quantum",
             "key": "QK_DYNAMIC_TAPPING_TERM_PRINT",
+            "label": "Print Dynamic Tapping Term",
             "aliases": [
                 "DT_PRNT"
             ]
@@ -467,6 +528,7 @@
         "0x7C71": {
             "group": "quantum",
             "key": "QK_DYNAMIC_TAPPING_TERM_UP",
+            "label": "Dynamic Tapping Term Up",
             "aliases": [
                 "DT_UP"
             ]
@@ -474,6 +536,7 @@
         "0x7C72": {
             "group": "quantum",
             "key": "QK_DYNAMIC_TAPPING_TERM_DOWN",
+            "label": "Dynamic Tapping Term Down",
             "aliases": [
                 "DT_DOWN"
             ]
@@ -482,6 +545,7 @@
         "0x7C73": {
             "group": "quantum",
             "key": "QK_CAPS_WORD_TOGGLE",
+            "label": "Toggle Caps Word",
             "aliases": [
                 "CW_TOGG"
             ]
@@ -490,6 +554,7 @@
         "0x7C74": {
             "group": "quantum",
             "key": "QK_AUTOCORRECT_ON",
+            "label": "Autocorrect On",
             "aliases": [
                 "AC_ON"
             ]
@@ -497,6 +562,7 @@
         "0x7C75": {
             "group": "quantum",
             "key": "QK_AUTOCORRECT_OFF",
+            "label": "Autocorrect Off",
             "aliases": [
                 "AC_OFF"
             ]
@@ -504,6 +570,7 @@
         "0x7C76": {
             "group": "quantum",
             "key": "QK_AUTOCORRECT_TOGGLE",
+            "label": "Toggle Autocorrect",
             "aliases": [
                 "AC_TOGG"
             ]

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

@@ -3,7 +3,7 @@
         "0x00C1": {
             "group": "media",
             "key": "KC_MISSION_CONTROL",
-            "label": "Open Mission Control",
+            "label": "Mission Control",
             "aliases": [
                 "KC_MCTL"
             ]
@@ -11,7 +11,7 @@
         "0x00C2": {
             "group": "media",
             "key": "KC_LAUNCHPAD",
-            "label": "Open Launchpad",
+            "label": "Launchpad",
             "aliases": [
                 "KC_LPAD"
             ]

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

@@ -2,131 +2,163 @@
     "keycodes": {
         "0x7E00": {
             "group": "kb",
-            "key": "QK_KB_0"
+            "key": "QK_KB_0",
+            "label": "Keyboard 0"
         },
         "0x7E01": {
             "group": "kb",
-            "key": "QK_KB_1"
+            "key": "QK_KB_1",
+            "label": "Keyboard 1"
         },
         "0x7E02": {
             "group": "kb",
-            "key": "QK_KB_2"
+            "key": "QK_KB_2",
+            "label": "Keyboard 2"
         },
         "0x7E03": {
             "group": "kb",
-            "key": "QK_KB_3"
+            "key": "QK_KB_3",
+            "label": "Keyboard 3"
         },
         "0x7E04": {
             "group": "kb",
-            "key": "QK_KB_4"
+            "key": "QK_KB_4",
+            "label": "Keyboard 4"
         },
         "0x7E05": {
             "group": "kb",
-            "key": "QK_KB_5"
+            "key": "QK_KB_5",
+            "label": "Keyboard 5"
         },
         "0x7E06": {
             "group": "kb",
-            "key": "QK_KB_6"
+            "key": "QK_KB_6",
+            "label": "Keyboard 6"
         },
         "0x7E07": {
             "group": "kb",
-            "key": "QK_KB_7"
+            "key": "QK_KB_7",
+            "label": "Keyboard 7"
         },
         "0x7E08": {
             "group": "kb",
-            "key": "QK_KB_8"
+            "key": "QK_KB_8",
+            "label": "Keyboard 8"
         },
         "0x7E09": {
             "group": "kb",
-            "key": "QK_KB_9"
+            "key": "QK_KB_9",
+            "label": "Keyboard 9"
         },
         "0x7E0A": {
             "group": "kb",
-            "key": "QK_KB_10"
+            "key": "QK_KB_10",
+            "label": "Keyboard 10"
         },
         "0x7E0B": {
             "group": "kb",
-            "key": "QK_KB_11"
+            "key": "QK_KB_11",
+            "label": "Keyboard 11"
         },
         "0x7E0C": {
             "group": "kb",
-            "key": "QK_KB_12"
+            "key": "QK_KB_12",
+            "label": "Keyboard 12"
         },
         "0x7E0D": {
             "group": "kb",
-            "key": "QK_KB_13"
+            "key": "QK_KB_13",
+            "label": "Keyboard 13"
         },
         "0x7E0E": {
             "group": "kb",
-            "key": "QK_KB_14"
+            "key": "QK_KB_14",
+            "label": "Keyboard 14"
         },
         "0x7E0F": {
             "group": "kb",
-            "key": "QK_KB_15"
+            "key": "QK_KB_15",
+            "label": "Keyboard 15"
         },
         "0x7E10": {
             "group": "kb",
-            "key": "QK_KB_16"
+            "key": "QK_KB_16",
+            "label": "Keyboard 16"
         },
         "0x7E11": {
             "group": "kb",
-            "key": "QK_KB_17"
+            "key": "QK_KB_17",
+            "label": "Keyboard 17"
         },
          "0x7E12": {
             "group": "kb",
-            "key": "QK_KB_18"
+            "key": "QK_KB_18",
+            "label": "Keyboard 18"
         },
         "0x7E13": {
             "group": "kb",
-            "key": "QK_KB_19"
+            "key": "QK_KB_19",
+            "label": "Keyboard 19"
         },
         "0x7E14": {
             "group": "kb",
-            "key": "QK_KB_20"
+            "key": "QK_KB_20",
+            "label": "Keyboard 20"
         },
         "0x7E15": {
             "group": "kb",
-            "key": "QK_KB_21"
+            "key": "QK_KB_21",
+            "label": "Keyboard 21"
         },
         "0x7E16": {
             "group": "kb",
-            "key": "QK_KB_22"
+            "key": "QK_KB_22",
+            "label": "Keyboard 22"
         },
         "0x7E17": {
             "group": "kb",
-            "key": "QK_KB_23"
+            "key": "QK_KB_23",
+            "label": "Keyboard 23"
         },
         "0x7E18": {
             "group": "kb",
-            "key": "QK_KB_24"
+            "key": "QK_KB_24",
+            "label": "Keyboard 24"
         },
         "0x7E19": {
             "group": "kb",
-            "key": "QK_KB_25"
+            "key": "QK_KB_25",
+            "label": "Keyboard 25"
         },
         "0x7E1A": {
             "group": "kb",
-            "key": "QK_KB_26"
+            "key": "QK_KB_26",
+            "label": "Keyboard 26"
         },
         "0x7E1B": {
             "group": "kb",
-            "key": "QK_KB_27"
+            "key": "QK_KB_27",
+            "label": "Keyboard 27"
         },
         "0x7E1C": {
             "group": "kb",
-            "key": "QK_KB_28"
+            "key": "QK_KB_28",
+            "label": "Keyboard 28"
         },
         "0x7E1D": {
             "group": "kb",
-            "key": "QK_KB_29"
+            "key": "QK_KB_29",
+            "label": "Keyboard 29"
         },
         "0x7E1E": {
             "group": "kb",
-            "key": "QK_KB_30"
+            "key": "QK_KB_30",
+            "label": "Keyboard 30"
         },
         "0x7E1F": {
             "group": "kb",
-            "key": "QK_KB_31"
+            "key": "QK_KB_31",
+            "label": "Keyboard 31"
         }
     }
 }

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

@@ -5,6 +5,7 @@
         "0x7000": {
             "group": "magic",
             "key": "QK_MAGIC_SWAP_CONTROL_CAPS_LOCK",
+            "label": "Swap LCtl⇄Caps",
             "aliases": [
                 "CL_SWAP"
             ]
@@ -12,6 +13,7 @@
         "0x7001": {
             "group": "magic",
             "key": "QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK",
+            "label": "Unswap LCtl⇄Caps",
             "aliases": [
                 "CL_NORM"
             ]
@@ -19,6 +21,7 @@
         "0x7002": {
             "group": "magic",
             "key": "QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK",
+            "label": "Toggle LCtl⇄Caps",
             "aliases": [
                 "CL_TOGG"
             ]
@@ -26,6 +29,7 @@
         "0x7003": {
             "group": "magic",
             "key": "QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF",
+            "label": "Caps≠LCtl",
             "aliases": [
                 "CL_CAPS"
             ]
@@ -33,6 +37,7 @@
         "0x7004": {
             "group": "magic",
             "key": "QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON",
+            "label": "Caps=LCtl",
             "aliases": [
                 "CL_CTRL"
             ]
@@ -40,6 +45,7 @@
         "0x7005": {
             "group": "magic",
             "key": "QK_MAGIC_SWAP_LALT_LGUI",
+            "label": "Swap LAlt⇄LGUI",
             "aliases": [
                 "AG_LSWP"
             ]
@@ -47,6 +53,7 @@
         "0x7006": {
             "group": "magic",
             "key": "QK_MAGIC_UNSWAP_LALT_LGUI",
+            "label": "Unswap LAlt⇄LGUI",
             "aliases": [
                 "AG_LNRM"
             ]
@@ -54,6 +61,7 @@
         "0x7007": {
             "group": "magic",
             "key": "QK_MAGIC_SWAP_RALT_RGUI",
+            "label": "Swap RAlt⇄RGUI",
             "aliases": [
                 "AG_RSWP"
             ]
@@ -61,6 +69,7 @@
         "0x7008": {
             "group": "magic",
             "key": "QK_MAGIC_UNSWAP_RALT_RGUI",
+            "label": "Unswap RAlt⇄RGUI",
             "aliases": [
                 "AG_RNRM"
             ]
@@ -68,6 +77,7 @@
         "0x7009": {
             "group": "magic",
             "key": "QK_MAGIC_GUI_ON",
+            "label": "GUI On",
             "aliases": [
                 "GU_ON"
             ]
@@ -75,6 +85,7 @@
         "0x700A": {
             "group": "magic",
             "key": "QK_MAGIC_GUI_OFF",
+            "label": "GUI Off",
             "aliases": [
                 "GU_OFF"
             ]
@@ -82,6 +93,7 @@
         "0x700B": {
             "group": "magic",
             "key": "QK_MAGIC_TOGGLE_GUI",
+            "label": "Toggle GUI",
             "aliases": [
                 "GU_TOGG"
             ]
@@ -89,6 +101,7 @@
         "0x700C": {
             "group": "magic",
             "key": "QK_MAGIC_SWAP_GRAVE_ESC",
+            "label": "Swap `⇄Esc",
             "aliases": [
                 "GE_SWAP"
             ]
@@ -96,6 +109,7 @@
         "0x700D": {
             "group": "magic",
             "key": "QK_MAGIC_UNSWAP_GRAVE_ESC",
+            "label": "Unswap `⇄Esc",
             "aliases": [
                 "GE_NORM"
             ]
@@ -103,6 +117,7 @@
         "0x700E": {
             "group": "magic",
             "key": "QK_MAGIC_SWAP_BACKSLASH_BACKSPACE",
+            "label": "Swap \\⇄Bspc",
             "aliases": [
                 "BS_SWAP"
             ]
@@ -110,6 +125,7 @@
         "0x700F": {
             "group": "magic",
             "key": "QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE",
+            "label": "Unswap \\⇄Bspc",
             "aliases": [
                 "BS_NORM"
             ]
@@ -117,6 +133,7 @@
         "0x7010": {
             "group": "magic",
             "key": "QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE",
+            "label": "Toggle \\⇄Bspc",
             "aliases": [
                 "BS_TOGG"
             ]
@@ -124,6 +141,7 @@
         "0x7011": {
             "group": "magic",
             "key": "QK_MAGIC_NKRO_ON",
+            "label": "NKRO On",
             "aliases": [
                 "NK_ON"
             ]
@@ -131,6 +149,7 @@
         "0x7012": {
             "group": "magic",
             "key": "QK_MAGIC_NKRO_OFF",
+            "label": "NKRO Off",
             "aliases": [
                 "NK_OFF"
             ]
@@ -138,6 +157,7 @@
         "0x7013": {
             "group": "magic",
             "key": "QK_MAGIC_TOGGLE_NKRO",
+            "label": "Toggle NKRO",
             "aliases": [
                 "NK_TOGG"
             ]
@@ -145,6 +165,7 @@
         "0x7014": {
             "group": "magic",
             "key": "QK_MAGIC_SWAP_ALT_GUI",
+            "label": "Swap Alt⇄GUI",
             "aliases": [
                 "AG_SWAP"
             ]
@@ -152,6 +173,7 @@
         "0x7015": {
             "group": "magic",
             "key": "QK_MAGIC_UNSWAP_ALT_GUI",
+            "label": "Unswap Alt⇄GUI",
             "aliases": [
                 "AG_NORM"
             ]
@@ -159,6 +181,7 @@
         "0x7016": {
             "group": "magic",
             "key": "QK_MAGIC_TOGGLE_ALT_GUI",
+            "label": "Toggle Alt⇄GUI",
             "aliases": [
                 "AG_TOGG"
             ]
@@ -166,6 +189,7 @@
         "0x7017": {
             "group": "magic",
             "key": "QK_MAGIC_SWAP_LCTL_LGUI",
+            "label": "Swap LCtl⇄LGUI",
             "aliases": [
                 "CG_LSWP"
             ]
@@ -173,6 +197,7 @@
         "0x7018": {
             "group": "magic",
             "key": "QK_MAGIC_UNSWAP_LCTL_LGUI",
+            "label": "Unswap LCtl⇄LGUI",
             "aliases": [
                 "CG_LNRM"
             ]
@@ -180,6 +205,7 @@
         "0x7019": {
             "group": "magic",
             "key": "QK_MAGIC_SWAP_RCTL_RGUI",
+            "label": "Swap RCtl⇄RGUI",
             "aliases": [
                 "CG_RSWP"
             ]
@@ -187,6 +213,7 @@
         "0x701A": {
             "group": "magic",
             "key": "QK_MAGIC_UNSWAP_RCTL_RGUI",
+            "label": "Unswap RCtl⇄RGUI",
             "aliases": [
                 "CG_RNRM"
             ]
@@ -194,6 +221,7 @@
         "0x701B": {
             "group": "magic",
             "key": "QK_MAGIC_SWAP_CTL_GUI",
+            "label": "Swap Ctl⇄GUI",
             "aliases": [
                 "CG_SWAP"
             ]
@@ -201,6 +229,7 @@
         "0x701C": {
             "group": "magic",
             "key": "QK_MAGIC_UNSWAP_CTL_GUI",
+            "label": "Unswap Ctl⇄GUI",
             "aliases": [
                 "CG_NORM"
             ]
@@ -208,6 +237,7 @@
         "0x701D": {
             "group": "magic",
             "key": "QK_MAGIC_TOGGLE_CTL_GUI",
+            "label": "Toggle Ctl⇄GUI",
             "aliases": [
                 "CG_TOGG"
             ]
@@ -215,6 +245,7 @@
         "0x701E": {
             "group": "magic",
             "key": "QK_MAGIC_EE_HANDS_LEFT",
+            "label": "EE Hands Left",
             "aliases": [
                 "EH_LEFT"
             ]
@@ -222,6 +253,7 @@
         "0x701F": {
             "group": "magic",
             "key": "QK_MAGIC_EE_HANDS_RIGHT",
+            "label": "EE Hands Right",
             "aliases": [
                 "EH_RGHT"
             ]
@@ -229,6 +261,7 @@
         "0x7020": {
             "group": "magic",
             "key": "QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK",
+            "label": "Swap Esc⇄Caps",
             "aliases": [
                 "EC_SWAP"
             ]
@@ -236,6 +269,7 @@
         "0x7021": {
             "group": "magic",
             "key": "QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK",
+            "label": "Unswap Esc⇄Caps",
             "aliases": [
                 "EC_NORM"
             ]
@@ -243,6 +277,7 @@
         "0x7022": {
             "group": "magic",
             "key": "QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK",
+            "label": "Toggle Esc⇄Caps",
             "aliases": [
                 "EC_TOGG"
             ]

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

@@ -3,6 +3,7 @@
         "0x7C77": {
             "group": "quantum",
             "key": "QK_TRI_LAYER_LOWER",
+            "label": "Lower",
             "aliases": [
                 "TL_LOWR"
             ]
@@ -10,6 +11,7 @@
         "0x7C78": {
             "group": "quantum",
             "key": "QK_TRI_LAYER_UPPER",
+            "label": "Upper",
             "aliases": [
                 "TL_UPPR"
             ]

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

@@ -5,6 +5,7 @@
         "0x7200": {
             "group": "sequencer",
             "key": "QK_SEQUENCER_ON",
+            "label": "Sequencer On",
             "aliases": [
                 "SQ_ON"
             ]
@@ -12,6 +13,7 @@
         "0x7201": {
             "group": "sequencer",
             "key": "QK_SEQUENCER_OFF",
+            "label": "Sequencer Off",
             "aliases": [
                 "SQ_OFF"
             ]
@@ -19,6 +21,7 @@
         "0x7202": {
             "group": "sequencer",
             "key": "QK_SEQUENCER_TOGGLE",
+            "label": "Toggle Sequencer",
             "aliases": [
                 "SQ_TOGG"
             ]
@@ -26,6 +29,7 @@
         "0x7203": {
             "group": "sequencer",
             "key": "QK_SEQUENCER_TEMPO_DOWN",
+            "label": "Tempo Down",
             "aliases": [
                 "SQ_TMPD"
             ]
@@ -33,6 +37,7 @@
         "0x7204": {
             "group": "sequencer",
             "key": "QK_SEQUENCER_TEMPO_UP",
+            "label": "Tempo Up",
             "aliases": [
                 "SQ_TMPU"
             ]
@@ -40,6 +45,7 @@
         "0x7205": {
             "group": "sequencer",
             "key": "QK_SEQUENCER_RESOLUTION_DOWN",
+            "label": "Resolution Down",
             "aliases": [
                 "SQ_RESD"
             ]
@@ -47,6 +53,7 @@
         "0x7206": {
             "group": "sequencer",
             "key": "QK_SEQUENCER_RESOLUTION_UP",
+            "label": "Resolution Up",
             "aliases": [
                 "SQ_RESU"
             ]
@@ -54,6 +61,7 @@
         "0x7207": {
             "group": "sequencer",
             "key": "QK_SEQUENCER_STEPS_ALL",
+            "label": "All Steps",
             "aliases": [
                 "SQ_SALL"
             ]
@@ -61,6 +69,7 @@
         "0x7208": {
             "group": "sequencer",
             "key": "QK_SEQUENCER_STEPS_CLEAR",
+            "label": "Clear Steps",
             "aliases": [
                 "SQ_SCLR"
             ]

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

@@ -3,6 +3,7 @@
         "0x56F0": {
             "group": "swap_hands",
             "key": "QK_SWAP_HANDS_TOGGLE",
+            "label": "Toggle Swap Hands",
             "aliases": [
                 "SH_TOGG"
             ]
@@ -10,6 +11,7 @@
         "0x56F1": {
             "group": "swap_hands",
             "key": "QK_SWAP_HANDS_TAP_TOGGLE",
+            "label": "Swap Hands Tap Toggle",
             "aliases": [
                 "SH_TT"
             ]
@@ -17,6 +19,7 @@
         "0x56F2": {
             "group": "swap_hands",
             "key": "QK_SWAP_HANDS_MOMENTARY_ON",
+            "label": "Swap Hands Momentary On",
             "aliases": [
                 "SH_MON"
             ]
@@ -24,6 +27,7 @@
         "0x56F3": {
             "group": "swap_hands",
             "key": "QK_SWAP_HANDS_MOMENTARY_OFF",
+            "label": "Swap Hands Momentary Off",
             "aliases": [
                 "SH_MOFF"
             ]
@@ -31,6 +35,7 @@
         "0x56F4": {
             "group": "swap_hands",
             "key": "QK_SWAP_HANDS_OFF",
+            "label": "Unswap Hands",
             "aliases": [
                 "SH_OFF"
             ]
@@ -38,6 +43,7 @@
         "0x56F5": {
             "group": "swap_hands",
             "key": "QK_SWAP_HANDS_ON",
+            "label": "Swap Hands",
             "aliases": [
                 "SH_ON"
             ]
@@ -45,6 +51,7 @@
         "0x56F6": {
             "group": "swap_hands",
             "key": "QK_SWAP_HANDS_ONE_SHOT",
+            "label": "Swap Hands One Shot",
             "aliases": [
                 "SH_OS"
             ]

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

@@ -2,131 +2,163 @@
     "keycodes": {
         "0x7E40": {
             "group": "user",
-            "key": "QK_USER_0"
+            "key": "QK_USER_0",
+            "label": "User 0"
         },
         "0x7E41": {
             "group": "user",
-            "key": "QK_USER_1"
+            "key": "QK_USER_1",
+            "label": "User 1"
         },
         "0x7E42": {
             "group": "user",
-            "key": "QK_USER_2"
+            "key": "QK_USER_2",
+            "label": "User 2"
         },
         "0x7E43": {
             "group": "user",
-            "key": "QK_USER_3"
+            "key": "QK_USER_3",
+            "label": "User 3"
         },
         "0x7E44": {
             "group": "user",
-            "key": "QK_USER_4"
+            "key": "QK_USER_4",
+            "label": "User 4"
         },
         "0x7E45": {
             "group": "user",
-            "key": "QK_USER_5"
+            "key": "QK_USER_5",
+            "label": "User 5"
         },
         "0x7E46": {
             "group": "user",
-            "key": "QK_USER_6"
+            "key": "QK_USER_6",
+            "label": "User 6"
         },
         "0x7E47": {
             "group": "user",
-            "key": "QK_USER_7"
+            "key": "QK_USER_7",
+            "label": "User 7"
         },
         "0x7E48": {
             "group": "user",
-            "key": "QK_USER_8"
+            "key": "QK_USER_8",
+            "label": "User 8"
         },
         "0x7E49": {
             "group": "user",
-            "key": "QK_USER_9"
+            "key": "QK_USER_9",
+            "label": "User 9"
         },
         "0x7E4A": {
             "group": "user",
-            "key": "QK_USER_10"
+            "key": "QK_USER_10",
+            "label": "User 10"
         },
         "0x7E4B": {
             "group": "user",
-            "key": "QK_USER_11"
+            "key": "QK_USER_11",
+            "label": "User 11"
         },
         "0x7E4C": {
             "group": "user",
-            "key": "QK_USER_12"
+            "key": "QK_USER_12",
+            "label": "User 12"
         },
         "0x7E4D": {
             "group": "user",
-            "key": "QK_USER_13"
+            "key": "QK_USER_13",
+            "label": "User 13"
         },
         "0x7E4E": {
             "group": "user",
-            "key": "QK_USER_14"
+            "key": "QK_USER_14",
+            "label": "User 14"
         },
         "0x7E4F": {
             "group": "user",
-            "key": "QK_USER_15"
+            "key": "QK_USER_15",
+            "label": "User 15"
         },
         "0x7E50": {
             "group": "user",
-            "key": "QK_USER_16"
+            "key": "QK_USER_16",
+            "label": "User 16"
         },
         "0x7E51": {
             "group": "user",
-            "key": "QK_USER_17"
+            "key": "QK_USER_17",
+            "label": "User 17"
         },
          "0x7E52": {
             "group": "user",
-            "key": "QK_USER_18"
+            "key": "QK_USER_18",
+            "label": "User 18"
         },
         "0x7E53": {
             "group": "user",
-            "key": "QK_USER_19"
+            "key": "QK_USER_19",
+            "label": "User 19"
         },
         "0x7E54": {
             "group": "user",
-            "key": "QK_USER_20"
+            "key": "QK_USER_20",
+            "label": "User 20"
         },
         "0x7E55": {
             "group": "user",
-            "key": "QK_USER_21"
+            "key": "QK_USER_21",
+            "label": "User 21"
         },
         "0x7E56": {
             "group": "user",
-            "key": "QK_USER_22"
+            "key": "QK_USER_22",
+            "label": "User 22"
         },
         "0x7E57": {
             "group": "user",
-            "key": "QK_USER_23"
+            "key": "QK_USER_23",
+            "label": "User 23"
         },
         "0x7E58": {
             "group": "user",
-            "key": "QK_USER_24"
+            "key": "QK_USER_24",
+            "label": "User 24"
         },
         "0x7E59": {
             "group": "user",
-            "key": "QK_USER_25"
+            "key": "QK_USER_25",
+            "label": "User 25"
         },
         "0x7E5A": {
             "group": "user",
-            "key": "QK_USER_26"
+            "key": "QK_USER_26",
+            "label": "User 26"
         },
         "0x7E5B": {
             "group": "user",
-            "key": "QK_USER_27"
+            "key": "QK_USER_27",
+            "label": "User 27"
         },
         "0x7E5C": {
             "group": "user",
-            "key": "QK_USER_28"
+            "key": "QK_USER_28",
+            "label": "User 28"
         },
         "0x7E5D": {
             "group": "user",
-            "key": "QK_USER_29"
+            "key": "QK_USER_29",
+            "label": "User 29"
         },
         "0x7E5E": {
             "group": "user",
-            "key": "QK_USER_30"
+            "key": "QK_USER_30",
+            "label": "User 30"
         },
         "0x7E5F": {
             "group": "user",
-            "key": "QK_USER_31"
+            "key": "QK_USER_31",
+            "label": "User 31"
         }
     }
 }

data/constants/keycodes/keycodes_0.0.3_quantum.hjson

@@ -3,6 +3,7 @@
        "0x7C79": {
             "group": "quantum",
             "key": "QK_REPEAT_KEY",
+            "label": "Repeat",
             "aliases": [
                 "QK_REP"
             ]
@@ -10,6 +11,7 @@
         "0x7C7A": {
             "group": "quantum",
             "key": "QK_ALT_REPEAT_KEY",
+            "label": "Repeat Alternate",
             "aliases": [
                 "QK_AREP"
             ]

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

@@ -3,6 +3,7 @@
         "0x7810": {
             "group": "led_matrix",
             "key": "QK_LED_MATRIX_ON",
+            "label": "LED Matrix On",
             "aliases": [
                 "LM_ON"
             ]
@@ -10,6 +11,7 @@
         "0x7811": {
             "group": "led_matrix",
             "key": "QK_LED_MATRIX_OFF",
+            "label": "LED Matrix Off",
             "aliases": [
                 "LM_OFF"
             ]
@@ -17,6 +19,7 @@
         "0x7812": {
             "group": "led_matrix",
             "key": "QK_LED_MATRIX_TOGGLE",
+            "label": "Toggle LED Matrix",
             "aliases": [
                 "LM_TOGG"
             ]
@@ -24,6 +27,7 @@
         "0x7813": {
             "group": "led_matrix",
             "key": "QK_LED_MATRIX_MODE_NEXT",
+            "label": "LED Matrix Next",
             "aliases": [
                 "LM_NEXT"
             ]
@@ -31,6 +35,7 @@
         "0x7814": {
             "group": "led_matrix",
             "key": "QK_LED_MATRIX_MODE_PREVIOUS",
+            "label": "LED Matrix Previous",
             "aliases": [
                 "LM_PREV"
             ]
@@ -38,6 +43,7 @@
         "0x7815": {
             "group": "led_matrix",
             "key": "QK_LED_MATRIX_BRIGHTNESS_UP",
+            "label": "LED Matrix Brightness Up",
             "aliases": [
                 "LM_BRIU"
             ]
@@ -45,6 +51,7 @@
         "0x7816": {
             "group": "led_matrix",
             "key": "QK_LED_MATRIX_BRIGHTNESS_DOWN",
+            "label": "LED Matrix Brightness Down",
             "aliases": [
                 "LM_BRID"
             ]
@@ -52,6 +59,7 @@
         "0x7817": {
             "group": "led_matrix",
             "key": "QK_LED_MATRIX_SPEED_UP",
+            "label": "LED Matrix Speed Up",
             "aliases": [
                 "LM_SPDU"
             ]
@@ -59,6 +67,7 @@
         "0x7818": {
             "group": "led_matrix",
             "key": "QK_LED_MATRIX_SPEED_DOWN",
+            "label": "LED Matrix Speed Down",
             "aliases": [
                 "LM_SPDD"
             ]
@@ -67,6 +76,7 @@
         "0x7820": {
             "group": "underglow",
             "key": "QK_UNDERGLOW_TOGGLE",
+            "label": "Toggle RGB Underglow",
             "aliases": [
                 "UG_TOGG"
             ]
@@ -74,6 +84,7 @@
         "0x7821": {
             "group": "underglow",
             "key": "QK_UNDERGLOW_MODE_NEXT",
+            "label": "RGB Underglow Next",
             "aliases": [
                 "!reset!",
                 "UG_NEXT"
@@ -82,6 +93,7 @@
         "0x7822": {
             "group": "underglow",
             "key": "QK_UNDERGLOW_MODE_PREVIOUS",
+            "label": "RGB Underglow Previous",
             "aliases": [
                 "!reset!",
                 "UG_PREV"
@@ -90,6 +102,7 @@
         "0x7823": {
             "group": "underglow",
             "key": "QK_UNDERGLOW_HUE_UP",
+            "label": "RGB Underglow Hue Up",
             "aliases": [
                 "UG_HUEU"
             ]
@@ -97,6 +110,7 @@
         "0x7824": {
             "group": "underglow",
             "key": "QK_UNDERGLOW_HUE_DOWN",
+            "label": "RGB Underglow Hue Down",
             "aliases": [
                 "UG_HUED"
             ]
@@ -104,6 +118,7 @@
         "0x7825": {
             "group": "underglow",
             "key": "QK_UNDERGLOW_SATURATION_UP",
+            "label": "RGB Underglow Saturation Up",
             "aliases": [
                 "UG_SATU"
             ]
@@ -111,6 +126,7 @@
         "0x7826": {
             "group": "underglow",
             "key": "QK_UNDERGLOW_SATURATION_DOWN",
+            "label": "RGB Underglow Saturation Down",
             "aliases": [
                 "UG_SATD"
             ]
@@ -118,6 +134,7 @@
         "0x7827": {
             "group": "underglow",
             "key": "QK_UNDERGLOW_VALUE_UP",
+            "label": "RGB Underglow Value Up",
             "aliases": [
                 "UG_VALU"
             ]
@@ -125,6 +142,7 @@
         "0x7828": {
             "group": "underglow",
             "key": "QK_UNDERGLOW_VALUE_DOWN",
+            "label": "RGB Underglow Value Down",
             "aliases": [
                 "UG_VALD"
             ]
@@ -132,6 +150,7 @@
         "0x7829": {
             "group": "underglow",
             "key": "QK_UNDERGLOW_SPEED_UP",
+            "label": "RGB Underglow Speed Up",
             "aliases": [
                 "UG_SPDU"
             ]
@@ -139,6 +158,7 @@
         "0x782A": {
             "group": "underglow",
             "key": "QK_UNDERGLOW_SPEED_DOWN",
+            "label": "RGB Underglow Speed Down",
             "aliases": [
                 "UG_SPDD"
             ]
@@ -147,6 +167,7 @@
         "0x7840": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_ON",
+            "label": "RGB Matrix On",
             "aliases": [
                 "RM_ON"
             ]
@@ -154,6 +175,7 @@
         "0x7841": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_OFF",
+            "label": "RGB Matrix Off"
             "aliases": [
                 "RM_OFF"
             ]
@@ -161,6 +183,7 @@
         "0x7842": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_TOGGLE",
+            "label": "Toggle RGB Matrix",
             "aliases": [
                 "RM_TOGG"
             ]
@@ -168,6 +191,7 @@
         "0x7843": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_MODE_NEXT",
+            "label": "RGB Matrix Next",
             "aliases": [
                 "RM_NEXT"
             ]
@@ -175,6 +199,7 @@
         "0x7844": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_MODE_PREVIOUS",
+            "label": "RGB Matrix Previous",
             "aliases": [
                 "RM_PREV"
             ]
@@ -182,6 +207,7 @@
         "0x7845": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_HUE_UP",
+            "label": "RGB Matrix Hue Up",
             "aliases": [
                 "RM_HUEU"
             ]
@@ -189,6 +215,7 @@
         "0x7846": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_HUE_DOWN",
+            "label": "RGB Matrix Hue Down",
             "aliases": [
                 "RM_HUED"
             ]
@@ -196,6 +223,7 @@
         "0x7847": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_SATURATION_UP",
+            "label": "RGB Matrix Saturation Up",
             "aliases": [
                 "RM_SATU"
             ]
@@ -203,6 +231,7 @@
         "0x7848": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_SATURATION_DOWN",
+            "label": "RGB Matrix Saturation Down",
             "aliases": [
                 "RM_SATD"
             ]
@@ -210,6 +239,7 @@
         "0x7849": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_VALUE_UP",
+            "label": "RGB Matrix Value Up",
             "aliases": [
                 "RM_VALU"
             ]
@@ -217,6 +247,7 @@
         "0x784A": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_VALUE_DOWN",
+            "label": "RGB Matrix Value Down",
             "aliases": [
                 "RM_VALD"
             ]
@@ -224,6 +255,7 @@
         "0x784B": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_SPEED_UP",
+            "label": "RGB Matrix Speed Up",
             "aliases": [
                 "RM_SPDU"
             ]
@@ -231,6 +263,7 @@
         "0x784C": {
             "group": "rgb_matrix",
             "key": "QK_RGB_MATRIX_SPEED_DOWN",
+            "label": "RGB Matrix Speed Down",
             "aliases": [
                 "RM_SPDD"
             ]

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

@@ -3,7 +3,7 @@
         "0x00CD": {
             "group": "mouse",
             "key": "QK_MOUSE_CURSOR_UP",
-            "label": "Mouse cursor up",
+            "label": "Mouse Up",
             "aliases": [
                 "!reset!",
                 "MS_UP"
@@ -12,7 +12,7 @@
         "0x00CE": {
             "group": "mouse",
             "key": "QK_MOUSE_CURSOR_DOWN",
-            "label": "Mouse cursor down",
+            "label": "Mouse Down",
             "aliases": [
                 "!reset!",
                 "MS_DOWN"
@@ -21,7 +21,7 @@
         "0x00CF": {
             "group": "mouse",
             "key": "QK_MOUSE_CURSOR_LEFT",
-            "label": "Mouse cursor left",
+            "label": "Mouse Left",
             "aliases": [
                 "!reset!",
                 "MS_LEFT"
@@ -30,7 +30,7 @@
         "0x00D0": {
             "group": "mouse",
             "key": "QK_MOUSE_CURSOR_RIGHT",
-            "label": "Mouse cursor right",
+            "label": "Mouse Right",
             "aliases": [
                 "!reset!",
                 "MS_RGHT"
@@ -39,7 +39,7 @@
         "0x00D1": {
             "group": "mouse",
             "key": "QK_MOUSE_BUTTON_1",
-            "label": "Mouse button 1",
+            "label": "Mouse Button 1",
             "aliases": [
                 "!reset!",
                 "MS_BTN1"
@@ -48,7 +48,7 @@
         "0x00D2": {
             "group": "mouse",
             "key": "QK_MOUSE_BUTTON_2",
-            "label": "Mouse button 2",
+            "label": "Mouse Button 2",
             "aliases": [
                 "!reset!",
                 "MS_BTN2"
@@ -57,7 +57,7 @@
         "0x00D3": {
             "group": "mouse",
             "key": "QK_MOUSE_BUTTON_3",
-            "label": "Mouse button 3",
+            "label": "Mouse Button 3",
             "aliases": [
                 "!reset!",
                 "MS_BTN3"
@@ -66,7 +66,7 @@
         "0x00D4": {
             "group": "mouse",
             "key": "QK_MOUSE_BUTTON_4",
-            "label": "Mouse button 4",
+            "label": "Mouse Button 4",
             "aliases": [
                 "!reset!",
                 "MS_BTN4"
@@ -75,7 +75,7 @@
         "0x00D5": {
             "group": "mouse",
             "key": "QK_MOUSE_BUTTON_5",
-            "label": "Mouse button 5",
+            "label": "Mouse Button 5",
             "aliases": [
                 "!reset!",
                 "MS_BTN5"
@@ -84,7 +84,7 @@
         "0x00D6": {
             "group": "mouse",
             "key": "QK_MOUSE_BUTTON_6",
-            "label": "Mouse button 6",
+            "label": "Mouse Button 6",
             "aliases": [
                 "!reset!",
                 "MS_BTN6"
@@ -93,7 +93,7 @@
         "0x00D7": {
             "group": "mouse",
             "key": "QK_MOUSE_BUTTON_7",
-            "label": "Mouse button 7",
+            "label": "Mouse Button 7",
             "aliases": [
                 "!reset!",
                 "MS_BTN7"
@@ -102,7 +102,7 @@
         "0x00D8": {
             "group": "mouse",
             "key": "QK_MOUSE_BUTTON_8",
-            "label": "Mouse button 8",
+            "label": "Mouse Button 8",
             "aliases": [
                 "!reset!",
                 "MS_BTN8"
@@ -111,7 +111,7 @@
         "0x00D9": {
             "group": "mouse",
             "key": "QK_MOUSE_WHEEL_UP",
-            "label": "Mouse wheel up",
+            "label": "Mouse Wheel Up",
             "aliases": [
                 "!reset!",
                 "MS_WHLU"
@@ -120,7 +120,7 @@
         "0x00DA": {
             "group": "mouse",
             "key": "QK_MOUSE_WHEEL_DOWN",
-            "label": "Mouse wheel down",
+            "label": "Mouse Wheel Down",
             "aliases": [
                 "!reset!",
                 "MS_WHLD"
@@ -129,7 +129,7 @@
         "0x00DB": {
             "group": "mouse",
             "key": "QK_MOUSE_WHEEL_LEFT",
-            "label": "Mouse wheel left",
+            "label": "Mouse Wheel Left",
             "aliases": [
                 "!reset!",
                 "MS_WHLL"
@@ -138,7 +138,7 @@
         "0x00DC": {
             "group": "mouse",
             "key": "QK_MOUSE_WHEEL_RIGHT",
-            "label": "Mouse wheel right",
+            "label": "Mouse Wheel Right",
             "aliases": [
                 "!reset!",
                 "MS_WHLR"
@@ -147,7 +147,7 @@
         "0x00DD": {
             "group": "mouse",
             "key": "QK_MOUSE_ACCELERATION_0",
-            "label": "Set mouse acceleration to 0",
+            "label": "Acceleration 0",
             "aliases": [
                 "!reset!",
                 "MS_ACL0"
@@ -156,7 +156,7 @@
         "0x00DE": {
             "group": "mouse",
             "key": "QK_MOUSE_ACCELERATION_1",
-            "label": "Set mouse acceleration to 1",
+            "label": "Acceleration 1",
             "aliases": [
                 "!reset!",
                 "MS_ACL1"
@@ -165,7 +165,7 @@
         "0x00DF": {
             "group": "mouse",
             "key": "QK_MOUSE_ACCELERATION_2",
-            "label": "Set mouse acceleration to 2",
+            "label": "Acceleration 2",
             "aliases": [
                 "!reset!",
                 "MS_ACL2"

data/constants/keycodes/keycodes_0.0.6_connection.hjson

@@ -8,6 +8,7 @@
         "0x7780": {
             "group": "connection",
             "key": "QK_OUTPUT_AUTO",
+            "label": "Output Auto",
             "aliases": [
                 "OU_AUTO"
             ]
@@ -15,6 +16,7 @@
         "0x7781": {
             "group": "connection",
             "key": "QK_OUTPUT_NEXT",
+            "label": "Next Output",
             "aliases": [
                 "OU_NEXT"
             ]
@@ -22,6 +24,7 @@
         "0x7782": {
             "group": "connection",
             "key": "QK_OUTPUT_PREV",
+            "label": "Previous Output",
             "aliases": [
                 "OU_PREV"
             ]
@@ -29,6 +32,7 @@
         "0x7783": {
             "group": "connection",
             "key": "QK_OUTPUT_NONE",
+            "label": "None",
             "aliases": [
                 "OU_NONE"
             ]
@@ -36,6 +40,7 @@
         "0x7784": {
             "group": "connection",
             "key": "QK_OUTPUT_USB",
+            "label": "USB",
             "aliases": [
                 "OU_USB"
             ]
@@ -43,6 +48,7 @@
         "0x7785": {
             "group": "connection",
             "key": "QK_OUTPUT_2P4GHZ",
+            "label": "2.4GHz",
             "aliases": [
                 "OU_2P4G"
             ]
@@ -50,6 +56,7 @@
         "0x7786": {
             "group": "connection",
             "key": "QK_OUTPUT_BLUETOOTH",
+            "label": "Bluetooth",
             "aliases": [
                 "OU_BT"
             ]
@@ -58,6 +65,7 @@
         "0x7790": {
             "group": "connection",
             "key": "QK_BLUETOOTH_PROFILE_NEXT",
+            "label": "Bluetooth Profile Next",
             "aliases": [
                 "BT_NEXT"
             ]
@@ -65,6 +73,7 @@
         "0x7791": {
             "group": "connection",
             "key": "QK_BLUETOOTH_PROFILE_PREV",
+            "label": "Bluetooth Profile Previous",
             "aliases": [
                 "BT_PREV"
             ]
@@ -72,6 +81,7 @@
         "0x7792": {
             "group": "connection",
             "key": "QK_BLUETOOTH_UNPAIR",
+            "label": "Unpair",
             "aliases": [
                 "BT_UNPR"
             ]
@@ -79,6 +89,7 @@
         "0x7793": {
             "group": "connection",
             "key": "QK_BLUETOOTH_PROFILE1",
+            "label": "Bluetooth Profile 1",
             "aliases": [
                 "BT_PRF1"
             ]
@@ -86,6 +97,7 @@
         "0x7794": {
             "group": "connection",
             "key": "QK_BLUETOOTH_PROFILE2",
+            "label": "Bluetooth Profile 2",
             "aliases": [
                 "BT_PRF2"
             ]
@@ -93,6 +105,7 @@
         "0x7795": {
             "group": "connection",
             "key": "QK_BLUETOOTH_PROFILE3",
+            "label": "Bluetooth Profile 3",
             "aliases": [
                 "BT_PRF3"
             ]
@@ -100,6 +113,7 @@
         "0x7796": {
             "group": "connection",
             "key": "QK_BLUETOOTH_PROFILE4",
+            "label": "Bluetooth Profile 4",
             "aliases": [
                 "BT_PRF4"
             ]
@@ -107,6 +121,7 @@
         "0x7797": {
             "group": "connection",
             "key": "QK_BLUETOOTH_PROFILE5",
+            "label": "Bluetooth Profile 5",
             "aliases": [
                 "BT_PRF5"
             ]

data/constants/keycodes/keycodes_0.0.6_quantum.hjson

@@ -6,6 +6,7 @@
         "0x7C7B": {
             "group": "quantum",
             "key": "QK_LAYER_LOCK",
+            "label": "Layer Lock",
             "aliases": [
                 "QK_LLCK"
             ]

data/constants/module_hooks/1.1.2.hjson

@@ -0,0 +1,3 @@
+{
+    // This version exists to signify addition of split data sync support.
+}

docs/ChangeLog/20260222.md

@@ -0,0 +1,75 @@
+# QMK Breaking Changes - 2026 Feb 22 Changelog
+
+## Deprecation Notices
+
+### Removal of deprecated GPIO defines ([#26028](https://github.com/qmk/qmk_firmware/pull/26028))
+
+QMK has long used Arduino-style GPIO naming conventions. This has been confusing for users, as over time they've had new variations added, as well as users mistakenly thinking that QMK supports the rest of the Arduino ecosystem.
+
+The decision was made to rename the GPIO manipulation functions with ones matching QMK Firmware's code styling.
+
+Previous backwards compatibility has now been removed. see the [GPIO Control](../drivers/gpio#macros) documentation for more information.
+
+### Removal of deprecated isLeftHand ([25897](https://github.com/qmk/qmk_firmware/pull/25897))
+
+Users should migrate to `is_keyboard_left()` found in `split_util.h` instead. For example:
+
+```diff
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+-    return isLeftHand ? OLED_ROTATION_180 : OLED_ROTATION_0;
++    return is_keyboard_left() ? OLED_ROTATION_180 : OLED_ROTATION_0;
+}
+```
+
+The deprecated variable `isLeftHand` will be removed in a future breaking changes cycle.
+
+## Full changelist
+
+Core:
+* Refactor Makefile logic for locating keymaps ([#25808](https://github.com/qmk/qmk_firmware/pull/25808))
+* Move shutdown delay to audio feature ([#25859](https://github.com/qmk/qmk_firmware/pull/25859))
+* Refactor core use of deprecated `isLeftHand` ([#25888](https://github.com/qmk/qmk_firmware/pull/25888))
+* Allow custom data sync for community modules ([#25955](https://github.com/qmk/qmk_firmware/pull/25955))
+* Remove an unreachable break statement ([#26006](https://github.com/qmk/qmk_firmware/pull/26006))
+* Remove duplicate host.h ([#26007](https://github.com/qmk/qmk_firmware/pull/26007))
+* Remove redundant EEPROM update ([#26008](https://github.com/qmk/qmk_firmware/pull/26008))
+* Remove redundant unsigned comparison in apa102_set_brightness ([#26010](https://github.com/qmk/qmk_firmware/pull/26010))
+* Remove unused headers ([#26011](https://github.com/qmk/qmk_firmware/pull/26011))
+* Return INVALID_DEFERRED_TOKEN on allocation failure ([#26012](https://github.com/qmk/qmk_firmware/pull/26012))
+* Remove deprecated GPIO defines ([#26028](https://github.com/qmk/qmk_firmware/pull/26028))
+
+CLI:
+* Enforce EOL when formatting files ([#24989](https://github.com/qmk/qmk_firmware/pull/24989))
+* Allow keymap.json to disable config flags ([#25502](https://github.com/qmk/qmk_firmware/pull/25502))
+* Remove unused `qmk.keymap.write_file`/`qmk.keymap.write_json` ([#25854](https://github.com/qmk/qmk_firmware/pull/25854))
+* Include userspace version (QMK_USERSPACE_VERSION) in version.h ([#25882](https://github.com/qmk/qmk_firmware/pull/25882))
+* Lint out-of-bounds bootmagic config ([#25899](https://github.com/qmk/qmk_firmware/pull/25899))
+* Report permission issues in `qmk doctor` ([#25931](https://github.com/qmk/qmk_firmware/pull/25931))
+* Minor alignment of CLI formatting commands ([#25946](https://github.com/qmk/qmk_firmware/pull/25946))
+* Update lint to validate keymap names ([#25969](https://github.com/qmk/qmk_firmware/pull/25969))
+* Add 'none of the above' to `new-keyboard` dev board prompt ([#25998](https://github.com/qmk/qmk_firmware/pull/25998))
+* Remove `config_h_features` from generated `info.json` ([#26024](https://github.com/qmk/qmk_firmware/pull/26024))
+* Promote duplication of defaults check to error ([#26025](https://github.com/qmk/qmk_firmware/pull/26025))
+
+Keyboards:
+* Add Soldered Macro Pad ([#25834](https://github.com/qmk/qmk_firmware/pull/25834))
+* Remove redundant URLs from `.json` ([#25856](https://github.com/qmk/qmk_firmware/pull/25856))
+* Guard encoder behaviour on `projectcain/vault*` ([#25864](https://github.com/qmk/qmk_firmware/pull/25864))
+* Refactor keyboard/keymap use of deprecated `isLeftHand` ([#25891](https://github.com/qmk/qmk_firmware/pull/25891))
+* Remove some unnecessary matrix externs ([#25975](https://github.com/qmk/qmk_firmware/pull/25975))
+* Migrate ROW_SHIFTER to core MATRIX_ROW_SHIFTER ([#25977](https://github.com/qmk/qmk_firmware/pull/25977))
+
+Keyboard fixes:
+* Fix out-of-bounds bootmagic config ([#25898](https://github.com/qmk/qmk_firmware/pull/25898))
+* Fix incorrect `matrix_scan_custom` implementations ([#25999](https://github.com/qmk/qmk_firmware/pull/25999))
+
+Others:
+* Add missing labels to DD keycode definitions ([#25503](https://github.com/qmk/qmk_firmware/pull/25503))
+* Copilot instructions for pull requests ([#25857](https://github.com/qmk/qmk_firmware/pull/25857))
+
+Bugs:
+* Fix flash wear leveling sector calculation ([#24776](https://github.com/qmk/qmk_firmware/pull/24776))
+* [Bugfix] WS2812 indexing in split boards ([#25407](https://github.com/qmk/qmk_firmware/pull/25407))
+* Correctly resolve keyboard alias during 'qmk new-keymap' ([#25570](https://github.com/qmk/qmk_firmware/pull/25570))
+* Fixes for is31fl3729 LED matrix driver off-by-one errors ([#25902](https://github.com/qmk/qmk_firmware/pull/25902))
+* Match Key override index type to bounds type to prevent overflow ([#25939](https://github.com/qmk/qmk_firmware/pull/25939))

docs/_sidebar.json

@@ -214,7 +214,7 @@
                     { "text": "My Pull Request Was Flagged", "link": "/breaking_changes_instructions" },
                     {
                         "text": "Most Recent ChangeLog",
-                        "link": "/ChangeLog/20251130"
+                        "link": "/ChangeLog/20260222"
                     },
                     { "text": "Past Breaking Changes", "link": "/breaking_changes_history" },
                     { "text": "Deprecation Policy", "link": "/support_deprecation_policy" }

docs/breaking_changes.md

@@ -10,25 +10,25 @@ Practically, this means QMK merges the `develop` branch into the `master` branch
 
 ## What has been included in past Breaking Changes?
 
+* [2026 Feb 22](ChangeLog/20260222)
 * [2025 Nov 30](ChangeLog/20251130)
 * [2025 Aug 31](ChangeLog/20250831)
-* [2025 May 25](ChangeLog/20250525)
 * [Older Breaking Changes](breaking_changes_history)
 
 ## When is the next Breaking Change?
 
-The next Breaking Change is scheduled for February 22, 2026.
+The next Breaking Change is scheduled for May 31, 2026.
 
 ### Important Dates
 
-* 2025 Nov 30 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
+* 2025 Feb 22 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
-* 2026 Jan 25 - `develop` closed to new PRs.
+* 2026 May 3 - `develop` closed to new PRs.
-* 2026 Jan 25 - Call for testers.
+* 2026 May 3 - Call for testers.
-* 2026 Feb 8 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
+* 2026 May 17 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
-* 2026 Feb 15 - `develop` is locked, only critical bugfix PRs merged.
+* 2026 May 24 - `develop` is locked, only critical bugfix PRs merged.
-* 2026 Feb 20 - `master` is locked, no PRs merged.
+* 2026 May 29 - `master` is locked, no PRs merged.
-* 2026 Feb 22 - Merge `develop` to `master`.
+* 2026 May 31 - Merge `develop` to `master`.
-* 2026 Feb 22 - `master` is unlocked. PRs can be merged again.
+* 2026 May 31 - `master` is unlocked. PRs can be merged again.
 
 ## What changes will be included?
 

docs/breaking_changes_history.md

@@ -2,6 +2,7 @@
 
 This page links to all previous changelogs from the QMK Breaking Changes process.
 
+* [2026 Feb 22](ChangeLog/20260222) - version 0.32.0
 * [2025 Nov 30](ChangeLog/20251130) - version 0.31.0
 * [2025 Aug 31](ChangeLog/20250831) - version 0.30.0
 * [2025 May 25](ChangeLog/20250525) - version 0.29.0

docs/features/community_modules.md

@@ -95,6 +95,10 @@ The use of `features` matches the definition normally provided within `keyboard.
 
 The `keycodes` array allows a module to provide new keycodes (as well as corresponding aliases) to a keymap.
 
+### `config.h`
+
+This file will be automatically added to the build as if it were present in the keyboard or keymap.
+
 ### `rules.mk` / `post_rules.mk`
 
 These two files follows standard QMK build system logic, allowing for `Makefile`-style customisation as if it were present in the keyboard or keymap.
@@ -131,6 +135,10 @@ This file defines LED matrix effects in the same form as used with `led_matrix_k
 
 This file defines RGB matrix effects in the same form as used with `rgb_matrix_kb.inc` and `rgb_matrix_user.inc` (see [Custom RGB Matrix Effects](rgb_matrix#custom-rgb-matrix-effects)). Effect mode names are prepended with `RGB_MATRIX_COMMUNITY_MODULE_`.
 
+### Custom split keyboard data sync
+
+Defines follow the convention, `SPLIT_TRANSACTION_IDS_MODULE_<MODULE>` (see [Custom LED Matrix Effects](split_keyboard#custom-data-sync)). 
+
 ### Compatible APIs
 
 Community Modules may provide specializations for the following APIs:

drivers/encoder/encoder_quadrature.c

@@ -27,8 +27,6 @@
 #    define ENCODER_DEFAULT_PIN_API_IMPL
 #endif
 
-extern volatile bool isLeftHand;
-
 __attribute__((weak)) void    encoder_quadrature_init_pin(uint8_t index, bool pad_b);
 __attribute__((weak)) uint8_t encoder_quadrature_read_pin(uint8_t index, bool pad_b);
 
@@ -108,10 +106,10 @@ void encoder_quadrature_post_init(void) {
 
 void encoder_driver_init(void) {
 #ifdef SPLIT_KEYBOARD
-    thisHand  = isLeftHand ? 0 : NUM_ENCODERS_LEFT;
+    thisHand  = is_keyboard_left() ? 0 : NUM_ENCODERS_LEFT;
     thatHand  = NUM_ENCODERS_LEFT - thisHand;
-    thisCount = isLeftHand ? NUM_ENCODERS_LEFT : NUM_ENCODERS_RIGHT;
+    thisCount = is_keyboard_left() ? NUM_ENCODERS_LEFT : NUM_ENCODERS_RIGHT;
-    thatCount = isLeftHand ? NUM_ENCODERS_RIGHT : NUM_ENCODERS_LEFT;
+    thatCount = is_keyboard_left() ? NUM_ENCODERS_RIGHT : NUM_ENCODERS_LEFT;
 #else // SPLIT_KEYBOARD
     thisCount = NUM_ENCODERS;
 #endif
@@ -133,7 +131,7 @@ void encoder_driver_init(void) {
 
 #if defined(SPLIT_KEYBOARD) && defined(ENCODER_A_PINS_RIGHT) && defined(ENCODER_B_PINS_RIGHT)
     // Re-initialise the pads if it's the right-hand side
-    if (!isLeftHand) {
+    if (!is_keyboard_left()) {
         const pin_t encoders_pad_a_right[] = ENCODER_A_PINS_RIGHT;
         const pin_t encoders_pad_b_right[] = ENCODER_B_PINS_RIGHT;
         for (uint8_t i = 0; i < thisCount; i++) {

drivers/led/apa102.c

@@ -145,8 +145,6 @@ void apa102_flush(void) {
 void apa102_set_brightness(uint8_t brightness) {
     if (brightness > APA102_MAX_BRIGHTNESS) {
         apa102_led_brightness = APA102_MAX_BRIGHTNESS;
-    } else if (brightness < 0) {
-        apa102_led_brightness = 0;
     } else {
         apa102_led_brightness = brightness;
     }

drivers/led/issi/is31fl3729-mono.c

@@ -107,7 +107,7 @@ void is31fl3729_write_pwm_buffer(uint8_t index) {
     // Transmit PWM registers in 11 transfers of 13 bytes.
 
     // Iterate over the pwm_buffer contents at 13 byte intervals.
-    for (uint8_t i = 0; i <= IS31FL3729_PWM_REGISTER_COUNT; i += 13) {
+    for (uint8_t i = 0; i < IS31FL3729_PWM_REGISTER_COUNT; i += 13) {
 #if IS31FL3729_I2C_PERSISTENCE > 0
         for (uint8_t j = 0; j < IS31FL3729_I2C_PERSISTENCE; j++) {
             if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
@@ -182,7 +182,7 @@ void is31fl3729_set_scaling_register(uint8_t index, uint8_t value) {
     // need to do a bit of checking here since 3729 scaling is per CS pin.
     // not the usual per single LED key as per other ISSI drivers
     // only enable them, since they should be default disabled
-    int cs_value = (led.v & 0x0F) - 1;
+    int cs_value = (led.v & 0x0F);
 
     driver_buffers[led.driver].scaling_buffer[cs_value] = value;
     driver_buffers[led.driver].scaling_buffer_dirty     = true;

drivers/led/issi/is31fl3729.c

@@ -107,7 +107,7 @@ void is31fl3729_write_pwm_buffer(uint8_t index) {
     // Transmit PWM registers in 11 transfers of 13 bytes.
 
     // Iterate over the pwm_buffer contents at 13 byte intervals.
-    for (uint8_t i = 0; i <= IS31FL3729_PWM_REGISTER_COUNT; i += 13) {
+    for (uint8_t i = 0; i < IS31FL3729_PWM_REGISTER_COUNT; i += 13) {
 #if IS31FL3729_I2C_PERSISTENCE > 0
         for (uint8_t j = 0; j < IS31FL3729_I2C_PERSISTENCE; j++) {
             if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
@@ -184,9 +184,9 @@ void is31fl3729_set_scaling_register(uint8_t index, uint8_t red, uint8_t green,
     // need to do a bit of checking here since 3729 scaling is per CS pin.
     // not the usual per RGB key as per other ISSI drivers
     // only enable them, since they should be default disabled
-    int cs_red   = (led.r & 0x0F) - 1;
+    int cs_red   = (led.r & 0x0F);
-    int cs_green = (led.g & 0x0F) - 1;
+    int cs_green = (led.g & 0x0F);
-    int cs_blue  = (led.b & 0x0F) - 1;
+    int cs_blue  = (led.b & 0x0F);
 
     driver_buffers[led.driver].scaling_buffer[cs_red]   = red;
     driver_buffers[led.driver].scaling_buffer[cs_green] = green;

keyboards/ai03/orbit/orbit.c

@@ -18,7 +18,7 @@
 
 void led_init_ports(void) {
     // Initialize indicator LEDs to output
-    if (isLeftHand) {
+    if (is_keyboard_left()) {
         gpio_set_pin_output(C6);
         gpio_set_pin_output(B6);
         gpio_set_pin_output(B5);
@@ -36,7 +36,7 @@ void led_init_ports(void) {
 //
 // (LEFT) 0 1 2   |   3 4 5 (RIGHT)
 void led_toggle(uint8_t id, bool on) {
-    if (isLeftHand) {
+    if (is_keyboard_left()) {
         switch (id) {
             case 0:
                 // Left hand C6

keyboards/aidansmithdotdev/sango/keyboard.json

@@ -117,7 +117,7 @@
     },
     "split": {
         "bootmagic": {
-            "matrix": [4, 7]
+            "matrix": [5, 7]
         },
         "enabled": true,
         "matrix_pins": {

keyboards/aleblazer/zodiark/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Zodiark",
     "manufacturer": "Aleblazer",
-    "url": "https://github.com/Aleblazer/qmk_firmware/tree/master/keyboards/zodiark",
     "maintainer": "Aleblazer",
     "usb": {
         "vid": "0xF901",

keyboards/argo_works/ishi/80/mk0_avr/keyboard.json

@@ -4,7 +4,6 @@
     "maintainer": "jasonj2232",
     "development_board": "promicro",
     "diode_direction": "COL2ROW",
-    "url": "https://qmk.fm/keyboards/",
     "usb": {
         "device_version": "0.0.1",
         "pid": "0x4930",

keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json

@@ -5,7 +5,6 @@
     "development_board": "elite_c",
     "pin_compatible": "elite_c",
     "diode_direction": "COL2ROW",
-    "url": "https://qmk.fm/keyboards/",
     "usb": {
         "device_version": "0.0.1",
         "pid": "0x4930",

keyboards/ash_xiix/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "XIIX",
     "manufacturer": "ASH",
-    "url": "config.qmk.fm",
     "maintainer": "qmk",
     "usb": {
         "vid": "0xFEED",

keyboards/atlantis/ps17/keyboard.json

@@ -2,7 +2,6 @@
     "manufacturer": "Atlantis",
     "keyboard_name": "PS17",
     "maintainer": "mjbogusz",
-    "url": "https://qmk.fm/keyboards/",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "bootloader_instructions": "To reset the board into bootloader mode, tap the Reset switch mounted on the bottom of the PCB.",

keyboards/basekeys/slice/keymaps/default/keymap.c

@@ -115,7 +115,7 @@ const char *read_logo(void) {
 }
 
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return isLeftHand ? OLED_ROTATION_180 : OLED_ROTATION_0;
+    return is_keyboard_left() ? OLED_ROTATION_180 : OLED_ROTATION_0;
 }
 
 bool oled_task_user(void) {

keyboards/basekeys/slice/keymaps/default_split_left_space/keymap.c

@@ -115,7 +115,7 @@ const char *read_logo(void) {
 }
 
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return isLeftHand ? OLED_ROTATION_180 : OLED_ROTATION_0;
+    return is_keyboard_left() ? OLED_ROTATION_180 : OLED_ROTATION_0;
 }
 
 bool oled_task_user(void) {

keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c

@@ -199,7 +199,7 @@ const char *read_logo(void) {
 }
 
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return isLeftHand ? OLED_ROTATION_180 : OLED_ROTATION_0;
+    return is_keyboard_left() ? OLED_ROTATION_180 : OLED_ROTATION_0;
 }
 
 bool oled_task_user(void) {

keyboards/boardrun/bizarre/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Boardrun Bizarre",
     "manufacturer": "shensmobile",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/boardrun/bizarre",
     "maintainer": "QMK Community",
     "debounce": 10,
     "usb": {

keyboards/boardrun/classic/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Boardrun Classic",
     "manufacturer": "shensmobile",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/boardrun/classic",
     "maintainer": "QMK Community",
     "debounce": 10,
     "usb": {

keyboards/checkerboards/plexus75_he/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Plexus75 HE",
     "manufacturer": "Nasp",
-    "url": "https://www.github.com/qmk/qmk_firmware/tree/master/keyboards/checkerboards/plexus75_he",
     "maintainer": "nasp",
     "usb": {
         "vid": "0x7070",

keyboards/checkerboards/quark_plus/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Quark Plus",
     "manufacturer": "Nasp",
-    "url": "https://www.github.com/qmk/qmk_firmware/tree/master/keyboards/checkerboards/quark_plus",
     "maintainer": "nasp",
     "usb": {
         "vid": "0x7070",

keyboards/cipulot/common/matrix.c

@@ -17,9 +17,6 @@
 #include "ec_switch_matrix.h"
 #include "matrix.h"
 
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-
 // Custom matrix init function
 void matrix_init_custom(void) {
     // Initialize EC

keyboards/cipulot/ec_980c/matrix.c

@@ -17,9 +17,6 @@
 #include "ec_switch_matrix.h"
 #include "matrix.h"
 
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-
 // Custom matrix init function
 void matrix_init_custom(void) {
     // Initialize EC

keyboards/cipulot/ec_typek/matrix.c

@@ -17,9 +17,6 @@
 #include "ec_switch_matrix.h"
 #include "matrix.h"
 
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-
 // Custom matrix init function
 void matrix_init_custom(void) {
     // Initialize EC

keyboards/converter/ibm_terminal/matrix.c

@@ -27,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
 #define print_matrix_header()  print("\nr/c 01234567\n")
-#define ROW_SHIFTER ((uint8_t)1)
-
 
 static void matrix_make(uint8_t code);
 static void matrix_break(uint8_t code);

keyboards/converter/periboard_512/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Periboard 512",
     "manufacturer": "Sife",
-    "url": "https://github.com/Sife-ops/qmk_firmware/tree/periboard_512/keyboards/converter/periboard_512",
     "maintainer": "Sife-ops",
     "usb": {
         "vid": "0xFEED",

keyboards/custommk/evo70/evo70.c

@@ -61,9 +61,6 @@ static bool starting_up = false;
 #define ENC_BONGO 9
 #endif //bongocat
 
-
-extern matrix_row_t matrix[MATRIX_ROWS];
-
 char* enc_mode_str[] = {
 #ifdef BONGOCAT
     /* Splash */ "",
@@ -394,7 +391,7 @@ void write_bongochar_at_pixel_xy(uint8_t x, uint8_t y, uint8_t data, bool invert
 
 bool is_key_down(void) {
     for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        if (matrix[i] > 0) {
+        if (matrix_get_row(i) > 0) {
             return true;
         }
     }
@@ -488,10 +485,10 @@ bool is_new_tap(void) {
     static matrix_row_t old_matrix[] = { 0, 0, 0, 0, 0, 0 };
     bool new_tap = false;
     for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        if (matrix[i] > old_matrix[i]) { // more 1's detected, there was a new tap
+        if (matrix_get_row(i) > old_matrix[i]) { // more 1's detected, there was a new tap
             new_tap = true;
         }
-        old_matrix[i] = matrix[i];
+        old_matrix[i] = matrix_get_row(i);
     }
     return new_tap;
 }

keyboards/dc01/arrow/matrix.c

@@ -48,15 +48,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
 #ifdef MATRIX_MASKED
@@ -252,7 +249,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
         uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF));
 
         // Populate the matrix row with the state of the col pin
-        current_matrix[current_row] |=  pin_state ? 0 : (ROW_SHIFTER << col_index);
+        current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
     }
 
     // Unselect row
@@ -314,12 +311,12 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
         if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)) == 0)
         {
             // Pin LO, set col bit
-            current_matrix[row_index] |= (ROW_SHIFTER << current_col);
+            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
         }
         else
         {
             // Pin HI, clear col bit
-            current_matrix[row_index] &= ~(ROW_SHIFTER << current_col);
+            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
         }
 
         // Determine if the matrix changed state

keyboards/dc01/left/matrix.c

@@ -52,15 +52,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
 #ifdef MATRIX_MASKED
@@ -277,7 +274,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
         uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF));
 
         // Populate the matrix row with the state of the col pin
-        current_matrix[current_row] |=  pin_state ? 0 : (ROW_SHIFTER << col_index);
+        current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
     }
 
     // Unselect row
@@ -339,12 +336,12 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
         if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)) == 0)
         {
             // Pin LO, set col bit
-            current_matrix[row_index] |= (ROW_SHIFTER << current_col);
+            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
         }
         else
         {
             // Pin HI, clear col bit
-            current_matrix[row_index] &= ~(ROW_SHIFTER << current_col);
+            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
         }
 
         // Determine if the matrix changed state

keyboards/dc01/numpad/matrix.c

@@ -48,15 +48,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
 #ifdef MATRIX_MASKED
@@ -252,7 +249,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
         uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF));
 
         // Populate the matrix row with the state of the col pin
-        current_matrix[current_row] |=  pin_state ? 0 : (ROW_SHIFTER << col_index);
+        current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
     }
 
     // Unselect row
@@ -314,12 +311,12 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
         if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)) == 0)
         {
             // Pin LO, set col bit
-            current_matrix[row_index] |= (ROW_SHIFTER << current_col);
+            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
         }
         else
         {
             // Pin HI, clear col bit
-            current_matrix[row_index] &= ~(ROW_SHIFTER << current_col);
+            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
         }
 
         // Determine if the matrix changed state

keyboards/dc01/right/matrix.c

@@ -46,15 +46,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
 #ifdef MATRIX_MASKED
@@ -250,7 +247,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
         uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF));
 
         // Populate the matrix row with the state of the col pin
-        current_matrix[current_row] |=  pin_state ? 0 : (ROW_SHIFTER << col_index);
+        current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
     }
 
     // Unselect row
@@ -312,12 +309,12 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
         if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)) == 0)
         {
             // Pin LO, set col bit
-            current_matrix[row_index] |= (ROW_SHIFTER << current_col);
+            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
         }
         else
         {
             // Pin HI, clear col bit
-            current_matrix[row_index] &= ~(ROW_SHIFTER << current_col);
+            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
         }
 
         // Determine if the matrix changed state

keyboards/dichotomy/matrix.c

@@ -34,15 +34,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
 #define MAIN_ROWMASK 0xFFF0;

keyboards/elephant42/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "elephant42",
     "manufacturer": "illness072",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/elephant42",
     "maintainer": "illness072",
     "usb": {
         "vid": "0x4649",

keyboards/flxlb/zplit/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "zplit",
     "manufacturer": "fluxlab",
-    "url": "https://github.com/cccywj/qmk_firmware",
     "maintainer": "flxlb",
     "usb": {
         "vid": "0x7076",

keyboards/frobiac/blackbowl/matrix.c

@@ -20,7 +20,6 @@
 #include "timer.h"
 
 #define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
-#define ROW_SHIFTER ((matrix_row_t)1)
 
 static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col);
 
@@ -100,10 +99,10 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
 
         if (col_state & (1 << current_row)) {
             // key closed; set state bit in matrix
-            current_matrix[current_row] |= (ROW_SHIFTER << current_col);
+            current_matrix[current_row] |= (MATRIX_ROW_SHIFTER << current_col);
         } else {
             // key open; clear state bit in matrix
-            current_matrix[current_row] &= ~(ROW_SHIFTER << current_col);
+            current_matrix[current_row] &= ~(MATRIX_ROW_SHIFTER << current_col);
         }
 
         // Determine whether the matrix changed state

keyboards/frooastboard/nano/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Frooastboard Nano",
     "manufacturer": "frooastside",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/nano",
     "maintainer": "frooastside",
     "diode_direction": "COL2ROW",
     "layouts": {

keyboards/frooastboard/walnut/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Frooastboard Walnut",
     "manufacturer": "Frooastside",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/walnut",
     "maintainer": "Frooastside",
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",

keyboards/generic_panda/panda65_01/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Panda65_01",
     "manufacturer": "generic_panda",
-    "url": "https://github.com/JesseLeung97/qmk_firmware/tree/master/keyboards/generic_panda/panda65_01",
     "maintainer": "generic_panda",
     "usb": {
         "vid": "0x6770",

keyboards/giabalanai/keymaps/2firmware/keymap.c

@@ -468,7 +468,7 @@ void keyboard_post_init_user(void) {
     user_config.raw = eeconfig_read_user();
 
     // When USB cable is connected to the left side keyboard, use QWERTY layout by default.
-    if (is_keyboard_master() && isLeftHand) {
+    if (is_keyboard_master() && is_keyboard_left()) {
         default_layer_set(1UL << _QWERTY);
     }
 

keyboards/gmmk/numpad/matrix.c

@@ -1,9 +1,6 @@
 // Copyright 2023 Cameron Varley (@RustedAperture)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-/*
- * scan matrix
- */
 #include "matrix.h"
 #include <string.h>
 #include "atomic_util.h"
@@ -11,13 +8,8 @@
 #include "print.h"
 #include "debug.h"
 
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-#define MATRIX_ROW_SHIFTER ((matrix_row_t)1)
 
 static inline void gpio_atomic_set_pin_output_low(pin_t pin) {
     ATOMIC_BLOCK_FORCEON {

keyboards/halfcliff/matrix.c

@@ -182,7 +182,7 @@ void matrix_init(void) {
     split_pre_init();
 
     // Set pinout for right half if pinout for that half is defined
-    if (!isLeftHand) {
+    if (!is_keyboard_left()) {
 #ifdef DIRECT_PINS_RIGHT
         const pin_t direct_pins_right[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS_RIGHT;
         for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
@@ -205,7 +205,7 @@ void matrix_init(void) {
 #endif
     }
 
-    thisHand = isLeftHand ? 0 : (ROWS_PER_HAND);
+    thisHand = is_keyboard_left() ? 0 : (ROWS_PER_HAND);
     thatHand = ROWS_PER_HAND - thisHand;
 
     // initialize key pins

keyboards/handwired/acacia/keyboard.json

@@ -2,7 +2,6 @@
     "keyboard_name": "Acacia",
     "manufacturer": "jpsecher",
     "maintainer": "jpsecher",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/acacia",
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "bootloader_instructions": "Enter the bootloader by using the small buttons on the PCB: press the RESET button while connected to QMK Toolbox.",

keyboards/handwired/dactyl/matrix.c

@@ -76,8 +76,6 @@ uint8_t expander_status;
 uint8_t expander_input_pin_mask;
 bool i2c_initialized = false;
 
-#define ROW_SHIFTER ((matrix_row_t)1)
-
 __attribute__ ((weak))
 void matrix_init_user(void) {}
 
@@ -284,7 +282,7 @@ uint8_t matrix_scan(void)
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
-    return (matrix[row] & (ROW_SHIFTER << col));
+    return (matrix[row] & (MATRIX_ROW_SHIFTER << col));
 }
 
 inline
@@ -344,7 +342,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
         if (! col_expanded[col_index]) {
             uint8_t pin = onboard_col_pins[col_index];
             uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF));
-            current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index);
+            current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
         }
     }
 
@@ -432,10 +430,10 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
 
         if (column_state & (1 << current_row)) {
             // key closed; set state bit in matrix
-            current_matrix[current_row] |= (ROW_SHIFTER << current_col);
+            current_matrix[current_row] |= (MATRIX_ROW_SHIFTER << current_col);
         } else {
             // key open; clear state bit in matrix
-            current_matrix[current_row] &= ~(ROW_SHIFTER << current_col);
+            current_matrix[current_row] &= ~(MATRIX_ROW_SHIFTER << current_col);
         }
 
         // Determine whether the matrix changed state

keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Dactyl ManuForm 4x5_5",
     "manufacturer": "ssedrick",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/dactyl_manuform/4x5_5",
     "maintainer": "ssedrick",
     "usb": {
         "vid": "0x444D",

keyboards/handwired/dactyl_rah/keyboard.json

@@ -1,7 +1,6 @@
 {
   "keyboard_name": "Dactyl RAH",
   "manufacturer": "ralphie02",
-  "url": "https://qmk.fm/keyboards/",
   "maintainer": "ralphie02",
   "usb": {
     "vid": "0xFEED",

keyboards/handwired/dqz11n1g/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "DQz11N1G",
     "manufacturer": "Unknown",
-    "url": "https://github.com/dvdkhlng/qmk_firmware_dqz11n1g",
     "maintainer": "dvdkhlng",
     "usb": {
         "vid": "0xFEED",

keyboards/handwired/dygma/raise/info.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Raise",
     "manufacturer": "Dygma",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/dygma/raise",
     "maintainer": "ibash",
     "usb": {
         "vid": "0x1209",

keyboards/handwired/ibm_wheelwriter/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "6715 Wheelwriter",
     "manufacturer": "IBM",
-    "url": "https://github.com/andresteare/qmk_firmware",
     "maintainer": "andresteare",
     "usb": {
         "vid": "0x8767",

keyboards/handwired/jotanck/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Jotanck",
     "manufacturer": "Jotix",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/jotanck",
     "maintainer": "jotix",
     "usb": {
         "vid": "0x4A4F",

keyboards/handwired/jotlily60/keyboard.json

@@ -2,7 +2,6 @@
     "manufacturer": "Jotix",
     "keyboard_name": "jotlily60",
     "maintainer" : "jotix",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/jotlily60",
     "usb": {
         "vid": "0x4A4F",
         "pid": "0x2332",

keyboards/handwired/lagrange/transport.c

@@ -158,7 +158,7 @@ void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
 
     /* Update the layer and LED state if necessary. */
 
-    if (!isLeftHand) {
+    if (!is_keyboard_left()) {
         if (context.led_state.raw != new_context.led_state.raw) {
             context.led_state.raw = new_context.led_state.raw;
             led_update_kb(context.led_state);

keyboards/handwired/oem_ansi_fullsize/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "oem_ansi_fullsize",
     "manufacturer": "Cian Johnston",
-    "url": "https://github.com/johnstcn/qmk",
     "maintainer": "johnstcn",
     "usb": {
         "vid": "0xFEED",

keyboards/handwired/oem_iso_fullsize/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "teclado_oscar",
     "manufacturer": "Gamdias",
-    "url": "https://github.com/andresteare/qmk_firmware",
     "maintainer": "andresteare",
     "usb": {
         "vid": "0x9856",

keyboards/handwired/owlet60/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Owlet60",
     "manufacturer": "worthlessowl",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/owlet60/",
     "maintainer": "worthlessowl",
     "usb": {
         "vid": "0xFEED",

keyboards/handwired/owlet60/matrix.c

@@ -31,15 +31,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header() print("\nr/c 01234567\n")
 #    define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint32_t)1)
 #endif
 
 static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
@@ -150,7 +147,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
         uint8_t pin_state = gpio_read_pin(dat_pin);
 
         // Populate the matrix row with the state of the col pin
-        current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index);
+        current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
     }
 
     // Unselect row

keyboards/handwired/promethium/matrix.c

@@ -43,15 +43,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
 #ifdef MATRIX_MASKED
@@ -227,7 +224,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
                 uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF));
 
                 // Populate the matrix row with the state of the col pin
-                current_matrix[current_row] |=  pin_state ? 0 : (ROW_SHIFTER << tp_index);
+                current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << tp_index);
             }
             return (last_row_value != current_matrix[current_row]);
         }
@@ -245,7 +242,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
             uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF));
 
             // Populate the matrix row with the state of the col pin
-            current_matrix[current_row] |=  pin_state ? 0 : (ROW_SHIFTER << col_index);
+            current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
         }
 
         // Unselect row

keyboards/handwired/pterodactyl/matrix.c

@@ -86,8 +86,6 @@ uint8_t expander_status;
 uint8_t expander_input_pin_mask;
 bool i2c_initialized = false;
 
-#define ROW_SHIFTER ((matrix_row_t)1)
-
 __attribute__ ((weak))
 void matrix_init_user(void) {}
 
@@ -256,7 +254,7 @@ uint8_t matrix_scan(void)
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
-    return (matrix[row] & (ROW_SHIFTER << col));
+    return (matrix[row] & (MATRIX_ROW_SHIFTER << col));
 }
 
 inline
@@ -314,7 +312,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
         if (! col_expanded[col_index]) {
             uint8_t pin = onboard_col_pins[col_index];
             uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF));
-            current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index);
+            current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
         }
     }
 
@@ -401,10 +399,10 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
 
         if (column_state & (1 << current_row)) {
             // key closed; set state bit in matrix
-            current_matrix[current_row] |= (ROW_SHIFTER << current_col);
+            current_matrix[current_row] |= (MATRIX_ROW_SHIFTER << current_col);
         } else {
             // key open; clear state bit in matrix
-            current_matrix[current_row] &= ~(ROW_SHIFTER << current_col);
+            current_matrix[current_row] &= ~(MATRIX_ROW_SHIFTER << current_col);
         }
 
         // Determine whether the matrix changed state

keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json

@@ -81,7 +81,7 @@
             "pin": "D3"
         },
         "bootmagic": {
-            "matrix": [4, 5]
+            "matrix": [5, 5]
         }
     },
     "ws2812": {

keyboards/handwired/twadlee/tp69/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "TP69",
     "manufacturer": "Tracy Wadleigh",
-    "url": "https://github.com/twadleigh/qmk_firmware",
     "maintainer": "qmk",
     "usb": {
         "vid": "0xBEEF",

keyboards/handwired/zergo/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "zErgo",
     "manufacturer": "GreenJack",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/zergo",
     "maintainer": "greenjack",
     "usb": {
         "vid": "0xFEED",

keyboards/ibm/model_m/ashpil_usbc/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "IBM Model M 101/102",
     "manufacturer": "ashpil",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/ashpil_usbc",
     "maintainer": "ashpil",
     "usb": {
         "vid": "0xFEED",

keyboards/ibm/model_m/mschwingen/info.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "atmega32U4 board for IBM Model M",
     "manufacturer": "mschwingen",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/mschwingen",
     "maintainer": "mschwingen",
     "usb": {
         "vid": "0xFEED",

keyboards/ibm/model_m/teensy2/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "IBM Model M 101/102",
     "manufacturer": "wangfuco",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/teensy2",
     "maintainer": "wangfuco",
     "usb": {
         "vid": "0xFEED",

keyboards/ibm/model_m/teensypp/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "IBM Model M 101/102",
     "manufacturer": "iw0rm3r",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/teensypp",
     "maintainer": "iw0rm3r",
     "usb": {
         "vid": "0xFEED",

keyboards/ibm/model_m/yugo_m/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Yugo-M (IBM Model M replacment controller)",
     "manufacturer": "IBM",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/yugo_m",
     "maintainer": "Nidzo Tomic",
     "usb": {
         "vid": "0xFEED",

keyboards/ibm/model_m_122/ibm122m/keyboard.json

@@ -1,7 +1,6 @@
 {
   "keyboard_name": "IBM Model M 122 key",
   "manufacturer": "IBM",
-  "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m_122/ibm122m",
   "maintainer": "qmk",
   "usb": {
     "vid": "0xFEED",

keyboards/ibm/model_m_122/m122_3270/info.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Model M PC/3270 122 key",
     "manufacturer": "IBM",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m_122/m122_3270",
     "maintainer": "jmaynard",
     "usb": {
         "vid": "0x1209",

keyboards/ibm/model_m_ssk/teensypp_ssk/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "IBM Model M Space-Saving Keyboard",
     "manufacturer": "tiltowait",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m_ssk/teensypp_ssk",
     "maintainer": "tiltowait",
     "usb": {
         "vid": "0xFEED",

keyboards/jacky_studio/bear_65/rev1/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Bear 65",
     "manufacturer": "Jacky",
-    "url": "https://qmk.fm/keyboards",
     "maintainer": "qmk",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",

keyboards/jacky_studio/bear_65/rev2/keyboard.json

@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Bear65 V2",
     "manufacturer": "Jacky",
-    "url": "https://qmk.fm/keyboards",
     "maintainer": "qmk",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",

keyboards/jones/v03/matrix.c

@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "matrix.h"
 
-#define ROW_SHIFTER ((uint16_t)1)
-
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 
@@ -62,10 +60,10 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
             // Check col pin pin_state
             if (gpio_read_pin(col_pins[col_index]) == 0) {
                 // Pin LO, set col bit
-                current_matrix[current_row] |= (ROW_SHIFTER << col_index);
+                current_matrix[current_row] |= (MATRIX_ROW_SHIFTER << col_index);
             } else {
                 // Pin HI, clear col bit
-                current_matrix[current_row] &= ~(ROW_SHIFTER << col_index);
+                current_matrix[current_row] &= ~(MATRIX_ROW_SHIFTER << col_index);
             }
         }
     }

keyboards/jones/v03_1/matrix.c

@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "matrix.h"
 
-#define ROW_SHIFTER ((uint16_t)1)
-
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 
@@ -62,10 +60,10 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
             // Check col pin pin_state
             if (gpio_read_pin(col_pins[col_index]) == 0) {
                 // Pin LO, set col bit
-                current_matrix[current_row] |= (ROW_SHIFTER << col_index);
+                current_matrix[current_row] |= (MATRIX_ROW_SHIFTER << col_index);
             } else {
                 // Pin HI, clear col bit
-                current_matrix[current_row] &= ~(ROW_SHIFTER << col_index);
+                current_matrix[current_row] &= ~(MATRIX_ROW_SHIFTER << col_index);
             }
         }
     }