Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r0b121a7c92a8d86f8369b7094b0bce21389f3747 -r329409d63c11fd7d7fc8c3d3dd1d96e4e5a109dc
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 0b121a7c92a8d86f8369b7094b0bce21389f3747)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 329409d63c11fd7d7fc8c3d3dd1d96e4e5a109dc)
@@ -62,6 +62,7 @@
 #define NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK          1                                                   ///< Number of acid and bicarb non-volatile data to check.
 
 #define DATA_PUBLISH_COUNTER_START_COUNT                    0                                                   ///< Data publish counter start count.
+#define CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS              ( 1 * MS_PER_SECOND )                               ///< Concentrate pump park fault timeout in milliseconds.
 
 /*************************DVT Definitions********************************************/
 
@@ -153,21 +154,22 @@
     {
         concentratePumps[ pumpId ].controlTimerCounter         = 0;
         concentratePumps[ pumpId ].execState                   = CONCENTRATE_PUMP_OFF_STATE;
-        concentratePumps[ pumpId ].measuredPumpSpeed.data      = 0.0;
+        concentratePumps[ pumpId ].measuredPumpSpeed.data      = 0.0F;
         concentratePumps[ pumpId ].hasTurnOnPumpsBeenRequested = FALSE;
         concentratePumps[ pumpId ].hasParkBeenRequested        = FALSE;
         concentratePumps[ pumpId ].parked.data                 = FALSE;
         concentratePumps[ pumpId ].parkFaulted.data            = FALSE;
-        concentratePumps[ pumpId ].pumpTargetSpeed             = 0.0;
+        concentratePumps[ pumpId ].pumpTargetSpeed             = 0.0F;
         concentratePumps[ pumpId ].direction                   = CONCENTRATE_PUMP_FORWARD_DIR;          // For V3
         concentratePumps[ pumpId ].controlSet                  = CONCENTRATE_PUMP_CONTROL_FORWARD;      // For DVT
         stopConcentratePump( pumpId );
     }
 
     initPersistentAlarm( ALARM_ID_CP1_SPEED_CONTROL_ERROR, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_CP2_SPEED_CONTROL_ERROR, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
-    initPersistentAlarm( ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS,
-                                                                         CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS );
+    initPersistentAlarm( ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS, CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS );
+    initPersistentAlarm( ALARM_ID_DG_ACID_CONCENTRATE_PUMP_PARK_FAULT, CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS, CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_DG_BICARB_CONCENTRATE_PUMP_PARK_FAULT, CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS, CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS );
 }
 
 /*********************************************************************//**
@@ -205,24 +207,36 @@
         monitorPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB, ALARM_ID_CP2_SPEED_CONTROL_ERROR );
     }
 
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONCENTRATE_PUMPS_PARK ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        BOOL isAcidPumpParked   = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID );
+        BOOL isBicarbPumpParked = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB );
+
+        checkPersistentAlarm( ALARM_ID_DG_ACID_CONCENTRATE_PUMP_PARK_FAULT, isAcidPumpParked, isAcidPumpParked, CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS );
+        checkPersistentAlarm( ALARM_ID_DG_BICARB_CONCENTRATE_PUMP_PARK_FAULT, isBicarbPumpParked, isBicarbPumpParked, CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS );
+    }
+#endif
+
     if ( ++concentratePumpMonitorTimerCounter >= getU32OverrideValue( &concentratePumpDataPublishInterval ) )
     {
         CONCENTRATE_PUMP_DATA_T data;
-        U08 fpgaConcentratePumpsFault = getFPGAConcentratePumpsFault();
-        U08 cp1Direction        = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].direction;
-        F32 cp1SetSpeed         = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed;
-        F32 cp1Speed            = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID );
-        F32 cp1TgtSpeed         = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].pumpTargetSpeed;
-        BOOL cp1Parked          = getConcPumpIsParked( CONCENTRATEPUMPS_CP1_ACID );
-        BOOL cp2ParkFault       = getConcPumpParkIsFaulted( CONCENTRATEPUMPS_CP1_ACID );
-        U08 cp2Direction        = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].direction;
-        F32 cp2SetSpeed         = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed;
-        F32 cp2Speed            = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB );
-        F32 cp2TgtSpeed         = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].pumpTargetSpeed;
 
-        if ( 0 != fpgaConcentratePumpsFault )
+        U08 fpgaConcPumpsFault = getFPGAConcentratePumpsFault();
+        U08 cp1Direction       = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].direction;
+        F32 cp1SetSpeed        = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed;
+        F32 cp1Speed           = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID );
+        F32 cp1TgtSpeed        = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].pumpTargetSpeed;
+        BOOL cp1Parked         = getConcPumpIsParked( CONCENTRATEPUMPS_CP1_ACID );
+        BOOL cp2ParkFault      = getConcPumpParkIsFaulted( CONCENTRATEPUMPS_CP1_ACID );
+        U08 cp2Direction       = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].direction;
+        F32 cp2SetSpeed        = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed;
+        F32 cp2Speed           = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB );
+        F32 cp2TgtSpeed        = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].pumpTargetSpeed;
+
+        if ( 0 != fpgaConcPumpsFault )
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, fpgaConcentratePumpsFault );
+            //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, fpgaConcPumpsFault );
         }
 
         // Use the above values to prepare the broadcast data
@@ -606,18 +620,38 @@
         if ( HW_CONFIG_BETA == getHardwareConfigStatus() )
         {
             controlSet = ( CONCENTRATE_PUMP_ON_CONTROL | concentratePumps[ pumpId ].direction );
-            CONCENTRATEPUMPS_CP1_ACID == pumpId ? setFPGAV3AcidPumpControl( controlSet ) : setFPGAV3BicarbPumpControl( controlSet );
+
+            if ( CONCENTRATEPUMPS_CP1_ACID == pumpId )
+            {
+                setFPGAV3AcidPumpControl( controlSet );
+            }
+            else
+            {
+                setFPGAV3BicarbPumpControl( controlSet );
+            }
         }
         else
 #endif
         {
             controlSet = concentratePumps[ pumpId ].controlSet;
-            CONCENTRATEPUMPS_CP1_ACID == pumpId ? setFPGAAcidPumpControl( controlSet ) : setFPGABicarbPumpControl( controlSet );
+            if ( CONCENTRATEPUMPS_CP1_ACID == pumpId )
+            {
+                setFPGAAcidPumpControl( controlSet );
+            }
+            else
+            {
+                setFPGABicarbPumpControl( controlSet );
+            }
         }
 
         state = CONCENTRATE_PUMP_RAMP_TO_TARGET_SPEED_STATE;
     }
 
+    if ( TRUE == concentratePumps[ pumpId ].hasParkBeenRequested )
+    {
+        stopConcentratePump( pumpId );
+    }
+
     return state;
 }
 
@@ -1011,7 +1045,7 @@
     if ( ( pumpId < NUM_OF_CONCENTRATE_PUMPS ) && ( TRUE == isTestingActivated() ) )
     {
         result = TRUE;
-        concentratePumps[ pumpId ].parkFaulted.ovData   = 0.0;
+        concentratePumps[ pumpId ].parkFaulted.ovData   = 0.0F;
         concentratePumps[ pumpId ].parkFaulted.override = OVERRIDE_RESET;
     }