Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -re7fe0454b5b2d39009dc784dc8c156856df8bc86 -r313982ccc772f1bbe182877dff7e00381b04e0f4
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision e7fe0454b5b2d39009dc784dc8c156856df8bc86)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 313982ccc772f1bbe182877dff7e00381b04e0f4)
@@ -99,14 +99,10 @@
     {
         CONDUCTIVITY_DATA_T data;
 
-        data.cd1    = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
-        data.cd2    = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
-        data.cd3    = getConductivityValue( CONDUCTIVITYSENSORS_CD3_SENSOR );
-        data.cd4    = getConductivityValue( CONDUCTIVITYSENSORS_CD4_SENSOR );
-        data.td1    = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
-        data.td2    = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
-        data.td3    = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD3_SENSOR );
-        data.td4    = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD4_SENSOR );
+        data.d17Cond        = getConductivityValue( D17_COND );
+        data.d27Cond        = getConductivityValue( D27_COND );
+        data.d29Cond        = getConductivityValue( D29_COND );
+        data.d43Cond        = getConductivityValue( D43_COND );
         conductivityPublishTimerCounter        = 0;
 
         broadcastData( MSG_ID_DD_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_DATA_T ) );