Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r79a50fd7478f2becd4bb79cb9743e34debfe5d62 -r2b0862b34518c0ce835fe5cb5bb3460c8316d269
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 79a50fd7478f2becd4bb79cb9743e34debfe5d62)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 2b0862b34518c0ce835fe5cb5bb3460c8316d269)
@@ -107,11 +107,8 @@
 {
     CONDUCTIVITY_SENSORS_T sensor;
 
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
     initConductivityTeensy();
-#else
     initConductivitySensors();
-#endif
 
     ddConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     fpConductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
@@ -184,19 +181,8 @@
 void execConductivity( void )
 {
     //read conductivity sensors raw value
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
     execConductivityTeensy();
-#else
-    readConductivitySensors();
-#endif
-    //control conductivity sensor
-    // TODO : need more clarity on why and when to execute following control.
-#if 0
-    handleConductivitySensorsReset();
-    handleConductivitySensorsInitProcedure();
-    execConductivitySensorWrite();
-    execConductivitySensorRead();
-#endif
+    execConductivitySensors();
 
     filterConductivitySensors();
     calcRORejectionRatio();     // TODO: should this be called here or inside filter function
@@ -262,7 +248,7 @@
 static void filterConductivitySensorReadings( void )
 {
     CONDUCTIVITY_SENSORS_T sensor;
-    F32 rawCond = 0.0F;
+    F32 calculatedConductivity = 0.0F;
 
     if ( ++condSampleIntervalCounter >= condDataCollectionTimeInterval )
     {
@@ -336,7 +322,7 @@
 static void filterConductivitySensorTemperatureReadings( void )
 {
     CONDUCTIVITY_SENSORS_T sensor;
-    F32 rawTemp = 0.0F;
+    F32 calculatedTemperature = 0.0F;
 
     if ( ++condtempSampleIntervalCounter >= condtempDataCollectionTimeInterval )
     {
@@ -710,4 +696,77 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testConductivitySensorReadingsOverride function overrides the value of the
+ * specified conductivity sensor with a given value and determines which driver
+ * override.
+ * @details \b Inputs: testConfig
+ * @details \b Outputs: none
+ * @param message Override message from Dialin which includes an sensor
+ * ID and override value of the conductivity sensor.
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testConductivitySensorReadingsOverride( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+    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 ( payload.index != D74_COND )
+        {
+            result = testTeensyConductivitySensorReadingsOverride( message );
+        }
+        else
+        {
+            result = testConductivitySensorReadingsOverride( message );
+        }
+    }
+    else
+    {
+        result = testConductivitySensorConductivityReadingsOverride( message );
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testConductivitySensorTemperatureOverride function overrides the value of the
+ * specified conductivity sensor with a given value and determines which driver
+ * override.
+ * @details \b Inputs: testConfig
+ * @details \b Outputs: none
+ * @param message Override message from Dialin which includes an sensor
+ * ID and override value of the conductivity sensor.
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testConductivitySensorTemperatureOverride( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+    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 ( payload.index != D74_COND )
+        {
+            result = testTeensyConductivitySensorTemperatureReadingsOverride( message );
+        }
+        else
+        {
+            result = testConductivitySensorTemperatureReadingsOverride( message );
+        }
+    }
+    else
+    {
+        result = testConductivitySensorTemperatureReadingsOverride( message );
+    }
+
+    return result;
+}
 /**@}*/
Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -ra0775d72daf9fcbb53ad4b8629e9752ba9bf1ae9 -r2b0862b34518c0ce835fe5cb5bb3460c8316d269
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision a0775d72daf9fcbb53ad4b8629e9752ba9bf1ae9)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 2b0862b34518c0ce835fe5cb5bb3460c8316d269)
@@ -16,11 +16,6 @@
 ***************************************************************************/
 
 #include "BalancingChamber.h"
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-#include "ConductivityTeensy.h"
-#else
-#include "ConductivitySensors.h"
-#endif
 #include "Conductivity.h"
 #include "Flow.h"
 #include "Messaging.h"
@@ -379,6 +374,8 @@
 {
     DIAL_TEMPERATURE_SENSORS_T i;
     F32 temperatureC = 0.0F;
+    U32 currentIndex = 0;
+    F32 prevSampleToRemoveC = 0.0f;
 
     for ( i = DIAL_TEMP_FIRST; i < NUM_OF_DIAL_TEMPS; i++ )
     {
@@ -391,22 +388,18 @@
         {
             CONDUCTIVITY_SENSORS_T sensor = ( DIAL_TEMP_D28 == i ? D27_COND : D29_COND );
 
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-
-            if (sensor != D74_COND)
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
             {
                 temperatureC = getTeensyConductivityTemperatureValue( sensor );
             }
             else
             {
-                temperatureC = getConductivityTemperatureValue( sensor );
+                temperatureC = getConductivityTemperature( sensor );
             }
-#else
-            temperatureC = getConductivityTemperatureValue( sensor );
-#endif
-            U32 currentIndex             = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex;
-            F32 prevSampleToRemoveC      = dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ];
 
+            currentIndex = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex;
+            prevSampleToRemoveC = dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ];
+
             dialTempMovingAvgData[ i ].dialTempDataColStartTimeMS       = getMSTimerCount();
             dialTempMovingAvgData[ i ].dialTempColHasTimerBeenSet       = TRUE;
             dialTempMovingAvgData[ i ].dialTempSamplesC[ currentIndex ] = temperatureC;
@@ -534,19 +527,24 @@
         data.d50Temp        = getTemperatureValue( D50_TEMP );
         data.d99Temp        = getTemperatureValue( D99_TEMP );
         data.boardTemp      = getTemperatureValue( BRD_TEMP );
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
-        data.d16CondTemp    = getTeensyConductivityTemperatureValue( D17_COND );
-        data.d28CondTemp    = getTeensyConductivityTemperatureValue( D27_COND );
-        data.d30CondTemp    = getTeensyConductivityTemperatureValue( D29_COND );
-        data.d44CondTemp    = getTeensyConductivityTemperatureValue( D43_COND );
-        data.d75CondTemp    = getConductivityTemperatureValue( D74_COND );
-#else
-        data.d16CondTemp    = getConductivityTemperatureValue( D17_COND );
-        data.d28CondTemp    = getConductivityTemperatureValue( D27_COND );
-        data.d30CondTemp    = getConductivityTemperatureValue( D29_COND );
-        data.d44CondTemp    = getConductivityTemperatureValue( D43_COND );
-        data.d75CondTemp    = getConductivityTemperatureValue( D74_COND );
-#endif
+
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        {
+            data.d16CondTemp    = getTeensyConductivityTemperatureValue( D17_COND );
+            data.d28CondTemp    = getTeensyConductivityTemperatureValue( D27_COND );
+            data.d30CondTemp    = getTeensyConductivityTemperatureValue( D29_COND );
+            data.d44CondTemp    = getTeensyConductivityTemperatureValue( D43_COND );
+            data.d75CondTemp    = getConductivityTemperature( D74_COND );
+        }
+        else
+        {
+            data.d16CondTemp    = getConductivityTemperature( D17_COND );
+            data.d28CondTemp    = getConductivityTemperature( D27_COND );
+            data.d30CondTemp    = getConductivityTemperature( D29_COND );
+            data.d44CondTemp    = getConductivityTemperature( D43_COND );
+            data.d75CondTemp    = getConductivityTemperature( D74_COND );
+        }
+
         data.d4AvgTemp      = getD4AverageTemperature();
         data.d50AvgTemp     = getD50AverageTemperature();
         data.d99AvgTemp     = getD99AverageTemperature();