Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -ra03a5119712cea509ec345bd4f650ffcdb9a9438 -rb085a36e252a01504b415bf145e4b1fc129cdcdf
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision a03a5119712cea509ec345bd4f650ffcdb9a9438)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision b085a36e252a01504b415bf145e4b1fc129cdcdf)
@@ -35,8 +35,8 @@
 #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           ( 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.
@@ -84,10 +84,6 @@
 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 **********
 
@@ -126,8 +122,6 @@
     roRRAvg.ovInitData                = 0.0F;
     roRRAvg.override                  = OVERRIDE_RESET;
     roRRSampleIntervalCounter         = 0;
-    condtempDataCollectionTimeInterval= COND_SENSOR_UPDATE_INTERVAL;
-    condtempSampleIntervalCounter     = 0;
 
     memset( &roRRSamples, 0, sizeof( roRRSamples ) );
 
@@ -256,7 +250,7 @@
 
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
         {
             if ( sensor != D74_COND )
             {
@@ -344,7 +338,7 @@
 
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
         {
             if ( sensor != D74_COND )
             {
@@ -743,7 +737,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
     {
 
         if ( payload.index != D74_COND )
@@ -780,7 +774,7 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
     {
 
         if ( payload.index != D74_COND )