Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r5e92cbb2c29854fb60a91dc4abafeb9b08d3272c -r0e481a88f8c97fcc1ab18914d3e3b40631372d8a
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 5e92cbb2c29854fb60a91dc4abafeb9b08d3272c)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 0e481a88f8c97fcc1ab18914d3e3b40631372d8a)
@@ -54,11 +54,11 @@
 static U08 commandedBCValveStates;                                                                                  ///< Initialize balancing chamber commanded valves states bit field.
 static U08 commandedUFValveStates;                                                                                  ///< Initialize ultra filtration commanded valves states bit field.
 static U32 valveStateMismatchTimerCounter;                                                                          ///< Initialize valve state mismatch timer.
-static U32 pendingValveStateChanges[ NUM_OF_VALVES ];                                                               ///< Delayed (pending) valve state changes.
-static U32 pendingValveStateChangeCountDowns[ NUM_OF_VALVES ];                                                      ///< Delayed (pending) valve state change count down timers (in task intervals).
+static U32 pendingValveStateChanges[ DD_NUM_OF_VALVES ];                                                            ///< Delayed (pending) valve state changes.
+static U32 pendingValveStateChangeCountDowns[ DD_NUM_OF_VALVES ];                                                   ///< Delayed (pending) valve state change count down timers (in task intervals).
 
-static OVERRIDE_U32_T valveStates[ NUM_OF_VALVES ];                                                                 ///< Currently commanded valves states.
-static OVERRIDE_U32_T valveSensedStates[ NUM_OF_VALVES ];                                                           ///< Valve sensed states override.
+static OVERRIDE_U32_T valveStates[ DD_NUM_OF_VALVES ];                                                              ///< Currently commanded valves states.
+static OVERRIDE_U32_T valveSensedStates[ DD_NUM_OF_VALVES ];                                                        ///< Valve sensed states override.
 static OVERRIDE_U32_T valvesStatesPublishInterval = { VALVES_STATE_PUB_INTERVAL, VALVES_STATE_PUB_INTERVAL, 0, 0 }; ///< Interval (in ms/task interval) at which to publish valves state to CAN bus.
 
 // ********** private function prototypes **********
@@ -83,7 +83,7 @@
     U32 i;
 
     // initialize commanded valve states
-    for ( i = 0; i < NUM_OF_VALVES; i++ )
+    for ( i = 0; i < DD_NUM_OF_VALVES; i++ )
     {
         valveStates[ i ].data                  = DEENERGIZED;
         valveStates[ i ].ovInitData            = DEENERGIZED;
@@ -148,7 +148,7 @@
     }
 
     // Handle pending delayed valve state changes
-    for ( i = 0; i < NUM_OF_VALVES; i++ )
+    for ( i = 0; i < DD_NUM_OF_VALVES; i++ )
     {
         if ( pendingValveStateChangeCountDowns[ i ] > 0 )
         {
@@ -295,7 +295,7 @@
 {
     BOOL result = FALSE; // initialize result flag to FALSE
 
-    if ( valveID < NUM_OF_VALVES )
+    if ( valveID < DD_NUM_OF_VALVES )
     {
         if ( TRUE == checkValveStateName( valveID, valveStateName ) )
         {
@@ -330,7 +330,7 @@
 {
     BOOL result = FALSE; // initialize result flag to FALSE
 
-    if ( valveID < NUM_OF_VALVES )
+    if ( valveID < DD_NUM_OF_VALVES )
     {
         if ( TRUE == checkValveStateName( valveID, valveStateName ) )
         {
@@ -367,7 +367,7 @@
     // Initialized per CppCheck.
     VALVE_STATE_NAMES_T name = NUM_OF_VALVE_STATES;
 
-    if ( valveID < NUM_OF_VALVES )
+    if ( valveID < DD_NUM_OF_VALVES )
     {
         U32 valveState = getU32OverrideValue( &valveSensedStates[ valveID ] );
 
@@ -394,7 +394,7 @@
 {
     U32 valveState = DEENERGIZED;
 
-    if ( valveID < NUM_OF_VALVES )
+    if ( valveID < DD_NUM_OF_VALVES )
     {
         valveState = getU32OverrideValue( &valveStates[ valveID ] );
     }
@@ -464,7 +464,7 @@
         data.valvesBCStatus     = getFPGAValveBCStates();
         data.valvesUFStatus     = getFPGAValveUFStates();
 
-        for ( i = 0; i < NUM_OF_VALVES; i++ )
+        for ( i = 0; i < DD_NUM_OF_VALVES; i++ )
         {
             data.valvesSensedState[ i ] = (U08)getValveStateName( (VALVES_T)i );
         }
@@ -510,7 +510,7 @@
  *************************************************************************/
 BOOL testValveStateOverride( MESSAGE_T *message )
 {
-    BOOL result = u32ArrayOverride( message, &valveStates[0], NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 );
+    BOOL result = u32ArrayOverride( message, &valveStates[0], DD_NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 );
 
     return result;
 }
@@ -556,7 +556,7 @@
  *************************************************************************/
 BOOL testValveSensedStateOverride( MESSAGE_T *message )
 {
-    BOOL result = u32ArrayOverride( message, &valveSensedStates[0], NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 );
+    BOOL result = u32ArrayOverride( message, &valveSensedStates[0], DD_NUM_OF_VALVES - 1, 0, NUM_OF_VALVE_STATES - 1 );
 
     return result;
 }
@@ -585,7 +585,7 @@
 
             memcpy( &payload, message->payload, sizeof(VALVE_CMD_PAYLOAD_T) );
 
-            if ( ( (VALVES_T)payload.valveID < NUM_OF_VALVES ) &&
+            if ( ( (VALVES_T)payload.valveID < DD_NUM_OF_VALVES ) &&
                     ( (VALVE_STATE_NAMES_T)payload.valveState < NUM_OF_VALVE_STATES ) )
             {
                 setValveState( (VALVES_T)payload.valveID, (VALVE_STATE_NAMES_T)payload.valveState );