Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -re6f3a632890f96a5aa282922d11df148bdd06587 -rd3819286869611f9c02add72a0f8e321598fdf42
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e6f3a632890f96a5aa282922d11df148bdd06587)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision d3819286869611f9c02add72a0f8e321598fdf42)
@@ -108,7 +108,6 @@
 static U32 prefixStrToSIFactor( U08 prefix );
 static void processMeasurementDataPackage( U32 sensorId );
 static void processCD1CD2SensorRead( U16 fpgaReadCount, U08 fpgaErrorCount );
-static U32 getConductivityDataPublishInterval( void );
 static BOOL processCalibrationData( void );
 static F32 getCalibrationAppliedConductivityValue( U32 sensorId, F32 compensatedValue );
 
@@ -166,7 +165,7 @@
     processCPiCPoSensorRead( CONDUCTIVITYSENSORS_CPO_SENSOR, getFPGACPo(), getFPGACPoReadCount(), getFPGACPoErrorCount(), getFPGACPoFault() );
     processCD1CD2SensorRead( getFPGAEmstatRxFifoCount(), getFPGAEmstatRxErrCount() );
 
-    if ( ++conductivityDataPublicationTimerCounter >= getConductivityDataPublishInterval() )
+    if ( ++conductivityDataPublicationTimerCounter >= getU32OverrideValue( &conductivityDataPublishInterval ) )
     {
         CONDUCTIVITY_DATA_T data;
 
@@ -263,14 +262,7 @@
 
     if ( sensorId < NUM_OF_CONDUCTIVITY_SENSORS )
     {
-        if ( OVERRIDE_KEY == compensatedConductivityValues[ sensorId ].override )
-        {
-            result = compensatedConductivityValues[ sensorId ].ovData;
-        }
-        else
-        {
-            result = compensatedConductivityValues[ sensorId ].data;
-        }
+        result = getF32OverrideValue( &compensatedConductivityValues[ sensorId ] );
     }
     else
     {
@@ -509,26 +501,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getConductivityDataPublishInterval function gets the conductivity
- * data publication interval.
- * @details Inputs: conductivityDataPublishInterval
- * @details Outputs: none
- * @return the current conductivity data publication interval (in ms/task interval).
- *************************************************************************/
-static U32 getConductivityDataPublishInterval( void )
-{
-    U32 result = conductivityDataPublishInterval.data;
-
-    if ( OVERRIDE_KEY == conductivityDataPublishInterval.override )
-    {
-        result = conductivityDataPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The processCalibrationData function gets the calibration data and makes
  * sure it is valid by checking the calibration date. The calibration date
  * should not be 0.