Index: firmware/App/Monitors/Temperature.h
===================================================================
diff -u -r99498a5bab0a1f4c706376feceadc66df6d1c22e -r2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff
--- firmware/App/Monitors/Temperature.h	(.../Temperature.h)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
+++ firmware/App/Monitors/Temperature.h	(.../Temperature.h)	(revision 2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff)
@@ -19,12 +19,11 @@
 #define __TEMPERATURE_H__
 
 #include "FPCommon.h"
-#include "TemperatureSensor.h"
 
 /**
  *  @defgroup Temperature Temperature
  *  @brief Temperature Monitor unit. monitors the temperature sensors
- *  for the RO sub-system.
+ *  for the FP sub-system.
  *
  *  @addtogroup Temperature
  *  @{
@@ -35,18 +34,25 @@
 /// Temperature sensors data structure.
 typedef struct
 {
-    F32 p23Temp;                    ///< P23 temperature sensor.
-    F32 p22Temp;                    ///< P22 temperature sensor.
     F32 p10Temp;                    ///< P10 temperature from inlet conductivity sensor.
     F32 p19Temp;                    ///< P19 temperature from outlet conductivity sensor.
-    F32 boardTemp;                  ///< Board temperature sensor
+    F32 m1Temp;                     ///< Temperature before pressure regulator (M1)
+    F32 m3Temp;                     ///< Temperature after pressure regulator (M3)
+    F32 p8Temp;                     ///< Temperature before inlet conductivity sensor (P8)
+    F32 p13Temp;                    ///< Temperature before RO filter (P13)
+    F32 p17Temp;                    ///< Temperature after RO filter (P17)
+    F32 x1Temp;                     ///< Temperature before RO pump (X1)
+    F32 x2Temp;                     ///< Temperature RO Concentrate
+    F32 x3Temp;                     ///< Temperature RO Concentrate drop
+    F32 x4Temp;                     ///< Temperature drain drop
+    F32 p7Temp;                     ///< Temperature RO inlet
+    F32 p16Temp;                    ///< Temperature RO outlet
 } TEMPERATURE_SENSORS_DATA_T;
 
 // ********** public function prototypes **********
 
 void initTemperature( void );
 void execTemperatureSensors( void );
-//SELF_TEST_STATUS_T execTemperatureSensorsSelfTest( void );
 
 BOOL testTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message );