Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rf47296145b6a0adb78df0e325587629171909fd6 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision f47296145b6a0adb78df0e325587629171909fd6)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602)
@@ -105,10 +105,8 @@
     {
         CONDUCTIVITY_DATA_T data;
 
-        data.CPiConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
-        data.CPoConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
-        data.CPiTemperature  = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
-        data.CPoTemperature  = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
+        data.p9Conductivity = getConductivityValue( P9_COND );
+        data.p18Conductivity = getConductivityValue( P18_COND );
         conductivityPublishTimerCounter = 0;
 
         broadcastData( MSG_ID_RO_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_DATA_T ) );