Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r95eefee71702fbf031025dc35ebaf553dfb050b7 -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 95eefee71702fbf031025dc35ebaf553dfb050b7)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
@@ -241,11 +241,15 @@
 
     // Initialize the heaters internal thermocouples constants
     tempSensors[ TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE ].conversionCoeff = HEATERS_INTERNAL_TC_ADC_TO_TEMP_CONVERSION_COEFF;
+    tempSensors[ TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE ].maxAllowedTemperature = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
     tempSensors[ TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE ].conversionCoeff = HEATERS_INTERNAL_TC_ADC_TO_TEMP_CONVERSION_COEFF;
+    tempSensors[ TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE ].maxAllowedTemperature = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
     // Initialize the heaters cold junction constants
     tempSensors[ TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION ].conversionCoeff = HEATERS_COLD_JUNCTION_ADC_TO_TEMP_CONVERSION_COEFF;
+    tempSensors[ TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION ].maxAllowedTemperature = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
     tempSensors[ TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION ].conversionCoeff = HEATERS_COLD_JUNCTION_ADC_TO_TEMP_CONVERSION_COEFF;
+    tempSensors[ TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION ].maxAllowedTemperature = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C;
 
     // FPGA board temperature conversion coefficient
     tempSensors[ TEMPSENSORS_FPGA_BOARD_SENSOR ].conversionCoeff            = 503.975 / (F32)TWELVE_BIT_RESOLUTION;
@@ -366,32 +370,37 @@
 void checkInletWaterTemperature( void )
 {
 #ifndef DISABLE_WATER_QUALITY_CHECK
-    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 );
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WATER_QUALITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+    {
+        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 );
+        // 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 == 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 );
+        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 );
+        }
     }
-    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
 }
 
@@ -925,12 +934,17 @@
  *************************************************************************/
 static void monitorTemperatureSnsrs( U32 sensorIndex )
 {
-    F32 temperature = getTemperatureValue( sensorIndex );
-
-    // Check both temperature and to be in range
-    if ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ sensorIndex ].maxAllowedTemperature ) )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, TRUE, sensorIndex, temperature );
+        F32 temperature = getTemperatureValue( sensorIndex );
+
+        // Check both temperature and to be in range
+        if ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ sensorIndex ].maxAllowedTemperature ) )
+        {
+            checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, TRUE, sensorIndex, temperature );
+        }
     }
 }