Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r4e11c80367b5ae522aa34fb137079e516c98831b -rda1f86ddf735623ba393ca809479157cd66c154c
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 4e11c80367b5ae522aa34fb137079e516c98831b)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision da1f86ddf735623ba393ca809479157cd66c154c)
@@ -456,14 +456,33 @@
         // the electrical connection of THd sensor.
         if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) )
         {
-            if ( ( TEMPSENSORS_HEAT_DISINFECT == sensorIndex ) || ( TEMPSENSORS_INTERNAL_THD_RTD == sensorIndex ) )
+            if ( TEMPSENSORS_HEAT_DISINFECT == sensorIndex )
             {
-                temperature = getF32OverrideValue( &tempSensors[ TEMPSENSORS_OUTLET_REDUNDANT ].temperatureValues );
+                if ( OVERRIDE_KEY == tempSensors[ TEMPSENSORS_HEAT_DISINFECT ].temperatureValues.override )
+                {
+                    temperature = getF32OverrideValue(  &tempSensors[ TEMPSENSORS_HEAT_DISINFECT ].temperatureValues  );
+                }
+                else
+                {
+                    temperature = getF32OverrideValue( &tempSensors[ TEMPSENSORS_OUTLET_REDUNDANT ].temperatureValues );
+                }
             }
 
+            if ( TEMPSENSORS_INTERNAL_THD_RTD == sensorIndex )
+            {
+                temperature = 40.0F;
+            }
+
             if ( TEMPSENSORS_OUTLET_REDUNDANT == sensorIndex )
             {
-                temperature = getF32OverrideValue( &tempSensors[ TEMPSENSORS_INLET_DIALYSATE ].temperatureValues );
+                if ( OVERRIDE_KEY == tempSensors[ TEMPSENSORS_OUTLET_REDUNDANT ].temperatureValues.override )
+                {
+                    temperature = getF32OverrideValue(  &tempSensors[ TEMPSENSORS_OUTLET_REDUNDANT ].temperatureValues  );
+                }
+                else
+                {
+                    temperature = getF32OverrideValue( &tempSensors[ TEMPSENSORS_INLET_DIALYSATE ].temperatureValues );
+                }
             }
         }
 #endif
@@ -913,6 +932,7 @@
         data.loadCellA2B2              = getTemperatureValue( TEMPSENSORS_LOAD_CELL_A2_B2 );
         data.internalTHDORTD           = getTemperatureValue( TEMPSENSORS_INTERNAL_TRO_RTD );
         data.internalTDIRTD            = getTemperatureValue( TEMPSENSORS_INTERNAL_TDI_RTD );
+        data.interalTHDRTD             = getTemperatureValue( TEMPSENSORS_INTERNAL_THD_RTD );
         data.internalCondSnsrTemp      = getTemperatureValue( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR );
 
         broadcastData( MSG_ID_DG_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) );