Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -re7fe0454b5b2d39009dc784dc8c156856df8bc86 -r313982ccc772f1bbe182877dff7e00381b04e0f4
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision e7fe0454b5b2d39009dc784dc8c156856df8bc86)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 313982ccc772f1bbe182877dff7e00381b04e0f4)
@@ -15,6 +15,7 @@
 *
 ***************************************************************************/
 
+#include "ConductivitySensors.h"
 #include "Messaging.h"
 #include "MessageSupport.h"
 #include "OperationModes.h"
@@ -207,12 +208,16 @@
     {
         TEMPERATURE_SENSORS_DATA_T data;
 
-        data.inletHeatExchanger        = getTemperatureValue( TEMPSENSORS_INLET_HEAT_EXCHANGER );
-        data.outletHeatExchanger       = getTemperatureValue( TEMPSENSORS_OUTLET_HEAT_EXCHANGER );
-        data.hydraulicsPrimaryHeater   = getTemperatureValue( TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER );
-        data.trimmerHeater             = getTemperatureValue( TEMPSENSORS_TRIMMER_HEATER );
-        data.boardTemp                 = getTemperatureValue( TEMPSENSORS_BOARD_TEMPERATURE );
-        data.baroTempSensor            = getTemperatureValue( TEMPSENSORS_BAROMETRIC_TEMP_SENSOR );
+        data.d1Temp         = getTemperatureValue( D1_TEMP );
+        data.x6Temp         = getTemperatureValue( X6_TEMP );
+        data.d4Temp         = getTemperatureValue( D4_TEMP );
+        data.d50Temp        = getTemperatureValue( D50_TEMP );
+        data.boardTemp      = getTemperatureValue( BRD_TEMP );
+        data.baroTemp       = getTemperatureValue( BARO_TEMP );
+        data.d16CondTemp    = getConductivityTemperatureValue( D17_COND );
+        data.d28CondTemp    = getConductivityTemperatureValue( D27_COND );
+        data.d30CondTemp    = getConductivityTemperatureValue( D29_COND );
+        data.d44CondTemp    = getConductivityTemperatureValue( D43_COND );
 
         broadcastData( MSG_ID_DD_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
         dataPublicationTimerCounter = 0;