Index: firmware/App/Controllers/Thermistors.c
===================================================================
diff -u -r87e007b4910c7369d71e769a35f82837b64eecf4 -rb3577735183df5556cc0042f87247685af45fa95
--- firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision 87e007b4910c7369d71e769a35f82837b64eecf4)
+++ firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision b3577735183df5556cc0042f87247685af45fa95)
@@ -46,7 +46,7 @@
 #define CELSIUS_TO_KELVIN_CONVERSION            273.15F                                                ///< Celsius to Kelvin temperature conversion.
 #define MIN_ALLOWED_TEMPERATURE                 0.0F                                                   ///< Thermistors/sensors minimum allowed temperature reading.
 #define MAX_ALLOWED_TEMPERATURE                 80.0F                                                  ///< Thermistors/sensors maximum allowed temperature reading.
-#define MAX_ALLOWED_TEMP_OUT_OF_RANGE_PERIOD    ( 5 * MS_PER_SECOND )                                  ///< Thermistors/sensors maximum allowed temperature out of range period.
+#define MAX_ALLOWED_TEMP_OUT_OF_RANGE_PERIOD    ( 40 * MS_PER_SECOND )                                  ///< Thermistors/sensors maximum allowed temperature out of range period.
 #define DATA_PUBLISH_COUNTER_START_COUNT        2                                                      ///< Data publish counter start count.
 
 /// Thermistors exec states
@@ -98,12 +98,26 @@
 {
 
      // Set voltage reference and ADC bit resolution for each thermistor
-     thermistorsStatus[ THERMISTOR_ONBOARD_NTC ].voltageReference    = THERMISTOR_FPGA_REF_VOLTAGE;
-     thermistorsStatus[ THERMISTOR_ONBOARD_NTC ].adcBitResolution    = TEN_BIT_RESOLUTION;
-     thermistorsStatus[ THERMISTOR_POWER_SUPPLY_1 ].voltageReference = THERMISTOR_REFERENCE_VOLTAGE;
-     thermistorsStatus[ THERMISTOR_POWER_SUPPLY_1 ].adcBitResolution = TWELVE_BIT_RESOLUTION;
-     thermistorsStatus[ THERMISTOR_POWER_SUPPLY_2 ].voltageReference = THERMISTOR_FPGA_REF_VOLTAGE;
-     thermistorsStatus[ THERMISTOR_POWER_SUPPLY_2 ].adcBitResolution = TEN_BIT_RESOLUTION;
+#ifndef _RELEASE_
+        if ( HW_CONFIG_BETA == getHardwareConfigStatus() )
+        {
+            thermistorsStatus[ THERMISTOR_ONBOARD_NTC ].voltageReference    = THERMISTOR_REFERENCE_VOLTAGE;
+            thermistorsStatus[ THERMISTOR_ONBOARD_NTC ].adcBitResolution    = TWELVE_BIT_RESOLUTION;
+            thermistorsStatus[ THERMISTOR_POWER_SUPPLY_1 ].voltageReference = THERMISTOR_REFERENCE_VOLTAGE;
+            thermistorsStatus[ THERMISTOR_POWER_SUPPLY_1 ].adcBitResolution = TWELVE_BIT_RESOLUTION;
+            thermistorsStatus[ THERMISTOR_POWER_SUPPLY_2 ].voltageReference = THERMISTOR_FPGA_REF_VOLTAGE;
+            thermistorsStatus[ THERMISTOR_POWER_SUPPLY_2 ].adcBitResolution = TWELVE_BIT_RESOLUTION;
+        }
+        else
+#endif
+        {
+            thermistorsStatus[ THERMISTOR_ONBOARD_NTC ].voltageReference    = THERMISTOR_FPGA_REF_VOLTAGE;
+            thermistorsStatus[ THERMISTOR_ONBOARD_NTC ].adcBitResolution    = TEN_BIT_RESOLUTION;
+            thermistorsStatus[ THERMISTOR_POWER_SUPPLY_1 ].voltageReference = THERMISTOR_REFERENCE_VOLTAGE;
+            thermistorsStatus[ THERMISTOR_POWER_SUPPLY_1 ].adcBitResolution = TWELVE_BIT_RESOLUTION;
+            thermistorsStatus[ THERMISTOR_POWER_SUPPLY_2 ].voltageReference = THERMISTOR_FPGA_REF_VOLTAGE;
+            thermistorsStatus[ THERMISTOR_POWER_SUPPLY_2 ].adcBitResolution = TEN_BIT_RESOLUTION;
+        }
 
      // Reset the thermistors values for a run
      thermistorsExecState = THERMISTORS_EXEC_STATE_START_STATE;