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

This commit is contained in:
QMK Bot 2022-03-03 14:28:03 +00:00
commit 8a5ad2a113
2 changed files with 6 additions and 4 deletions

View file

@ -6,7 +6,7 @@
#
KEYBOARD_LOCAL_FEATURES_MK :=
-include $(strip $(HELIX_TOP_DIR)/pico/override_helix_options.mk) ## File dedicated to maintenance
-include $(strip $(HELIX_TOP_DIR)/rev2/override_helix_options.mk) ## File dedicated to maintenance
# Parse 'HELIX=xx,yy,zz' option
ifneq ($(strip $(HELIX)),)

View file

@ -1,6 +1,8 @@
$(info -------------------------)
$(info override_helix_options.mk)
$(info -------------------------)
ifneq ($(strip $(HELIX)),)
$(info -------------------------)
$(info override_helix_options.mk)
$(info -------------------------)
endif
define HELIX_OVERRIDE_PARSE
ifeq ($(strip $1),back)