Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r6499ea25921fcf67826fa0c35bb03caf411ba542 -r6bf297b685487355fd581f221c59cf9d5a4fa53e
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 6499ea25921fcf67826fa0c35bb03caf411ba542)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 6bf297b685487355fd581f221c59cf9d5a4fa53e)
@@ -8,7 +8,7 @@
 * @file    Pressures.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      21-Dec-2022
+* @date    (last)      11-Jan-2023
 *
 * @author  (original)  Sean
 * @date    (original)  04-Apr-2020
@@ -62,7 +62,8 @@
 #define MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG  80.0F                                           ///< Maximum allowed high pressure value in psig.
 #define MIN_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG  78.0F                                           ///< Minimum allowed high pressure value in psig.
 
-#define INLET_WATER_PRESSURE_PERSISTENCE_PERIOD     ( 5 * MS_PER_SECOND )                           ///< Persistence period for pressure out of range error.
+#define INLET_WATER_PRES_OUT_OF_RANGE_TIMEOUT_MS    ( 5 * MS_PER_SECOND )                           ///< Persistence period for pressure out of range error in milliseconds.
+#define INLET_WATER_PRES_OUT_OF_RANGE_CLEAR_MS      ( 1 * MS_PER_SECOND )                           ///< Persistence period for pressure out of range clear in milliseconds.
 #define PRESSURE_OUT_OF_RANGE_TIMEOUT_MS            ( 5 * MS_PER_SECOND )                           ///< Pressure out of range persistence period in milliseconds.
 #define PRESSURES_DATA_PUB_INTERVAL                 ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )      ///< Interval (ms/task time) at which the pressures data is published on the CAN bus.
 #define DATA_PUBLISH_COUNTER_START_COUNT            10                                              ///< Data publish counter start count.
@@ -150,12 +151,12 @@
         msrdPressureSum[ i ]      = 0;
     }
 
-    initPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
-    initPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
+    initPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, INLET_WATER_PRES_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_PRES_OUT_OF_RANGE_CLEAR_MS );
+    initPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE, INLET_WATER_PRES_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_PRES_OUT_OF_RANGE_CLEAR_MS );
     initPersistentAlarm( ALARM_ID_DG_PRESSURE_OUT_OF_RANGE, PRESSURE_OUT_OF_RANGE_TIMEOUT_MS, PRESSURE_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DG_BARO_PRESSURE_OUT_OF_RANGE, PRESSURE_OUT_OF_RANGE_TIMEOUT_MS, PRESSURE_OUT_OF_RANGE_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
-    initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
+    initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH, INLET_WATER_PRES_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_PRES_OUT_OF_RANGE_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, INLET_WATER_PRES_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_PRES_OUT_OF_RANGE_TIMEOUT_MS );
 }
 
 /*********************************************************************//**
@@ -182,20 +183,29 @@
             case DG_MODE_GENE:
             case DG_MODE_FILL:
             case DG_MODE_DRAI:
-                isPressureTooHigh = ( pressure <= MIN_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ? FALSE : TRUE );
-                isPressureTooLow  = ( pressure >= MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ? FALSE : TRUE );
-                // Per PRS 841
-                checkPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE, isPressureTooHigh, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
+                if ( ( pressure >= MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE ) ) )
+                {
+                    isPressureTooLow = FALSE;
+                }
+
                 // Per PRS 401
                 checkPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, isPressureTooLow, pressure, MAX_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
+
+                if ( ( pressure <= MIN_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) ) )
+                {
+                    isPressureTooHigh = FALSE;
+                }
+
+                // Per PRS 841
+                checkPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE, isPressureTooHigh, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
                 break;
 
-            // TODO add chem flush and heat disinfect cooling modes once they are created
             case DG_MODE_INIT:
             case DG_MODE_STAN:
             case DG_MODE_FLUS:
             case DG_MODE_HEAT:
             case DG_MODE_CHEM:
+            case DG_MODE_CHFL:
                 if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
                 {
                     // TODO define the PRS
@@ -545,14 +555,14 @@
  *************************************************************************/
 static void monitorPressureSensors( void )
 {
-    U08 sensorId;
-    BOOL isPressureOutOfRange = FALSE;
-    BOOL isCurrentPressureOut = FALSE;
-    BOOL isBaroOutOfRange     = FALSE;
-    F32 pressureOutID         = 0.0F;
-    F32 pressureReading       = 0.0F;
+    PRESSURE_SENSORS_T sensorId;
+    PRESSURE_SENSORS_T sensorInAlarm = PRESSURE_FIRST;
+    F32 pressureReading              = 0.0F;
+    BOOL isBaroOutOfRange            = FALSE;
+    BOOL isPressureOutOfRange        = FALSE;
+    F32 alarmPressure                = 0.0F;
 
-    for ( sensorId = 0; sensorId < NUM_OF_PRESSURE_SENSORS; sensorId++ )
+    for ( sensorId = PRESSURE_FIRST; sensorId < NUM_OF_PRESSURE_SENSORS; sensorId++ )
     {
         switch ( sensorId )
         {
@@ -566,9 +576,12 @@
                 // Remember the ID of the pressure sensor that is out of range. The ID is converted to float since the check persistent alarm function
                 // accepts only floats.
                 pressureReading       = getMeasuredDGPressure( sensorId ) + getBaroPressurePSI();
-                isCurrentPressureOut  = ( ( pressureReading < MIN_VALID_PRESSURE_RANGE_PSIA ) || ( pressureReading > MAX_VALID_PRESSURE_RANGE_PSIA ) ? TRUE : FALSE );
-                isPressureOutOfRange |= isCurrentPressureOut;
-                pressureOutID         = ( TRUE == isCurrentPressureOut ? (F32)sensorId : pressureOutID );
+                if ( ( pressureReading < MIN_VALID_PRESSURE_RANGE_PSIA ) || ( pressureReading > MAX_VALID_PRESSURE_RANGE_PSIA ) )
+                {
+                    isPressureOutOfRange = TRUE;
+                    sensorInAlarm        = sensorId;
+                    alarmPressure        = pressureReading;
+                }
                 break;
 
             case PRESSURE_SENSOR_BAROMETRIC:
@@ -590,7 +603,7 @@
     }
 
     // Once the sensors were all checked to be out of range, check the persistent alarm
-    checkPersistentAlarm( ALARM_ID_DG_PRESSURE_OUT_OF_RANGE, isPressureOutOfRange, pressureOutID, pressureReading );
+    checkPersistentAlarm( ALARM_ID_DG_PRESSURE_OUT_OF_RANGE, isPressureOutOfRange, sensorInAlarm, alarmPressure );
 }