Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r19934ca6e36e2dcabd6a6083a9a1f15b1ed32189 -r6f2991204047ccbceeb5461f7c35af6d8f5dfd0b
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 19934ca6e36e2dcabd6a6083a9a1f15b1ed32189)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 6f2991204047ccbceeb5461f7c35af6d8f5dfd0b)
@@ -465,7 +465,7 @@
 #ifndef _RELEASE_
         // If the system is V3 and THd or its ADC internal temperature is requested, return TRo instead. V3 does not have
         // the electrical connection of THd sensor.
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) )
+        if ( HW_CONFIG_BETA == getHardwareConfigStatus() )
         {
             if ( TEMPSENSORS_HEAT_DISINFECT == sensorIndex )
             {
@@ -851,7 +851,7 @@
     processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR, getFPGACondSnsrInternalTemp() );
 
 #ifndef _RELEASE_
-    if ( ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) != SW_CONFIG_ENABLE_VALUE ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
+    if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
 #endif
     {
         errorCount = (U32)getFPGATHdErrorCount();
@@ -1032,14 +1032,11 @@
     U32 externalTempSesnorsRefResitance    = TRIMMER_HEATER_EXT_TEMP_SENSORS_REF_RESISTANCE;
 
 #ifndef _RELEASE_
-    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) )
+    if ( ( HW_CONFIG_BETA == getHardwareConfigStatus() ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
 #endif
     {
-        if ( getCurrentOperationMode() != DG_MODE_INIT )
-        {
-            primaryAndCondSensorsRefResistance = PRIMARY_HEATER_EXT_TEMP_SENSORS_V3_REF_RESISTANCE;
-            externalTempSesnorsRefResitance    = TRIMMER_HEATER_EXT_TEMP_SENSORS_V3_REF_RESISTANCE;
-        }
+        primaryAndCondSensorsRefResistance = PRIMARY_HEATER_EXT_TEMP_SENSORS_V3_REF_RESISTANCE;
+        externalTempSesnorsRefResitance    = TRIMMER_HEATER_EXT_TEMP_SENSORS_V3_REF_RESISTANCE;
     }
 
     tempSensors[ TEMPSENSORS_INLET_PRIMARY_HEATER ].refResistance  = primaryAndCondSensorsRefResistance;