Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r34ae229d1508df89630f4dc5fbe9291d135f0686 -r79d0c6ca5e03581ba1b4a142f5b450bf4547dded
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 34ae229d1508df89630f4dc5fbe9291d135f0686)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 79d0c6ca5e03581ba1b4a142f5b450bf4547dded)
@@ -324,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_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_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, INLET_WATER_TEMP_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, INLET_WATER_TEMP_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_TEMP_OUT_OF_RANGE_TIMEOUT_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 );
 
@@ -435,17 +435,17 @@
             case DG_MODE_GENE:
             case DG_MODE_FILL:
             case DG_MODE_DRAI:
-                if ( ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ) && ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) ) )
+                if ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )
                 {
-                    isWaterTempInHighRange = FALSE;
+                    isWaterTempInHighRange = ( temperature <= MIN_WATER_TEMPERATURE_WARNING_HIGH_RANGE ? FALSE : TRUE );
                 }
 
                 // 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 ) ) )
+                if ( TRUE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )
                 {
-                    isWaterTempInLowRange = FALSE;
+                    isWaterTempInLowRange = ( temperature >= MAX_WATER_TEMPERATURE_WARNING_LOW_RANGE ? FALSE : TRUE );
                 }
 
                 // Per PRS 405
@@ -1091,11 +1091,11 @@
 
 #ifndef _RELEASE_
     if ( ( HW_CONFIG_BETA == getHardwareConfigStatus() ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
-#endif
     {
         primaryAndCondSensorsRefResistance = PRIMARY_HEATER_EXT_TEMP_SENSORS_V3_REF_RESISTANCE;
         externalTempSesnorsRefResitance    = TRIMMER_HEATER_EXT_TEMP_SENSORS_V3_REF_RESISTANCE;
     }
+#endif
 
     tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER ].refResistance  = primaryAndCondSensorsRefResistance;
     tempSensors[ TEMPSENSORS_OUTLET_PRIMARY_HEATER ].refResistance = primaryAndCondSensorsRefResistance;