Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r46a42611591cb92eef5f20c8d39964d406c5c8cc -rd5c94536929ded738e5c8d139d8c46b1d3e035ef
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 46a42611591cb92eef5f20c8d39964d406c5c8cc)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision d5c94536929ded738e5c8d139d8c46b1d3e035ef)
@@ -33,19 +33,20 @@
 // ********** private definitions **********
 
 #define COND_SENSOR_REPORT_PERIOD               ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )                              ///< Broadcast conductivity values message every second.
+#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           ( 500 )                                                                 ///< Filter conductivity data for given time
-#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 500 )                                                                 ///< Filter conductivity temperature data for given time
-#define SIZE_OF_FLOW_ROLLING_AVG                ( CONDUCTIVITY_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )              ///< Filtered conductivity moving average sample count.
-#define SIZE_OF_FLOW_TEMP_ROLLING_AVG           ( CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )         ///< Filtered conductivity temprature moving average sample 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 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.
 #define FRACTION_TO_PERCENT_CONVERSION_FACTOR   100.0F                                                                  ///< RO rejection ratio factor to percentage conversion factor value
 #define RO_RR_SAMPLE_COLLECTION_INTERVAL        10                                                                      ///< Collect RO rejection ratio sample for every 10th time in priority task
 
 /// Filter conductivity readings record.
 typedef struct
 {
-    F32 conductivityReadings[ SIZE_OF_FLOW_ROLLING_AVG ];                                                               ///< Holds conductivity sample rolling average.
+    F32 conductivityReadings[ SIZE_OF_COND_ROLLING_AVG ];                                                               ///< Holds conductivity sample rolling average.
     U32 conductivityReadingsIdx;                                                                                        ///< Index for next sample in rolling average array.
     F32 conductivityReadingsTotal;                                                                                      ///< Rolling total - used to calc average.
     U32 conductivityReadingsCount;                                                                                      ///< Number of samples in rolling average buffer
@@ -54,7 +55,7 @@
 /// Filter conductivity sensor temperature readings record.
 typedef struct
 {
-    F32 conductivityTempReadings[ SIZE_OF_FLOW_ROLLING_AVG ];                                                           ///< Holds conductivity sample rolling average.
+    F32 conductivityTempReadings[ SIZE_OF_COND_TEMP_ROLLING_AVG ];                                                      ///< Holds conductivity sample rolling average.
     U32 conductivityTempReadingsIdx;                                                                                    ///< Index for next sample in rolling average array.
     F32 conductivityTempReadingsTotal;                                                                                  ///< Rolling total - used to calc average.
     U32 conductivityTempReadingsCount;                                                                                  ///< Number of samples in rolling average buffer
@@ -81,6 +82,10 @@
 static U32 roRRCount;                                                                                                   ///< RO rejection ratio Number of samples in average buffer.
 static F32 roRRTankFillAvg;                                                                                             ///< Average RO rejection ratio during permeate tank fill state.
 static U32 roRRSampleIntervalCounter;                                                                                   ///< RO rejection ratio sample collection timer counter.
+static U32 condtempDataCollectionTimeInterval;                                                                          ///< Conductivity Temperature data collection time interval in task counts.
+static U32 condtempSampleIntervalCounter;                                                                               ///< Conductivity Temperature sensor sample collection timer counter.
+static U32 condDataCollectionTimeInterval;                                                                              ///< Conductivity data collection time interval in task counts.
+static U32 condSampleIntervalCounter;                                                                                   ///< Conductivity sensor sample collection timer counter.
 
 // ********** private function prototypes **********
 
@@ -122,6 +127,8 @@
     roRRAvg.ovInitData                = 0.0F;
     roRRAvg.override                  = OVERRIDE_RESET;
     roRRSampleIntervalCounter         = 0;
+    condtempDataCollectionTimeInterval= COND_SENSOR_UPDATE_INTERVAL;
+    condtempSampleIntervalCounter     = 0;
 
     memset( &roRRSamples, 0, sizeof( roRRSamples ) );
 
@@ -329,7 +336,6 @@
 
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-
 #ifdef __TEENSY_CONDUCTIVITY_DRIVER__
         if (sensor != D74_COND )
         {
@@ -342,6 +348,7 @@
 #else
         rawTemp = getConductivityTemperatureValue( sensor );
 #endif
+
         // TODO - calibrate
 
         if ( filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsCount >= SIZE_OF_FLOW_ROLLING_AVG )
@@ -488,8 +495,10 @@
 
         data.d17Cond        = getFilteredConductivity( D17_COND );
         data.d27Cond        = getFilteredConductivity( D27_COND );
-        data.d29Cond        = getFilteredConductivity( D29_COND );
-        data.d43Cond        = getFilteredConductivity( D43_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 );
         ddConductivityPublishTimerCounter        = 0;