Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r59b7b1cd099ab5a5e943fb5307aec264cbadb51a -r965a35a61959999274bbff47c74e439639d32b1d
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 59b7b1cd099ab5a5e943fb5307aec264cbadb51a)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 965a35a61959999274bbff47c74e439639d32b1d)
@@ -96,11 +96,11 @@
 #define BARO_SENSOR_REFERENCE_TEMP_C                            2000                                            ///< Barometric sensor reference temperature in C.
 #define BARO_SENSOR_WAIT_FOR_COEFF_TIME_OUT_MS                  ( 20 * MS_PER_SECOND )                          ///< Barometric sensor wait for coefficients timeout in milliseconds.
 
-#define TDI_TRO_TEMP_SENSORS_MAX_DEVIATION_C                    2.0F                                            ///< Dialysate temperature sensors maximum allowed deviation in C.
+#define TDI_TRO_TEMP_SENSORS_MAX_DEVIATION_C                    3.0F                                            ///< Dialysate temperature sensors maximum allowed deviation in C.
 #define DIALYSATE_TEMP_SNSRS_OUT_OF_RANGE_TIMEOUT_MS            ( 10 * MS_PER_SECOND )                          ///< Dialysate temperature sensors drift timeout in milliseconds.
 #define TDI_TRO_TEMP_SENSORS_MAX_DEVIATION_IN_HEAT_DIS_C        5.0F                                            ///< Dialysate temperature sensors maximum allowed deviation in heat disinfect in C.
 #define DIAL_TEMP_MOVING_AVG_NUM_OF_SAMPLES                     30                                              ///< Dialysate temperature sensors moving average number of samples.
-#define TDI_TRO_DATA_COLLECTION_TIMEOUT_MS                      ( 1 * MS_PER_SECOND )                           ///< Dialysate temperature sensors data collection timeout in milliseconds.
+#define TDI_TRO_DATA_COLLECTION_TIME_MS                      ( 1 * MS_PER_SECOND )                              ///< Dialysate temperature sensors data collection time in milliseconds.
 
 /// Temperature sensor exec states.
 typedef enum tempSensors_Exec_States
@@ -113,8 +113,8 @@
 /// Dialysate temperature sensors enums
 typedef enum Dial_Temps_Sensors
 {
-    DIAL_TEMP_FIRST = 0,                                                                                        ///< Dialysate temperature first.
-    DIAL_TEMP_TRO = DIAL_TEMP_FIRST,                                                                            ///< Dialysate temperature TRo.
+    DIAL_TEMP_TRO = 0,
+    DIAL_TEMP_FIRST = DIAL_TEMP_TRO,                                                                            ///< Dialysate temperature first.
     DIAL_TEMP_TDI,                                                                                              ///< Dialysate temperature TDi.
     NUM_OF_DIAL_TEMPS                                                                                           ///< Number of Dialysate temperature sensors.
 } DIAL_TEMPERATURE_SENSORS_T;
@@ -1139,7 +1139,7 @@
             dialTempMovingAvgData[ i ].dialTempDataColStartTimeMS = getMSTimerCount();
             dialTempMovingAvgData[ i ].dialTempColHasTimerBeenSet = TRUE;
         }
-        else if ( TRUE == didTimeout( dialTempMovingAvgData[ i ].dialTempDataColStartTimeMS, TDI_TRO_DATA_COLLECTION_TIMEOUT_MS ) )
+        else if ( TRUE == didTimeout( dialTempMovingAvgData[ i ].dialTempDataColStartTimeMS, TDI_TRO_DATA_COLLECTION_TIME_MS ) )
         {
             TEMPERATURE_SENSORS_T sensor = ( DIAL_TEMP_TDI == i ? TEMPSENSORS_INLET_DIALYSATE : TEMPSENSORS_OUTLET_REDUNDANT );
             F32 temperatureC             = getTemperatureValue( sensor );