Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r5a8975c128babcb114a8a7a2ff52be2ae0dd15c4 -r35ccc443e6440d79231ab4a3951bebc0e9789b68
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 5a8975c128babcb114a8a7a2ff52be2ae0dd15c4)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 35ccc443e6440d79231ab4a3951bebc0e9789b68)
@@ -38,8 +38,8 @@
 #define FP_CONDUCTIVITY_DATA_PUBLISH_COUNTER_START_COUNT    41                                                          ///< Data publish counter start count.
 #define RO_DATA_PUBLISH_COUNTER_START_COUNT                 42                                                          ///< Data publish counter start count.
 #define RESISTANCE_DATA_PUBLISH_COUNTER_START_COUNT         43                                                          ///< Data publish counter start count.
-#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 50 )                                                                  ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
-#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 50 )                                                                  ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
+#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 30 )                                                                  ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
+#define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 30 )                                                                  ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
 #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.
@@ -87,6 +87,8 @@
 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 conductivityResistancePublishTimerCounter;                                                                   ///< DD and FP Conductivity data publication counter.
+static OVERRIDE_U32_T conductivityResistanceDataPublishInterval;                                                        ///< DD and FP Conductivity sensors publish time interval override.
 
 // ********** private function prototypes **********
 
@@ -111,20 +113,21 @@
     initConductivityTeensy();
     initConductivitySensors();
 
-    ddConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
-    fpConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
-    roRRPublishTimerCounter           = DATA_PUBLISH_COUNTER_START_COUNT;
-    roRejectionRatio                  = 0.0F;
-    roRejectionRatioTankFill          = 0.0F;
-    roRRRunningSum                    = 0.0F;
-    roRRSamplesNextIndex              = 0;
-    roRRCount                         = 0;
-    roRRTankFillAvg                   = 0.0F;
-    roRRAvg.data                      = 0.0F;
-    roRRAvg.ovData                    = 0.0F;
-    roRRAvg.ovInitData                = 0.0F;
-    roRRAvg.override                  = OVERRIDE_RESET;
-    roRRSampleIntervalCounter         = 0;
+    ddConductivityPublishTimerCounter           = DD_CONDUCTIVITY_DATA_PUBLISH_COUNTER_START_COUNT;
+    fpConductivityPublishTimerCounter           = FP_CONDUCTIVITY_DATA_PUBLISH_COUNTER_START_COUNT;
+    roRRPublishTimerCounter                     = RO_DATA_PUBLISH_COUNTER_START_COUNT;
+    conductivityResistancePublishTimerCounter   = RESISTANCE_DATA_PUBLISH_COUNTER_START_COUNT;
+    roRejectionRatio                            = 0.0F;
+    roRejectionRatioTankFill                    = 0.0F;
+    roRRRunningSum                              = 0.0F;
+    roRRSamplesNextIndex                        = 0;
+    roRRCount                                   = 0;
+    roRRTankFillAvg                             = 0.0F;
+    roRRAvg.data                                = 0.0F;
+    roRRAvg.ovData                              = 0.0F;
+    roRRAvg.ovInitData                          = 0.0F;
+    roRRAvg.override                            = OVERRIDE_RESET;
+    roRRSampleIntervalCounter                   = 0;
 
     memset( &roRRSamples, 0, sizeof( roRRSamples ) );
 
@@ -556,7 +559,7 @@
         broadcastData( MSG_ID_FP_RO_REJECTION_RATIO_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( RO_REJECTION_RATIO_DATA_T ) );
     }
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
     {
         // publish conductivity resistance data on interval
         if ( ++conductivityResistancePublishTimerCounter >= getU32OverrideValue( &conductivityResistanceDataPublishInterval ) )