Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rf5baeac6a5f000705cd51e4779a967acf4088981 -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision f5baeac6a5f000705cd51e4779a967acf4088981)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546)
@@ -99,14 +99,10 @@
     {
         CONDUCTIVITY_DATA_T data;
 
-        data.d17    = getConductivityValue( D17_COND );
-        data.d27    = getConductivityValue( D27_COND );
-        data.d29    = getConductivityValue( D29_COND );
-        data.d43    = getConductivityValue( D43_COND );
-        data.d16    = getConductivityTemperatureValue( D17_COND );
-        data.d28    = getConductivityTemperatureValue( D27_COND );
-        data.d30    = getConductivityTemperatureValue( D29_COND );
-        data.d44    = getConductivityTemperatureValue( D43_COND );
+        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 ) );