Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r6499ea25921fcf67826fa0c35bb03caf411ba542 -r6bf297b685487355fd581f221c59cf9d5a4fa53e
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 6499ea25921fcf67826fa0c35bb03caf411ba542)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 6bf297b685487355fd581f221c59cf9d5a4fa53e)
@@ -8,7 +8,7 @@
 * @file    TemperatureSensors.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      21-Dec-2022
+* @date    (last)      11-Jan-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  08-Apr-2020
@@ -60,6 +60,7 @@
 #define SHIFT_BITS_BY_2                                         2U                                              ///< Shift bits by 2 to create a 4 for averaging 4 samples.
 #define SHIFT_BITS_BY_2_FOR_AVERAGING                           2U                                              ///< Shift the ADCs of the temperature sensors by 2 to average them.
 #define INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS                ( 5 * MS_PER_SECOND )                           ///< Inlet water temperature sensors timeout in milliseconds.
+#define INLET_WATER_TEMP_OUT_OF_RANGE_CLEAR_MS                  ( 1 * MS_PER_SECOND )                           ///< Inlet water temperature sensors out of range clear in milliseconds.
 
 #define MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE                 24.0F                                           ///< Low range minimum water input temperature.
 #define MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE                 26.0F                                           ///< Low range maximum water input temperature.
@@ -323,8 +324,8 @@
     tempSensors[ TEMPSENSORS_BAROMETRIC_TEMP_SENSOR ].maxAllowedTemp        = NON_FLUID_PATH_TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
     // Persistent alarms for inlet water high/low temperature
-    initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE,  INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_CLEAR_MS );
+    initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_CLEAR_MS );
     initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS );
 
@@ -434,10 +435,19 @@
             case DG_MODE_GENE:
             case DG_MODE_FILL:
             case DG_MODE_DRAI:
-                isWaterTempInHighRange = ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? FALSE : TRUE );
-                isWaterTempInLowRange  = ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE ? FALSE : TRUE );
+                if ( ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) ) )
+                {
+                    isWaterTempInHighRange = FALSE;
+                }
+
                 // Per PRS 406
                 checkPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, isWaterTempInHighRange, temperature, MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+
+                if ( ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) ) )
+                {
+                    isWaterTempInLowRange = FALSE;
+                }
+
                 // Per PRS 405
                 checkPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, isWaterTempInLowRange, temperature, MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE );
                 break;
@@ -447,6 +457,7 @@
             case DG_MODE_CHEM:
             case DG_MODE_INIT:
             case DG_MODE_STAN:
+            case DG_MODE_CHFL:
                 if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
                 {
                     // Per PRS 557
@@ -1014,15 +1025,15 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        U08 i;
-        F32 temperature              = 0.0F;
-        BOOL isTemperatureOutOfRange = FALSE;
-        F32 alarmTemperature         = 0.0F;
-        U08 alarmIndex               = 0;
+        TEMPERATURE_SENSORS_T sensorId;
+        TEMPERATURE_SENSORS_T sensorInAlarm = TEMPSENSORS_FIRST;
+        F32 temperature                     = 0.0F;
+        BOOL isTemperatureOutOfRange        = FALSE;
+        F32 alarmTemperature                = 0.0F;
 
-        for ( i = 0; i < NUM_OF_TEMPERATURE_SENSORS; i++ )
+        for ( sensorId = TEMPSENSORS_FIRST; sensorId < NUM_OF_TEMPERATURE_SENSORS; sensorId++ )
         {
-           switch ( i )
+           switch ( sensorId )
            {
                case TEMPSENSORS_INLET_PRIMARY_HEATER:
                case TEMPSENSORS_HEAT_DISINFECT:
@@ -1041,14 +1052,14 @@
                case TEMPSENSORS_BAROMETRIC_TEMP_SENSOR:
                    // All the temperature sensors are monitored except the heaters' temperature sensors.
                    // The heaters' temperature sensors are only broadcast for information
-                   temperature = getTemperatureValue( i );
+                   temperature = getTemperatureValue( sensorId );
 
                    // Check both temperature and to be in range
-                   if ( ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ i ].maxAllowedTemp ) ) &&
-                          ( getCurrentOperationMode() != DG_MODE_INIT  ) )
+                   if ( ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ sensorId ].maxAllowedTemp ) ) &&
+                          ( getCurrentOperationMode() != DG_MODE_INIT ) )
                    {
                        isTemperatureOutOfRange |= TRUE;
-                       alarmIndex               = i;
+                       sensorInAlarm            = sensorId;
                        alarmTemperature         = temperature;
                    }
                    break;
@@ -1060,7 +1071,7 @@
 
         }
 
-        checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, isTemperatureOutOfRange, alarmIndex, alarmTemperature );
+        checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, isTemperatureOutOfRange, sensorInAlarm, alarmTemperature );
     }
 }