Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r1a5efe97f5f39594b45797fded52cafce92afe80 -r3d131237935eb36e56e0d057a713430e31dc6405
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 1a5efe97f5f39594b45797fded52cafce92afe80)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 3d131237935eb36e56e0d057a713430e31dc6405)
@@ -417,8 +417,13 @@
     resetReservoirsLowestWeight();
 
     F32 ppiPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
-    F32 TDiTemp     = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );  //TODo change to TDi
+    F32 TDiTemp     = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
+#ifdef THD_USING_TRO_CONNECTOR
+    // TRo is connected to THd in V3
+    F32 TRoTemp     = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
+#else
     F32 TRoTemp     = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
+#endif
 
     // If the inlet pressure is less than the threshold and TDi and TRo difference is greater than 3 C, the cycle
     // should be canceled
@@ -661,7 +666,12 @@
     // Check if the flush circulation time has elapsed and the temperature sensors are not in range yet
     if ( ( TRUE == didTimeout( stateTimer, FLUSH_CICRCULATION_WAIT_TIME_MS ) ) && ( FALSE == areTempSensorsInRange ) )
     {
-        F32 ThdTemp = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT ); // TODO add THd later. This is the new temp sensor of the coldest spot.
+#ifdef THD_USING_TRO_CONNECTOR
+        // THd uses TRo in V3
+        F32 ThdTemp = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
+#else
+        F32 ThdTemp = getTemperatureValue( TEMPSENSORS_HEAT_DISINFECT );
+#endif
         F32 TPoTemp = getTemperatureValue( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
         F32 TD1Temp = getTemperatureValue( TEMPSENSORS_CONDUCTIVITY_SENSOR_1 );
         F32 TD2Temp = getTemperatureValue( TEMPSENSORS_CONDUCTIVITY_SENSOR_2 );
@@ -1714,8 +1724,13 @@
         deenergizeActuators();
 
         // Check inlet dialysate and redundant outlet temperature sensors
-        F32 TDi = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT ); //TODO change to TDi
+        F32 TDi = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
+#ifdef THD_USING_TRO_CONNECTOR
+        // TRo is connected to THd in V3
+        F32 TRo = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
+#else
         F32 TRo = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
+#endif
 
         // The two sensors must be less than a threshold to decide if mix drain is needed to normal drain
         if ( ( TDi < MIX_DRAIN_TEMPERATURE_THRESHOLD_C ) && ( TRo < MIX_DRAIN_TEMPERATURE_THRESHOLD_C ) )
@@ -1973,7 +1988,12 @@
     HEAT_DISINFECT_STATUS_T status = HEAT_DISINFECT_IN_PROGRESS;
 
     F32 TPoTemp = getTemperatureValue( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
-    F32 ThdTemp = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT ); //TODO change this to actual THd sensor later
+#ifdef THD_USING_TRO_CONNECTOR
+    // THd uses TRo in V3
+    F32 ThdTemp = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
+#else
+    F32 ThdTemp = getTemperatureValue( TEMPSENSORS_HEAT_DISINFECT );
+#endif
 
     BOOL isR1OutOfRange = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) - R1HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
     BOOL isR2OutOfRange = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ) - R2HeatDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;