Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rfd897db8177752330ad08d877e0a13620513dbdc -ra6109e69046323d34c8d92e590a07d8d4a71eb91
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision fd897db8177752330ad08d877e0a13620513dbdc)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision a6109e69046323d34c8d92e590a07d8d4a71eb91)
@@ -256,26 +256,27 @@
 
     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 )
+            // Check FPGA read counts for freshness rather than wait on fix time.
+            if ( condPrevReadCount[ sensor ] != getConductivityReadCount( sensor ) )
             {
-                calculatedConductivity = getTeensyConductivityValue( sensor );
-                freshData = TRUE;
-            }
-            else
-            {
                 calculatedConductivity = getConductivity( sensor );
+                condPrevReadCount[ sensor ] = getConductivityReadCount( sensor );
                 freshData = TRUE;
             }
         }
+
         else
         {
-            // Check FPGA read counts for freshness rather than wait on fix time.
-            if ( condPrevReadCount[ sensor ] != getConductivityReadCount( sensor ) )
+            if ( sensor != D74_COND )
             {
+                calculatedConductivity = getTeensyConductivityValue( sensor );
+                freshData = TRUE;
+            }
+            else
+            {
                 calculatedConductivity = getConductivity( sensor );
-                condPrevReadCount[ sensor ] = getConductivityReadCount( sensor );
                 freshData = TRUE;
             }
         }
@@ -343,26 +344,26 @@
 
     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 )
+            // Check FPGA read counts for freshness rather than wait on fix time.
+            if ( condTempPrevReadCount[ sensor ] != getConductivityTemperatureReadCount( sensor ) )
             {
-                calculatedTemperature = getTeensyConductivityTemperatureValue( sensor );
-                freshData = TRUE;
-            }
-            else
-            {
                 calculatedTemperature = getConductivityTemperature( sensor );
+                condTempPrevReadCount[ sensor ] = getConductivityTemperatureReadCount( sensor );
                 freshData = TRUE;
             }
         }
         else
         {
-            // Check FPGA read counts for freshness rather than wait on fix time.
-            if ( condTempPrevReadCount[ sensor ] != getConductivityTemperatureReadCount( sensor ) )
+            if ( sensor != D74_COND )
             {
+                calculatedTemperature = getTeensyConductivityTemperatureValue( sensor );
+                freshData = TRUE;
+            }
+            else
+            {
                 calculatedTemperature = getConductivityTemperature( sensor );
-                condTempPrevReadCount[ sensor ] = getConductivityTemperatureReadCount( sensor );
                 freshData = TRUE;
             }
         }
@@ -741,8 +742,12 @@
     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 )
     {
+        result = testConductivitySensorConductivityReadingsOverride( message );
+    }
+    else
+    {
 
         if ( payload.index != D74_COND )
         {
@@ -753,10 +758,6 @@
             result = testConductivitySensorReadingsOverride( message );
         }
     }
-    else
-    {
-        result = testConductivitySensorConductivityReadingsOverride( message );
-    }
 
     return result;
 }
@@ -778,8 +779,12 @@
     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 )
     {
+        result = testConductivitySensorTemperatureReadingsOverride( message );
+    }
+    else
+    {
 
         if ( payload.index != D74_COND )
         {
@@ -790,10 +795,6 @@
             result = testConductivitySensorTemperatureReadingsOverride( message );
         }
     }
-    else
-    {
-        result = testConductivitySensorTemperatureReadingsOverride( message );
-    }
 
     return result;
 }