summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2020-07-26 13:57:37 -0700
committerGitHub <noreply@github.com>2020-07-26 21:57:37 +0100
commitd2be3a7339fe42629f3616a00708c5e74d84fe61 (patch)
tree14ec4098197963d6c2def6d412361875afbf9dfd
parentaaf58155c7c9d8cf5235dd787530873a9c1f87cb (diff)
Fix Variable Trace handling (#9831)
It wants a number, but a number of files have it set to "no", even though it's commented out. This means that if you set it to no, it will cause a compiler error. This sets the default to "no", and checks to make sure it's not set to "no" before processing it, and striping the value from it.
-rw-r--r--common_features.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/common_features.mk b/common_features.mk
index e23de553b3..8443a759b3 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -246,12 +246,13 @@ ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes)
VAPTH += $(SERIAL_PATH)
endif
-ifneq ($(strip $(VARIABLE_TRACE)),)
+VARIABLE_TRACE ?= no
+ifneq ($(strip $(VARIABLE_TRACE)),no)
SRC += $(QUANTUM_DIR)/variable_trace.c
OPT_DEFS += -DNUM_TRACED_VARIABLES=$(strip $(VARIABLE_TRACE))
-ifneq ($(strip $(MAX_VARIABLE_TRACE_SIZE)),)
- OPT_DEFS += -DMAX_VARIABLE_TRACE_SIZE=$(strip $(MAX_VARIABLE_TRACE_SIZE))
-endif
+ ifneq ($(strip $(MAX_VARIABLE_TRACE_SIZE)),)
+ OPT_DEFS += -DMAX_VARIABLE_TRACE_SIZE=$(strip $(MAX_VARIABLE_TRACE_SIZE))
+ endif
endif
ifeq ($(strip $(LCD_ENABLE)), yes)