Index: firmware/App/Drivers/TemperatureSensor.h
===================================================================
diff -u -r8d272582cbd2cb5fc0c6af0fead2867ce02658b0 -r41c4d109b7bc172d93ae1f4e4b20acaf96547807
--- firmware/App/Drivers/TemperatureSensor.h	(.../TemperatureSensor.h)	(revision 8d272582cbd2cb5fc0c6af0fead2867ce02658b0)
+++ firmware/App/Drivers/TemperatureSensor.h	(.../TemperatureSensor.h)	(revision 41c4d109b7bc172d93ae1f4e4b20acaf96547807)
@@ -35,12 +35,10 @@
 /// Enumeration of temperature sensors.
 typedef enum TemperatureSensors
 {
-    P23_TEMP = 0,                                               ///< Tank temperature sensor at hottest point.
-    TEMP_SENSOR_FIRST = P23_TEMP,                               ///< First temp sensor.
-    P22_TEMP,                                                   ///< Pre-tank temperature sensor at coldest point.
-    P10_TEMP,                                                   ///< Inlet conductivity sensor temperature.
+
+    P10_TEMP = 0,                                               ///< Inlet conductivity sensor temperature.
+    TEMP_SENSOR_FIRST = P10_TEMP,                               ///< First temp sensor.
     P19_TEMP,                                                   ///< Outlet conductivity sensor temperature.
-    M4_TEMP,
     NUM_OF_TEMPERATURE_SENSORS                                  ///< Number of temperature sensors
 } TEMPERATURE_SENSOR_T;
 
Index: firmware/App/Monitors/Pressure.h
===================================================================
diff -u -r311c75cc5ac41b4b9ca4983df84e43af910f9be4 -r41c4d109b7bc172d93ae1f4e4b20acaf96547807
--- firmware/App/Monitors/Pressure.h	(.../Pressure.h)	(revision 311c75cc5ac41b4b9ca4983df84e43af910f9be4)
+++ firmware/App/Monitors/Pressure.h	(.../Pressure.h)	(revision 41c4d109b7bc172d93ae1f4e4b20acaf96547807)
@@ -44,15 +44,6 @@
     F32 x2Pressure;                                             ///< Pressure RO Concentrate
     F32 x3Pressure;                                             ///< Pressure RO Concentrate drop
     F32 x4Pressure;                                             ///< Pressure drain drop
-    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
 } PRESSURE_TEMP_DATA_T;
 
 // ********** public function prototypes **********
Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -r8d272582cbd2cb5fc0c6af0fead2867ce02658b0 -r41c4d109b7bc172d93ae1f4e4b20acaf96547807
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 8d272582cbd2cb5fc0c6af0fead2867ce02658b0)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 41c4d109b7bc172d93ae1f4e4b20acaf96547807)
@@ -24,6 +24,7 @@
 #include "ModePreGenPermeateDefeatured.h"
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
+#include "PressureSensor.h"
 #include "Temperature.h"
 #include "Timers.h"
 #include "TaskPriority.h"
@@ -355,11 +356,17 @@
     {
         TEMPERATURE_SENSORS_DATA_T data;
 
-        data.p23Temp   = getTemperatureValue( P23_TEMP );
-        data.p23Temp   = getTemperatureValue( P22_TEMP );
-        data.p10Temp   = getTemperatureValue( P10_TEMP );
-        data.p19Temp   = getTemperatureValue( P19_TEMP );
-        data.boardTemp = 0.0F; // TODO
+        data.p10Temp = getTemperatureValue( P10_TEMP );
+        data.p19Temp = getTemperatureValue( P19_TEMP );
+        data.m1Temp = getPressureSensorTemperature( M1_PRES );
+        data.m3Temp = getPressureSensorTemperature( M3_PRES );
+        data.p8Temp = getPressureSensorTemperature( P8_PRES );
+        data.p13Temp = getPressureSensorTemperature( P13_PRES );
+        data.p17Temp = getPressureSensorTemperature( P17_PRES );
+        data.x1Temp = getPressureSensorTemperature( X1_PRES );
+        data.x2Temp = getPressureSensorTemperature( X2_PRES );
+        data.x3Temp = getPressureSensorTemperature( X3_PRES );
+        data.x4Temp = getPressureSensorTemperature( X4_PRES );
 
         broadcastData( MSG_ID_FP_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
         dataPublicationTimerCounter = 0;
Index: firmware/App/Monitors/Temperature.h
===================================================================
diff -u -r99498a5bab0a1f4c706376feceadc66df6d1c22e -r41c4d109b7bc172d93ae1f4e4b20acaf96547807
--- firmware/App/Monitors/Temperature.h	(.../Temperature.h)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
+++ firmware/App/Monitors/Temperature.h	(.../Temperature.h)	(revision 41c4d109b7bc172d93ae1f4e4b20acaf96547807)
@@ -35,11 +35,17 @@
 /// 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
 } TEMPERATURE_SENSORS_DATA_T;
 
 // ********** public function prototypes **********
Index: firmware/App/Services/FpgaFP.c
===================================================================
diff -u -r410afd26b3ae5e372310c696c82f58c59235e10d -r41c4d109b7bc172d93ae1f4e4b20acaf96547807
--- firmware/App/Services/FpgaFP.c	(.../FpgaFP.c)	(revision 410afd26b3ae5e372310c696c82f58c59235e10d)
+++ firmware/App/Services/FpgaFP.c	(.../FpgaFP.c)	(revision 41c4d109b7bc172d93ae1f4e4b20acaf96547807)
@@ -849,7 +849,7 @@
 
 /*********************************************************************//**
  * @brief
- * The getFPGAP23Temperature function gets the TRO1 temperature sensor reading.
+ * The getFPGAP23Temperature function gets the P23 temperature sensor reading.
  * @details \b Inputs: fpgaSensorReadings.tempP23
  * @details \b Outputs: none
  * @return P23 temperature sensor reading
@@ -861,7 +861,7 @@
 
 /*********************************************************************//**
  * @brief
- * The getFPGAP22Temperature function gets the TRO2 temperature sensor reading.
+ * The getFPGAP22Temperature function gets the P22 temperature sensor reading.
  * @details \b Inputs: fpgaSensorReadings.tempP22
  * @details \b Outputs: none
  * @return P22 temperature sensor reading