Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rc53a264ed214a1cd44c81a11a698becb92666e79 -rf19fa057e6227ce04670a0976d121bb684e06e7e
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision c53a264ed214a1cd44c81a11a698becb92666e79)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision f19fa057e6227ce04670a0976d121bb684e06e7e)
@@ -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;
@@ -182,19 +179,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
@@ -260,7 +246,7 @@
 static void filterConductivitySensorReadings( void )
 {
     CONDUCTIVITY_SENSORS_T sensor;
-    F32 rawCond = 0.0F;
+    F32 calculatedConductivity = 0.0F;
 
     if ( ++condSampleIntervalCounter >= condDataCollectionTimeInterval )
     {
@@ -334,7 +320,7 @@
 static void filterConductivitySensorTemperatureReadings( void )
 {
     CONDUCTIVITY_SENSORS_T sensor;
-    F32 rawTemp = 0.0F;
+    F32 calculatedTemperature = 0.0F;
 
     if ( ++condtempSampleIntervalCounter >= condtempDataCollectionTimeInterval )
     {
@@ -708,4 +694,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;
+}
 /**@}*/