From 4923655cd3b50e8d82fc914264265a55ba948c58 Mon Sep 17 00:00:00 2001
From: Laura Sebesta <kenn@eissq.com>
Date: Thu, 27 Sep 2012 18:51:12 +0200
Subject: [PATCH] Added global flag for enabling all diagnostic tools.

---
 flight/CopterControl/Makefile | 14 +++++++++-----
 flight/PipXtreme/Makefile     | 16 ++++++++++++----
 flight/Revolution/Makefile    |  1 -
 flight/SimPosix/Makefile      |  2 --
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/flight/CopterControl/Makefile b/flight/CopterControl/Makefile
index 3f2a119ad..c1b5042de 100644
--- a/flight/CopterControl/Makefile
+++ b/flight/CopterControl/Makefile
@@ -44,6 +44,8 @@ RATEDESIRED_DIAGNOSTICS ?= NO
 I2C_WDG_STATS_DIAGNOSTICS ?= NO
 DIAG_TASKS ?= NO
 
+#Or just turn on all the above diagnostics. WARNING: This consumes massive amounts of memory.
+ALL_DIGNOSTICS ?=NO
 
 # Set to YES to build a FW version that will erase all flash memory
 ERASE_FLASH ?= NO
@@ -478,23 +480,25 @@ ifeq ($(DEBUG),YES)
 CFLAGS += -DDEBUG
 endif
 
-ifeq ($(STACK_DIAGNOSTICS),YES)
+#The following Makefile command, ifneq (, $(filter) $(A), $(B) $(C)) is equivalent 
+# to the pseudocode `if(A== B || A==C)`
+ifneq (,$(filter YES,$(STACK_DIAGNOSTICS) $(ALL_DIGNOSTICS)))
 CFLAGS += -DSTACK_DIAGNOSTICS
 endif
 
-ifeq ($(MIXERSTATUS_DIAGNOSTICS),YES)
+ifneq (,$(filter YES,$(MIXERSTATUS_DIAGNOSTICS) $(ALL_DIGNOSTICS)))
 CFLAGS += -DMIXERSTATUS_DIAGNOSTICS
 endif
 
-ifeq ($(RATEDESIRED_DIAGNOSTICS),YES)
+ifneq (,$(filter YES,$(RATEDESIRED_DIAGNOSTICS) $(ALL_DIGNOSTICS)))
 CFLAGS += -DRATEDESIRED_DIAGNOSTICS
 endif
 
-ifeq ($(I2C_WDG_STATS_DIAGNOSTICS),YES)
+ifneq (,$(filter YES,$(I2C_WDG_STATS_DIAGNOSTICS) $(ALL_DIGNOSTICS)))
 CFLAGS += -DI2C_WDG_STATS_DIAGNOSTICS
 endif
 
-ifeq ($(DIAG_TASKS),YES)
+ifneq (,$(filter YES,$(DIAG_TASKS) $(ALL_DIGNOSTICS)))
 CFLAGS += -DDIAG_TASKS
 endif
 
diff --git a/flight/PipXtreme/Makefile b/flight/PipXtreme/Makefile
index 8538908f0..07c9e05d4 100644
--- a/flight/PipXtreme/Makefile
+++ b/flight/PipXtreme/Makefile
@@ -42,6 +42,10 @@ STACK_DIAGNOSTICS ?= NO
 MIXERSTATUS_DIAGNOSTICS ?= NO
 RATEDESIRED_DIAGNOSTICS ?= NO
 I2C_WDG_STATS_DIAGNOSTICS ?= NO
+DIAG_TASKS ?= YES
+
+#Or just turn on all the above diagnostics. WARNING: This consumes massive amounts of memory.
+ALL_DIGNOSTICS ?=NO
 
 # Set to YES to build a FW version that will erase all flash memory
 ERASE_FLASH ?= NO
@@ -381,22 +385,26 @@ ifeq ($(DEBUG),YES)
 CFLAGS = -DDEBUG
 endif
 
-ifeq ($(STACK_DIAGNOSTICS),YES)
+ifneq (,$(filter YES,$(STACK_DIAGNOSTICS) $(ALL_DIGNOSTICS)))
 CFLAGS += -DSTACK_DIAGNOSTICS
 endif
 
-ifeq ($(MIXERSTATUS_DIAGNOSTICS),YES)
+ifneq (,$(filter YES,$(MIXERSTATUS_DIAGNOSTICS) $(ALL_DIGNOSTICS)))
 CFLAGS += -DMIXERSTATUS_DIAGNOSTICS
 endif
 
-ifeq ($(RATEDESIRED_DIAGNOSTICS),YES)
+ifneq (,$(filter YES,$(RATEDESIRED_DIAGNOSTICS) $(ALL_DIGNOSTICS)))
 CFLAGS += -DRATEDESIRED_DIAGNOSTICS
 endif
 
-ifeq ($(I2C_WDG_STATS_DIAGNOSTICS),YES)
+ifneq (,$(filter YES,$(I2C_WDG_STATS_DIAGNOSTICS) $(ALL_DIGNOSTICS)))
 CFLAGS += -DI2C_WDG_STATS_DIAGNOSTICS
 endif
 
+ifneq (,$(filter YES,$(DIAG_TASKS) $(ALL_DIGNOSTICS)))
+CFLAGS += -DDIAG_TASKS
+endif
+
 CFLAGS += -g$(DEBUGF)
 CFLAGS += -O$(OPT)
 CFLAGS += -mcpu=$(MCU)
diff --git a/flight/Revolution/Makefile b/flight/Revolution/Makefile
index cc222f744..ff76ddbfa 100644
--- a/flight/Revolution/Makefile
+++ b/flight/Revolution/Makefile
@@ -259,7 +259,6 @@ CFLAGS += -DSTACK_DIAGNOSTICS
 CFLAGS += -DMIXERSTATUS_DIAGNOSTICS
 CFLAGS += -DRATEDESIRED_DIAGNOSTICS
 CFLAGS += -DI2C_WDG_STATS_DIAGNOSTICS
-
 CFLAGS += -DDIAG_TASKS
 
 # This is not the best place for these.  Really should abstract out
diff --git a/flight/SimPosix/Makefile b/flight/SimPosix/Makefile
index 616ef5995..3d541b409 100644
--- a/flight/SimPosix/Makefile
+++ b/flight/SimPosix/Makefile
@@ -255,8 +255,6 @@ CFLAGS += -DSTACK_DIAGNOSTICS
 CFLAGS += -DMIXERSTATUS_DIAGNOSTICS
 CFLAGS += -DRATEDESIRED_DIAGNOSTICS
 CFLAGS += -DI2C_WDG_STATS_DIAGNOSTICS
-
-
 CFLAGS += -DDIAG_TASKS
 
 # This is not the best place for these.  Really should abstract out