~ruther/qmk_firmware: Merge remote-tracking branch 'origin/master' into develop

2 files changed, 6 insertions(+), 4 deletions(-)

M keyboards/helix/rev2/local_features.mk
M keyboards/helix/rev2/override_helix_options.mk

M keyboards/helix/rev2/local_features.mk => keyboards/helix/rev2/local_features.mk +1 -1

@@ 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)),)

M keyboards/helix/rev2/override_helix_options.mk => keyboards/helix/rev2/override_helix_options.mk +5 -3

@@ 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)