Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rf8a9855f80d7f8f10a4e2468d18ee825ef8a5e72 -re6de057461dd170e037e94f55d8e4b1c5a4b6db5
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision f8a9855f80d7f8f10a4e2468d18ee825ef8a5e72)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision e6de057461dd170e037e94f55d8e4b1c5a4b6db5)
@@ -36,7 +36,7 @@
 #define COND_SENSOR_UPDATE_INTERVAL             ( 700 / TASK_PRIORITY_INTERVAL )                                        ///< Time in task intervals for new sensor data
 #define DATA_PUBLISH_COUNTER_START_COUNT        40                                                                      ///< Data publish counter start count.
 #define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 30 )                                                                 ///< Filter conductivity data for given time
-#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 30 )                                                                  ///< Filter conductivity temperature data for given time
+#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 30 )                                                                 ///< Filter conductivity temperature data for given time
 #define SIZE_OF_COND_ROLLING_AVG                ( CONDUCTIVITY_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )              ///< Filtered conductivity moving average sample count.
 #define SIZE_OF_COND_TEMP_ROLLING_AVG           ( CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )         ///< Filtered conductivity temprature moving average sample count.
 #define RO_RR_MOVING_AVG_NUM_OF_SAMPLES         30                                                                      ///< RO rejection ratio moving average number of samples.
@@ -125,8 +125,9 @@
     roRRAvg.override                  = OVERRIDE_RESET;
     roRRSampleIntervalCounter         = 0;
     condtempDataCollectionTimeInterval= COND_SENSOR_UPDATE_INTERVAL;
-    //condDataCollectionTimeInterval    = COND_SENSOR_UPDATE_INTERVAL;
     condtempSampleIntervalCounter     = 0;
+    condDataCollectionTimeInterval    = COND_SENSOR_UPDATE_INTERVAL;
+    condSampleIntervalCounter         = 0;
 
     memset( &roRRSamples, 0, sizeof( roRRSamples ) );
 
@@ -488,10 +489,8 @@
         data.d17Cond        = getFilteredConductivity( D17_COND );
         data.d27Cond        = getFilteredConductivity( D27_COND );
         data.d29Cond        = getConductivity( D17_COND );
-        data.d43Cond        = getConductivity( D27_COND );
-       // data.d29Cond        = getFilteredConductivity( D29_COND );
-       // data.d43Cond        = getFilteredConductivity( D43_COND );
-        data.d74Cond        = getFilteredConductivity( D74_COND );
+        data.d43Cond        = getFilteredConductivity( D43_COND );
+        data.d74Cond        = getConductivity( D27_COND );
         ddConductivityPublishTimerCounter        = 0;
 
         broadcastData( MSG_ID_DD_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( DD_CONDUCTIVITY_DATA_T ) );
@@ -502,7 +501,7 @@
     {
         FP_CONDUCTIVITY_DATA_T data;
 
-        data.p9Conductivity     = getFilteredConductivity( P9_COND );
+        data.p9Conductivity     = getConductivity( D43_COND );
         data.p18Conductivity    = getFilteredConductivity( P18_COND );
         fpConductivityPublishTimerCounter = 0;