Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -rc7ed4f90b600fe684097654f150e4972646ffec9
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision a9315539f527b92523b1598ff91e47db4d71dae2)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision c7ed4f90b600fe684097654f150e4972646ffec9)
@@ -55,9 +55,14 @@
 #define SHIFT_BITS_BY_2_FOR_AVERAGING                           2U                                              ///< Shift the ADCs of the temperature sensors by 2 to average them.
 #define INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD              ( 5 * MS_PER_SECOND )                           ///< Persistence period for temperature sensors out of range error period.
 
-#define MIN_WATER_INPUT_TEMPERATURE                             22U                                             ///< Minimum water input temperature.
-#define MAX_WATER_INPUT_TEMPERATURE                             35U                                             ///< Maximum water input temperature.
+#define MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE                 22.0F                                           ///< Low range minimum water input temperature.
+#define MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE                 24.0F                                           ///< Low range maximum water input temperature.
 
+#define MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE                37.0F                                           ///< High range minimum water input temperature.
+#define MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE                39.0F                                           ///< High range maximum water input temperature.
+
+#define MAX_WATER_TEMPERATURE_ALARM                             50.0F                                           ///< High water temperature alarm.
+
 #define HEATERS_INTERNAL_TEMPERTURE_CALCULATION_INTERVAL        20U                                             ///< Time interval that is used to calculate the heaters internal temperature.
 #define HEATERS_INTERNAL_TC_ADC_TO_TEMP_CONVERSION_COEFF        0.25                                            ///< Heaters internal temperature sensors ADC to temperature conversion coefficient.
 #define HEATERS_COLD_JUNCTION_ADC_TO_TEMP_CONVERSION_COEFF      0.0625                                          ///< Heaters cold junction temperature sensors ADC to temperature conversion coefficient.
@@ -267,9 +272,15 @@
     initPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD,
                                                                 INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD );
 
-    initPersistentAlarm( ALARM_ID_INLET_WATER_LOW_TEMPERATURE,  INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD,
+    initPersistentAlarm( ALARM_ID____AVAILABLE_28,  INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD,
                                                                 INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD );
 
+    initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE,  INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD,
+                                                                         INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD );
+
+    initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD,
+                                                                         INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD );
+
     // Persistent alarm for the temperature sensors range check
     initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, TEMP_SENSORS_OUT_OF_RANGE_PERSISTENT_PEROID_MS,
                                                                       TEMP_SENSORS_OUT_OF_RANGE_PERSISTENT_PEROID_MS );
@@ -358,12 +369,33 @@
 void checkInletWaterTemperature( void )
 {
 #ifndef DISABLE_WATER_QUALITY_CHECK
-    F32 const temperature = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
-    BOOL const isWaterTempTooHigh = temperature > MAX_WATER_INPUT_TEMPERATURE;
-    BOOL const isWaterTempTooLow = temperature < MIN_WATER_INPUT_TEMPERATURE;
 
-    checkPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, isWaterTempTooHigh, temperature, MAX_WATER_INPUT_TEMPERATURE );
-    checkPersistentAlarm( ALARM_ID_INLET_WATER_LOW_TEMPERATURE, isWaterTempTooLow, temperature, MIN_WATER_INPUT_TEMPERATURE );
+    F32 temperature             = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
+    BOOL isWaterTempInHighRange = ( temperature > MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? TRUE : FALSE );
+    BOOL isWaterTempInLowRange  = ( temperature < MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE ? TRUE : FALSE );
+    BOOL isWaterTempTooHigh     = ( temperature > MAX_WATER_TEMPERATURE_ALARM ? TRUE : FALSE );
+
+    // Fault alarm per PRS 557 for high temperature
+    checkPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_TEMPERATURE, isWaterTempTooHigh, temperature, MAX_WATER_TEMPERATURE_ALARM );
+
+    if ( TRUE == isWaterTempInHighRange )        // warning alarm per PRS 406
+    {
+        checkPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, isWaterTempInHighRange, temperature, MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+    }
+    else if ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE )
+    {
+        checkPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, FALSE, temperature, MAX_WATER_TEMPERATURE_WARNING_HIGH_RANGE );
+    }
+
+
+    if ( TRUE == isWaterTempInLowRange )    // warning alarm per PRS 405
+    {
+        checkPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, isWaterTempInLowRange, temperature, MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE );
+    }
+    else if ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE )
+    {
+        checkPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, FALSE, temperature, MIN_WATER_TEMPERATURE_WARNING_LOW_RANGE );
+    }
 #endif
 }