Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r202978f0c2f12bf5a1e466d6788e3a6fc6243569 -r7983907af837390c90979b1ac727f3f55f0b7ae2
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 202978f0c2f12bf5a1e466d6788e3a6fc6243569)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 7983907af837390c90979b1ac727f3f55f0b7ae2)
@@ -675,4 +675,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 )
+    {
+        result = testConductivitySensorConductivityReadingsOverride( message );
+    }
+    else
+    {
+
+        if ( payload.index != D74_COND )
+        {
+            result = testTeensyConductivitySensorReadingsOverride( message );
+        }
+        else
+        {
+            result = testConductivitySensorReadingsOverride( 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 )
+    {
+        result = testConductivitySensorTemperatureReadingsOverride( message );
+    }
+    else
+    {
+
+        if ( payload.index != D74_COND )
+        {
+            result = testTeensyConductivitySensorTemperatureReadingsOverride( message );
+        }
+        else
+        {
+            result = testConductivitySensorTemperatureReadingsOverride( message );
+        }
+    }
+
+    return result;
+}
 /**@}*/