Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rf51de022edf387de51d76b3cf8811330550f7a9a -r5a8975c128babcb114a8a7a2ff52be2ae0dd15c4
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision f51de022edf387de51d76b3cf8811330550f7a9a)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 5a8975c128babcb114a8a7a2ff52be2ae0dd15c4)
@@ -7,8 +7,8 @@
 *
 * @file    Conductivity.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      28-May-2026
+* @author  (last)      Michael Garthwaite
+* @date    (last)      04-Jun-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  13-Sep-2024
@@ -87,8 +87,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 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 **********
 
@@ -113,23 +111,20 @@
     initConductivityTeensy();
     initConductivitySensors();
 
-    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;
-    condtempDataCollectionTimeInterval          = COND_SENSOR_UPDATE_INTERVAL;
-    condtempSampleIntervalCounter               = 0;
+    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;
 
     memset( &roRRSamples, 0, sizeof( roRRSamples ) );
 
@@ -264,7 +259,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 )
             {
@@ -352,7 +347,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 )
             {
@@ -778,7 +773,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 )
@@ -815,7 +810,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 )