Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r4217fb36123be319cc23be1dc315377cd9419f93 -r7983907af837390c90979b1ac727f3f55f0b7ae2
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 4217fb36123be319cc23be1dc315377cd9419f93)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 7983907af837390c90979b1ac727f3f55f0b7ae2)
@@ -950,102 +950,6 @@
 
 /*********************************************************************//**
  * @brief
- * The testDDConductivitySensorReadingsOverride function overrides the value of the
- * specified DD conductivity sensor with a given value.
- * @details \b Inputs: none
- * @details \b Outputs: currentConductivityReadings[]
- * @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 testDDConductivitySensorReadingsOverride( MESSAGE_T *message )
-{
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
-
-    if ( payload.index <= LAST_DD_COND_SENSOR )
-    {
-        result = f32ArrayOverride( message, &currentConductivityReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 );
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testDDConductivitySensorTemperatureReadingsOverride function overrides
- * the value of the specified DD conductivity sensor temperature with a given value.
- * @details \b Inputs: none
- * @details \b Outputs: currentPresTempReadings[]
- * @param message Override message from Dialin which includes an sensor
- * ID and override value of the conductivity sensor temperature.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testDDConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message )
-{
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
-
-    if ( payload.index <= LAST_DD_COND_SENSOR )
-    {
-        result = f32ArrayOverride( message, &currentTemperatureReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 );
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testDDConductivitySensorReadCounterOverride function overrides
- * the value of the specified DD conductivity sensor read counter with a given value.
- * @details \b Inputs: none
- * @details \b Outputs: lastConductivityReadCounter[]
- * @param message Override message from Dialin which includes an sensor
- * ID and override value of the conductivity sensor read counter.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testDDConductivitySensorConductivityReadCounterOverride( MESSAGE_T *message )
-{
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
-
-    if ( payload.index <= LAST_DD_COND_SENSOR )
-    {
-        result = u32ArrayOverride( message, &lastConductivityReadCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT );
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testDDConductivitySensorErrorCounterOverride function overrides
- * the value of the specified DD conductivity sensor error counter with a given value.
- * @details \b Inputs: none
- * @details \b Outputs: lastConductivityErrorCounter[]
- * @param message Override message from Dialin which includes an sensor
- * ID and override value of the conductivity sensor error counter.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testDDConductivitySensorConductivityErrorCounterOverride( MESSAGE_T *message )
-{
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
-
-    if ( payload.index <= LAST_DD_COND_SENSOR )
-    {
-        result = u32ArrayOverride( message, &lastConductivityErrorCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT );
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The testConductivitySensorReadingsOverride function overrides the value of the
  * specified conductivity sensor with a given value.
  * @details \b Inputs: none
@@ -1054,17 +958,10 @@
  * ID and override value of the conductivity sensor.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testFPConductivitySensorReadingsOverride( MESSAGE_T *message )
+BOOL testConductivitySensorConductivityReadingsOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
+    BOOL result = f32ArrayOverride( message, &currentConductivityReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 );
 
-    if ( ( payload.index >= FIRST_FP_COND_SENSOR ) && ( payload.index <= LAST_FP_COND_SENSOR ) )
-    {
-        result = f32ArrayOverride( message, &currentConductivityReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 );
-    }
-
     return result;
 }
 
@@ -1073,71 +970,51 @@
  * The testConductivitySensorTemperatureReadingsOverride function overrides
  * the value of the specified conductivity sensor temperature with a given value.
  * @details \b Inputs: none
- * @details \b Outputs: currentPresTempReadings[]
+ * @details \b Outputs: currentTemperatureReadings[]
  * @param message Override message from Dialin which includes an sensor
  * ID and override value of the conductivity sensor temperature.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testFPConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message )
+BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
+    BOOL result = f32ArrayOverride( message, &currentTemperatureReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 );
 
-    if ( ( payload.index >= FIRST_FP_COND_SENSOR ) && ( payload.index <= LAST_FP_COND_SENSOR ) )
-    {
-        result = f32ArrayOverride( message, &currentTemperatureReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 );
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testConductivitySensorReadCounterOverride function overrides
+ * The testConductivitySensorConductivityReadCounterOverride function overrides
  * the value of the specified conductivity sensor read counter with a given value.
  * @details \b Inputs: none
  * @details \b Outputs: lastConductivityReadCounter[]
  * @param message Override message from Dialin which includes an sensor
  * ID and override value of the conductivity sensor read counter.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testFPConductivitySensorConductivityReadCounterOverride( MESSAGE_T *message )
+BOOL testConductivitySensorConductivityReadCounterOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
+    BOOL result = u32ArrayOverride( message, &lastConductivityReadCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT );
 
-    if ( ( payload.index >= FIRST_FP_COND_SENSOR ) && ( payload.index <= LAST_FP_COND_SENSOR ) )
-    {
-        result = u32ArrayOverride( message, &lastConductivityReadCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT );
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testConductivitySensorErrorCounterOverride function overrides
+ * The testConductivitySensorConductivityErrorCounterOverride function overrides
  * the value of the specified conductivity sensor error counter with a given value.
  * @details \b Inputs: none
  * @details \b Outputs: lastConductivityErrorCounter[]
  * @param message Override message from Dialin which includes an sensor
  * ID and override value of the conductivity sensor error counter.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testFPConductivitySensorConductivityErrorCounterOverride( MESSAGE_T *message )
+BOOL testConductivitySensorConductivityErrorCounterOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &payload );
+    BOOL result = u32ArrayOverride( message, &lastConductivityErrorCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT );
 
-    if ( ( payload.index >= FIRST_FP_COND_SENSOR ) && ( payload.index <= LAST_FP_COND_SENSOR ) )
-    {
-        result = u32ArrayOverride( message, &lastConductivityErrorCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT );
-    }
-
     return result;
 }
 
+
 /**@}*/