Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -re2e51b0219db0132cebb6f65f3dbd803e1f01e30 -re7fe0454b5b2d39009dc784dc8c156856df8bc86
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e2e51b0219db0132cebb6f65f3dbd803e1f01e30)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e7fe0454b5b2d39009dc784dc8c156856df8bc86)
@@ -34,6 +34,7 @@
 
 #define SIEMENS_TO_MICROSIEMENS_CONVERSION              1000000                                         ///< Siemens to microSiemens conversion factor.
 #define COND_SENSORS_FPGA_ERROR_TIMEOUT_MS              ( 2 * MS_PER_SECOND )                           ///< Conductivity sensors FPGA error timeout in milliseconds.
+#define COND_SENSORS_READ_ERR_MAX_CNT                   255                                             ///< Conductivity sensors read and error count max value
 
 /// Defined states for the conductivity write transaction.
 typedef enum Conductvity_write_tx_states
@@ -886,35 +887,8 @@
  *************************************************************************/
 BOOL testConductivitySensorReadingsOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
+    BOOL result = f32ArrayOverride( message, &currentConductivityReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 );
 
-    // Verify tester has logged in with DD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    {
-        U32 sensor = override.index;
-
-        // Verify conductivity sensor index of override
-        if ( sensor < NUM_OF_CONDUCTIVITY_SENSORS )
-        {
-            if ( OVERRIDE_OVERRIDE == ovType )
-            {
-                F32 value = override.state.f32;
-
-                currentConductivityReadings[ sensor ].ovData   = value;
-                currentConductivityReadings[ sensor ].override = OVERRIDE_KEY;
-            }
-            else
-            {
-                currentConductivityReadings[ sensor ].override = OVERRIDE_RESET;
-                currentConductivityReadings[ sensor ].ovData   = currentConductivityReadings[ sensor ].ovInitData;
-            }
-
-            result = TRUE;
-        }
-    }
-
     return result;
 }
 
@@ -930,35 +904,8 @@
  *************************************************************************/
 BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
+    BOOL result = f32ArrayOverride( message, &currentTemperatureReadings[0], NUM_OF_CONDUCTIVITY_SENSORS - 1 );
 
-    // Verify tester has logged in with DD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    {
-        U32 sensor = override.index;
-
-        // Verify conductivity sensor index of override
-        if ( sensor < NUM_OF_CONDUCTIVITY_SENSORS )
-        {
-            if ( OVERRIDE_OVERRIDE == ovType )
-            {
-                F32 value = override.state.f32;
-
-                currentTemperatureReadings[ sensor ].ovData   = value;
-                currentTemperatureReadings[ sensor ].override = OVERRIDE_KEY;
-            }
-            else
-            {
-                currentTemperatureReadings[ sensor ].override = OVERRIDE_RESET;
-                currentTemperatureReadings[ sensor ].ovData   = currentTemperatureReadings[ sensor ].ovInitData;
-            }
-
-            result = TRUE;
-        }
-    }
-
     return result;
 }
 
@@ -974,35 +921,8 @@
  *************************************************************************/
 BOOL testConductivitySensorReadCounterOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
+    BOOL result = u32ArrayOverride( message, &lastConductivityReadCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT );
 
-    // Verify tester has logged in with DD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    {
-        U32 sensor = override.index;
-
-        // Verify conductivity sensor index of override
-        if ( sensor < NUM_OF_CONDUCTIVITY_SENSORS )
-        {
-            if ( OVERRIDE_OVERRIDE == ovType )
-            {
-                U32 value = override.state.u32;
-
-                lastConductivityReadCounter[ sensor ].ovData   = value;
-                lastConductivityReadCounter[ sensor ].override = OVERRIDE_KEY;
-            }
-            else
-            {
-                lastConductivityReadCounter[ sensor ].override = OVERRIDE_RESET;
-                lastConductivityReadCounter[ sensor ].ovData   = lastConductivityReadCounter[ sensor ].ovInitData;
-            }
-
-            result = TRUE;
-        }
-    }
-
     return result;
 }
 
@@ -1018,35 +938,8 @@
  *************************************************************************/
 BOOL testConductivitySensorErrorCounterOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
+    BOOL result = u32ArrayOverride( message, &lastConductivityErrorCounter[0], NUM_OF_CONDUCTIVITY_SENSORS - 1, 0, COND_SENSORS_READ_ERR_MAX_CNT );
 
-    // Verify tester has logged in with DD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    {
-        U32 sensor = override.index;
-
-        // Verify conductivity sensor index of override
-        if ( sensor < NUM_OF_CONDUCTIVITY_SENSORS )
-        {
-            if ( OVERRIDE_OVERRIDE == ovType )
-            {
-                U32 value = override.state.u32;
-
-                lastConductivityErrorCounter[ sensor ].ovData   = value;
-                lastConductivityErrorCounter[ sensor ].override = OVERRIDE_KEY;
-            }
-            else
-            {
-                lastConductivityErrorCounter[ sensor ].override = OVERRIDE_RESET;
-                lastConductivityErrorCounter[ sensor ].ovData   = lastConductivityErrorCounter[ sensor ].ovInitData;
-            }
-
-            result = TRUE;
-        }
-    }
-
     return result;
 }