Index: firmware/App/Tasks/TaskPriority.c
===================================================================
diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r84cc99fd5cd997d0a1e024a4e23d0d3880142ffb
--- firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
+++ firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision 84cc99fd5cd997d0a1e024a4e23d0d3880142ffb)
@@ -25,13 +25,14 @@
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
 #include "FluidLeak.h"
-#include "FPGA.h"
+#include "FPGA.h"
+#include "NVDataMgmt.h"
 #include "InternalADC.h"
 #include "SyringePump.h"
 #include "SystemComm.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
-#include "TaskPriority.h"
+#include "TaskPriority.h"
 
 /**
  *  @addtogroup TaskPriority
@@ -58,10 +59,10 @@
     if ( TRUE == uiCommunicated() )
 #endif
     {
-#ifndef BOARD_WITH_NO_HARDWARE
         // 1st pass for FPGA
-        execFPGAIn();
-
+        execFPGAIn();
+
+#ifndef BOARD_WITH_NO_HARDWARE
         // Verify processor clock speed against FPGA clock
         execFPGAClockSpeedTest();
 
@@ -75,10 +76,11 @@
         // Monitor air trap level sensors
         execAirTrapMonitor();
 
-#ifndef DISABLE_SYRINGE_PUMP
-        // Control/Monitor syringe pump
-        execSyringePump();
-#endif
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+        {
+            // Control/Monitor syringe pump
+            execSyringePump();
+        }
 
         // Monitor blood pump and flow
         execBloodFlowMonitor();
@@ -98,18 +100,20 @@
         // Monitor air bubble detectors
         execBubbles();
 
-#ifndef DISABLE_ACCELS
-        // Monitor accelerometer
-        execAccel();
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACCELEROMETERS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
-#ifndef DISABLE_3WAY_VALVES
+        {
+            // Monitor accelerometer
+            execAccel();
+        }
+
         // Exec and monitor valves
         execValves();
 #endif
-#endif
+#endif
         // 2nd pass for FPGA
         execFPGAOut();
-#endif
     }
 
     // Check in with watchdog manager