Index: firmware/App/Controllers/TemperatureSensors.h
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -re6f5aad1bade9b8b547bf78110bc360d94d8c7d5
--- firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision e6f5aad1bade9b8b547bf78110bc360d94d8c7d5)
@@ -18,7 +18,7 @@
 #ifndef __TEMPERATURESENSORS_H__
 #define __TEMPERATURESENSORS_H__
 
-#include "Common.h"
+#include "DGCommon.h"
 
 /**
  *  @defgroup TemperatureSensors TemperatureSensors
@@ -29,36 +29,43 @@
  *  @{
  */
 
-/// Sensors name
+// ********** public definitions **********
+
+/// Enumeration of temperature sensors
 typedef enum SENSORS_NAME
 {
-    TEMPSENSORS_INLET_PRIMARY_HEATER_TEMP_SENSOR = 0,       ///< Inlet primary heaters temperature sensor
-    TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR,          ///< Outlet primary heaters temperature sensor
-    TEMPSENSORS_CONDUCTIVITY_SENSOR_1_TEMP_SENSOR,          ///< Conductivity sensor 1 temperature sensor
-    TEMPSENSORS_CONDUCTIVITY_SENSOR_2_TEMP_SENSOR,          ///< Conductivity sensor 2 temperature sensor
-    TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR,              ///< Outlet redundancy temperature sensor
-    TEMPSENSORS_INLET_DIALYSATE_TEMP_SENSOR,                ///< Inlet dialysate temperature sensor
-    TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE_TEMP_SENSOR,   ///< Primary heaters internal temperature sensor
-    TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE_TEMP_SENSOR,   ///< Trimmer heater internal temperature sensor
-    TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION_TEMP_SENSOR,   ///< Primary heaters cold junction temperature sensor
-    TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION_TEMP_SENSOR,   ///< Trimmer heater cold junction temperature sensor
-    TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP,               ///< Primary heaters internal temperature
-    TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP,               ///< Trimmer heater internal temperature
-    NUM_OF_TEMPERATURE_SENSORS                              ///< Number of temperature sensors
+    TEMPSENSORS_INLET_PRIMARY_HEATER = 0,       ///< Inlet primary heaters temperature sensor
+    TEMPSENSORS_OUTLET_PRIMARY_HEATER,          ///< Outlet primary heaters temperature sensor
+    TEMPSENSORS_CONDUCTIVITY_SENSOR_1,          ///< Conductivity sensor 1 temperature sensor
+    TEMPSENSORS_CONDUCTIVITY_SENSOR_2,          ///< Conductivity sensor 2 temperature sensor
+    TEMPSENSORS_OUTLET_REDUNDANCY,              ///< Outlet redundancy temperature sensor
+    TEMPSENSORS_INLET_DIALYSATE,                ///< Inlet dialysate temperature sensor
+    TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE,   ///< Primary heaters internal temperature sensor
+    TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE,   ///< Trimmer heater internal temperature sensor
+    TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION,   ///< Primary heaters cold junction temperature sensor
+    TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION,   ///< Trimmer heater cold junction temperature sensor
+    TEMPSENSORS_PRIMARY_HEATER_INTERNAL,        ///< Primary heaters internal temperature
+    TEMPSENSORS_TRIMMER_HEATER_INTERNAL,        ///< Trimmer heater internal temperature
+    NUM_OF_TEMPERATURE_SENSORS                  ///< Number of temperature sensors
 } TEMPERATURE_SENSORS_T;
 
+// ********** public function prototypes **********
+
 void initTemperatureSensors ( void );
 
 SELF_TEST_STATUS_T execTemperatureSensorsSelfTest ( void );
 
 void execTemperatureSensors ( void );
+void checkInletWaterTemperature( void );
 
-DATA_ARRAY_GET_PROTOTYPE ( F32, getTemperatureValue, sensor );
+DATA_ARRAY_GET_PROTOTYPE ( F32, getTemperatureValue, sensorIndex );
 
-BOOL testSetMeasuredTemperatureOverride ( U32 sensor, F32 temperature );
-BOOL testResetMeasuredTemperatureOverride ( U32 sensor );
+BOOL testSetMeasuredTemperatureOverride ( U32 sensorIndex, F32 temperature );
+BOOL testResetMeasuredTemperatureOverride ( U32 sensorIndex );
 
 BOOL testSetTemperatureSensorsPublishIntervalOverride ( U32 value );
 BOOL testResetTemperatureSensorsPublishIntervalOverride ( void );
 
+/**@}*/
+
 #endif