Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r669f865b7bf28ea3f3aaf249c6555715aa80ee29 -r8f59899872dd14f91e1cf07c1c51f24335287ad6
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 669f865b7bf28ea3f3aaf249c6555715aa80ee29)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 8f59899872dd14f91e1cf07c1c51f24335287ad6)
@@ -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 **********
 
@@ -126,8 +128,6 @@
     roRRAvg.ovInitData                          = 0.0F;
     roRRAvg.override                            = OVERRIDE_RESET;
     roRRSampleIntervalCounter                   = 0;
-    condtempDataCollectionTimeInterval          = COND_SENSOR_UPDATE_INTERVAL;
-    condtempSampleIntervalCounter               = 0;
 
     memset( &roRRSamples, 0, sizeof( roRRSamples ) );
 
@@ -559,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 ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
     {
         // publish conductivity resistance data on interval
         if ( ++conductivityResistancePublishTimerCounter >= getU32OverrideValue( &conductivityResistanceDataPublishInterval ) )