Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r329409d63c11fd7d7fc8c3d3dd1d96e4e5a109dc -r5e3a46112ebab361a33b9f7cadb619eb12b44c0f
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 329409d63c11fd7d7fc8c3d3dd1d96e4e5a109dc)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 5e3a46112ebab361a33b9f7cadb619eb12b44c0f)
@@ -194,10 +194,10 @@
     calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP1_ACID,   getFPGACP1HallSensePulseWidth() );
     calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP2_BICARB, getFPGACP2HallSensePulseWidth() );
 
-    concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].parked.data   = (U32)getFPGAAcidPumpIsParked();
-    concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].parked.data = (U32)getFPGABicarbPumpIsParked();
-    concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].parked.data   = (U32)getFPGAAcidPumpParkFault();
-    concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].parked.data = (U32)getFPGABicarbPumpParkFault();
+    concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].parked.data        = (U32)getFPGAAcidPumpIsParked();
+    concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].parked.data      = (U32)getFPGABicarbPumpIsParked();
+    concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].parkFaulted.data   = (U32)getFPGAAcidPumpParkFault();
+    concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].parkFaulted.data = (U32)getFPGABicarbPumpParkFault();
 
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM ) != SW_CONFIG_ENABLE_VALUE )
@@ -234,9 +234,9 @@
         F32 cp2Speed           = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB );
         F32 cp2TgtSpeed        = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].pumpTargetSpeed;
 
-        if ( 0 != fpgaConcPumpsFault )
+        if ( fpgaConcPumpsFault != 0 )
         {
-            //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, fpgaConcPumpsFault );
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, fpgaConcPumpsFault );
         }
 
         // Use the above values to prepare the broadcast data
@@ -251,8 +251,8 @@
         data.cp1PulseUS         = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].pulseWidthUS;
         data.cp2PulseUS         = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].pulseWidthUS;
         data.cp1Parked          = getConcPumpIsParked( CONCENTRATEPUMPS_CP1_ACID );
-        data.cp2Parked          = getConcPumpParkIsFaulted( CONCENTRATEPUMPS_CP1_ACID );
-        data.cp1ParkFault       = getConcPumpIsParked( CONCENTRATEPUMPS_CP2_BICARB );
+        data.cp2Parked          = getConcPumpIsParked( CONCENTRATEPUMPS_CP2_BICARB );
+        data.cp1ParkFault       = getConcPumpParkIsFaulted( CONCENTRATEPUMPS_CP1_ACID );
         data.cp2ParkFault       = getConcPumpParkIsFaulted( CONCENTRATEPUMPS_CP2_BICARB );
 
         concentratePumpMonitorTimerCounter = 0;
@@ -522,10 +522,9 @@
 /*********************************************************************//**
  * @brief
  * The stopConcentratePump function sets the concentrate pump step speed
- * to zero and turns off concentrate pump.  Also parks the pump if requested.
+ * to zero and turns off concentrate pump. Also parks the pump if requested.
  * @details Inputs: none
- * @details Outputs: targetPumpSpeed[], currentPumpSpeed[], turn
- * concentrate pumps off
+ * @details Outputs: concentratePumps
  * @param pumpId concentrate pump id
  * @return none
  *************************************************************************/
@@ -580,8 +579,8 @@
             }
         }
         else
-        {
 #endif
+        {
             if ( TRUE == parkPump )
             {
                 if ( CONCENTRATEPUMPS_CP1_ACID == pumpId )
@@ -593,8 +592,8 @@
                     setFPGABicarbPumpParkCmd();
                 }
             }
-#ifndef _RELEASE_
         }
+#ifndef _RELEASE_
     }
 #endif
 }
@@ -647,6 +646,8 @@
         state = CONCENTRATE_PUMP_RAMP_TO_TARGET_SPEED_STATE;
     }
 
+    // In case we are in a mode that the concentrate pumps are off but they still need to be parked, then the stop function
+    // is called to park the pumps
     if ( TRUE == concentratePumps[ pumpId ].hasParkBeenRequested )
     {
         stopConcentratePump( pumpId );
@@ -1056,10 +1057,9 @@
  * @brief
  * The testSetConcentratePumpParkCommand function commands the given pump
  * to park.
- * @details Inputs: none
- * @details Outputs: measuredPumpSpeed[]
+ * @details Inputs: concentratePumps
+ * @details Outputs: concentratePumps
  * @param pumpId concentrate pump id
- * @param value override concentrate pump measured speed
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetConcentratePumpParkCommand( U32 pumpId )