Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rfd897db8177752330ad08d877e0a13620513dbdc -rf4a7ca238b4d8fa7ee756ec4dc813c3d0ffa7f84
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision fd897db8177752330ad08d877e0a13620513dbdc)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision f4a7ca238b4d8fa7ee756ec4dc813c3d0ffa7f84)
@@ -7,8 +7,8 @@
 *
 * @file    Conductivity.c
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      16-Apr-2026
+* @author  (last)      Vinayakam Mani
+* @date    (last)      28-May-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  13-Sep-2024
@@ -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 )
             {
@@ -283,6 +277,7 @@
         // Apply sample to filter if we know it's fresh, v2/v3 only. V1's will always update filter regardless of freshness.
         if ( TRUE == freshData )
         {
+            freshData = FALSE;
             // TODO - calibrate
             if ( filteredConductivityReadings[ sensor ].conductivityReadingsCount >= SIZE_OF_COND_ROLLING_AVG )
             {
@@ -343,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 )
             {
@@ -370,6 +365,7 @@
         // Apply sample to filter if we know it's fresh, v2/v3 only. V1's will always update filter regardless of freshness.
         if ( TRUE == freshData )
         {
+            freshData = FALSE;
             // TODO - calibrate
             if ( filteredConductivityTemperatureReadings[sensor].conductivityTempReadingsCount >= SIZE_OF_COND_TEMP_ROLLING_AVG )
             {
@@ -741,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 )
@@ -778,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 )