Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rc28fa96d9ed38b8bfa793eb9096e32967e2e40cb -r6fc5708ce7e0c87a3447921b4a939e3a00e64cbd
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision c28fa96d9ed38b8bfa793eb9096e32967e2e40cb)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 6fc5708ce7e0c87a3447921b4a939e3a00e64cbd)
@@ -8,7 +8,7 @@
 * @file    ConcentratePumps.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      24-Jan-2023
+* @date    (last)      16-Feb-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  22-Oct-2020
@@ -58,7 +58,7 @@
 #define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL              ( 500 / TASK_GENERAL_INTERVAL )                     ///< Interval (ms/task time) at which the concentrate pump is monitored.
 
 #define CONCENTRATE_PUMP_CONTROL_INTERVAL                   ( 1 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )       ///< Interval (ms/task time) at which the concentrate pump is controlled.
-#define CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD   ( 5 * MS_PER_SECOND )                               ///< Persistence period for concentrate pump speed control error.
+#define CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD   ( 6 * MS_PER_SECOND )                               ///< Persistence period for concentrate pump speed control error.
 
 #define NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK          1                                                   ///< Number of acid and bicarb non-volatile data to check.
 
@@ -174,7 +174,6 @@
     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 );
     initPersistentAlarm( ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, CONCENTRATE_PUMP_FAULT_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_FAULT_PERSISTENCE_PERIOD );
-
 }
 
 /*********************************************************************//**
@@ -186,8 +185,8 @@
  *************************************************************************/
 void execConcentratePumpMonitor( void )
 {
-    U08 fpgaConcPumpsFault  = getFPGAConcentratePumpsFault();
-    BOOL isConcPumpFault    = ( fpgaConcPumpsFault > 0 ? TRUE : FALSE );
+    U08 fpgaConcPumpsFault = getFPGAConcentratePumpsFault();
+    BOOL isConcPumpFault   = ( fpgaConcPumpsFault > 0 ? TRUE : FALSE );
 
     // Check if a new calibration is available
     if ( TRUE == isNewCalibrationRecordAvailable() )
@@ -219,29 +218,29 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONCENTRATE_PUMPS_PARK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        BOOL isAcidPumpParked   = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID );
-        BOOL isBicarbPumpParked = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB );
+        BOOL isAcidPumpParked   = getConcPumpParkIsFaulted( CONCENTRATEPUMPS_CP1_ACID );
+        BOOL isBicarbPumpParked = getConcPumpParkIsFaulted( 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 );
     }
 
-    checkPersistentAlarm(ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, isConcPumpFault , fpgaConcPumpsFault, CONCENTRATE_PUMP_FAULT_PERSISTENCE_PERIOD );
+    checkPersistentAlarm( ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, isConcPumpFault, fpgaConcPumpsFault, CONCENTRATE_PUMP_FAULT_PERSISTENCE_PERIOD );
 
     if ( ++concentratePumpMonitorTimerCounter >= getU32OverrideValue( &concentratePumpDataPublishInterval ) )
     {
         CONCENTRATE_PUMP_DATA_T data;
 
-        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;
+        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;
 
         // Use the above values to prepare the broadcast data
         data.cp1CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1SetSpeed * -1.0 : cp1SetSpeed );