Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r60e0810fec7299b2c280fd26817ddb1202957fcb -r1d6a00e7a2d7b3be0c27cc78adc6e1630c38d2ae
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 60e0810fec7299b2c280fd26817ddb1202957fcb)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 1d6a00e7a2d7b3be0c27cc78adc6e1630c38d2ae)
@@ -91,7 +91,7 @@
 static U08 readCount[ NUM_OF_CONDUCTIVITY_SENSORS ];                                                ///< Read count for conductivity readings.
 static U32 internalErrorCount[ NUM_OF_CONDUCTIVITY_SENSORS ];                                       ///< Internal error count for conductivity readings.
 static OVERRIDE_F32_T compensatedConductivityValues[ NUM_OF_CONDUCTIVITY_SENSORS ];                 ///< Latest compensated conductivity values.
-static OVERRIDE_F32_T rawConductivityValues[ NUM_OF_CONDUCTIVITY_SENSORS ];                         ///< Latest raw conductivity values.
+static F32 rawConductivityValues[ NUM_OF_CONDUCTIVITY_SENSORS ];                                    ///< Latest raw conductivity values.
 static F32 roRejectionRatio;                                                                        ///< Latest RO rejection ratio.
 
 static OVERRIDE_U32_T conductivityDataPublishInterval = { COND_SENSOR_REPORT_PERIOD,
@@ -137,10 +137,7 @@
         compensatedConductivityValues[ i ].ovInitData = 0.0;
         compensatedConductivityValues[ i ].override = OVERRIDE_RESET;
 
-        rawConductivityValues[ i ].data = 0.0;
-        rawConductivityValues[ i ].ovData = 0.0;
-        rawConductivityValues[ i ].ovInitData = 0.0;
-        rawConductivityValues[ i ].override = OVERRIDE_RESET;
+        rawConductivityValues[ i ] = 0.0;
     }
 
     setFPGACPiProbeType( COND_CPI_SENSOR_PROBE_TYPE );
@@ -188,10 +185,10 @@
         data.cd1 = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
         data.cd2 = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
 
-        data.cpiRaw = getRawConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
-        data.cpoRaw = getRawConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
-        data.cd1Raw = getRawConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
-        data.cd2Raw = getRawConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
+        data.cpiRaw = rawConductivityValues[ CONDUCTIVITYSENSORS_CPI_SENSOR ];
+        data.cpoRaw = rawConductivityValues[ CONDUCTIVITYSENSORS_CPO_SENSOR ];
+        data.cd1Raw = rawConductivityValues[ CONDUCTIVITYSENSORS_CD1_SENSOR ];
+        data.cd2Raw = rawConductivityValues[ CONDUCTIVITYSENSORS_CD2_SENSOR ];
 
         broadcastData( MSG_ID_DG_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_DATA_T ) );
     }
@@ -290,34 +287,9 @@
 
 /*********************************************************************//**
  * @brief
- * The getRawConductivityValue function gets the raw conductivity
- * value for a given conductivity sensor id.
- * @details Inputs: rawConductivityValues[]
- * @details Outputs: none
- * @param sensorId conductivity sensor id
- * @return raw conductivity
- *************************************************************************/
-F32 getRawConductivityValue( U32 sensorId )
-{
-    F32 result = 0.0;
-
-    if ( sensorId < NUM_OF_CONDUCTIVITY_SENSORS )
-    {
-        result = getF32OverrideValue( &rawConductivityValues[ sensorId ] );
-    }
-    else
-    {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID, sensorId );
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The calcCompensatedConductivity function calculates the compensated
  * conductivity based on given temperature and conductivity taken at
- * reference temperature of 25 Celcius.
+ * reference temperature of 25 degree Celsius.
  * @details Inputs: conductivity, temperature
  * @details Outputs: none
  * @param conductivity conductivity value
@@ -326,7 +298,7 @@
  *************************************************************************/
 static F32 calcCompensatedConductivity( F32 conductivity, F32 temperature )
 {
-    // EC = EC_25 * (1 + temp_coef * (temperature - 25))
+    // EC = EC_25 * (1 + temp_coef * ( 25 - temperature ))
     F32 const compensatedCoef  = ( 1.0 + ( COND_SENSOR_TEMPERATURE_COEF * ( COND_SENSOR_REFERENCE_TEMPERATURE - temperature ) ) );
 
     return conductivity * compensatedCoef;
@@ -380,7 +352,7 @@
             readCount[ sensorId ] = fpgaReadCount;
             internalErrorCount[ sensorId ] = 0;
             compensatedConductivityValues[ sensorId ].data = getCalibrationAppliedConductivityValue( sensorId, compensatedCond );
-            rawConductivityValues[ sensorId ].data = conductivity;
+            rawConductivityValues[ sensorId ] = conductivity;  // raw conductivity data
         }
         else
         {
@@ -623,59 +595,6 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetConductivityOverride function overrides the raw
- * conductivity value of given sensor id.
- * @details Inputs: rawConductivityValues[]
- * @details Outputs: rawConductivityValues[]
- * @param sensorId conductivity sensor id
- * @param value override raw conductivity value
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testSetRawConductivityOverride( U32 sensorId, F32 value )
-{
-    BOOL result = FALSE;
-
-    if ( sensorId < NUM_OF_CONDUCTIVITY_SENSORS )
-    {
-        if ( isTestingActivated() )
-        {
-            result = TRUE;
-            rawConductivityValues[ sensorId ].ovData   = value;
-            rawConductivityValues[ sensorId ].override = OVERRIDE_KEY;
-        }
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testResetConductivityOverride function resets the override of the
- * raw conductivity sensor value.
- * @details Inputs: rawConductivityValues[]
- * @details Outputs: rawConductivityValues[]
- * @param sensorId conductivity sensor id
- * @return TRUE if reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetRawConductivityOverride( U32 sensorId )
-{
-    BOOL result = FALSE;
-
-    if ( sensorId < NUM_OF_CONDUCTIVITY_SENSORS )
-    {
-        if ( isTestingActivated() )
-        {
-            result = TRUE;
-            rawConductivityValues[ sensorId ].ovData   = rawConductivityValues[ sensorId ].ovInitData;
-            rawConductivityValues[ sensorId ].override = OVERRIDE_RESET;
-        }
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The testSetConductivityDataPublishIntervalOverride function overrides
  * the conductivity data publish interval.
  * @details Inputs: conductivityDataPublishInterval