Index: firmware/App/Drivers/PressureSensor.c
===================================================================
diff -u -rfefb47e88a5285e99498efb830fdceb9e95c2c3e -re7fe0454b5b2d39009dc784dc8c156856df8bc86
--- firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision fefb47e88a5285e99498efb830fdceb9e95c2c3e)
+++ firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision e7fe0454b5b2d39009dc784dc8c156856df8bc86)
@@ -33,6 +33,7 @@
 #define ONE_BAR_TO_MILLI_BAR                        1000                                                ///< 1 bar to milli-bar conversion.
 #define COUNTS_TO_MILLI_BAR                         100                                                 ///< Counts to milli-bar conversion.
 #define BAR_TO_MMHG                                 ( 750.062F )                                        ///< Conversion factor for converting bar to mmHg.
+#define PRES_SENSORS_READ_ERR_MAX_CNT               255                                                 ///< Pressure sensor read and error max count value
 
 /// Barometric sensor conversion coefficients
 typedef struct
@@ -382,35 +383,8 @@
  *************************************************************************/
 BOOL testPressureSensorReadingsOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
+    BOOL result = f32ArrayOverride( message, &currentPressureReadings[0], NUM_OF_PRESSURE_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 pressure sensor index of override
-        if ( sensor < NUM_OF_PRESSURE_SENSORS )
-        {
-            if ( OVERRIDE_OVERRIDE == ovType )
-            {
-                F32 value = override.state.f32;
-
-                currentPressureReadings[ sensor ].ovData   = value;
-                currentPressureReadings[ sensor ].override = OVERRIDE_KEY;
-            }
-            else
-            {
-                currentPressureReadings[ sensor ].override = OVERRIDE_RESET;
-                currentPressureReadings[ sensor ].ovData   = currentPressureReadings[ sensor ].ovInitData;
-            }
-
-            result = TRUE;
-        }
-    }
-
     return result;
 }
 
@@ -426,35 +400,8 @@
  *************************************************************************/
 BOOL testPressureSensorTemperatureReadingsOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
+    BOOL result = f32ArrayOverride( message, &currentPresTempReadings[0], NUM_OF_PRESSURE_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 pressure sensor index of override
-        if ( sensor < NUM_OF_PRESSURE_SENSORS )
-        {
-            if ( OVERRIDE_OVERRIDE == ovType )
-            {
-                F32 value = override.state.f32;
-
-                currentPresTempReadings[ sensor ].ovData   = value;
-                currentPresTempReadings[ sensor ].override = OVERRIDE_KEY;
-            }
-            else
-            {
-                currentPresTempReadings[ sensor ].override = OVERRIDE_RESET;
-                currentPresTempReadings[ sensor ].ovData   = currentPresTempReadings[ sensor ].ovInitData;
-            }
-
-            result  = TRUE;
-        }
-    }
-
     return result;
 }
 
@@ -470,35 +417,8 @@
  *************************************************************************/
 BOOL testPressureSensorReadCounterOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
+    BOOL result = u32ArrayOverride( message, &lastPressureReadCounter[0], NUM_OF_PRESSURE_SENSORS - 1, 0, PRES_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 pressure sensor index of override
-        if ( sensor < NUM_OF_PRESSURE_SENSORS )
-        {
-            if ( OVERRIDE_OVERRIDE == ovType )
-            {
-                U32 value = override.state.u32;
-
-                lastPressureReadCounter[ sensor ].ovData   = value;
-                lastPressureReadCounter[ sensor ].override = OVERRIDE_KEY;
-            }
-            else
-            {
-                lastPressureReadCounter[ sensor ].override = OVERRIDE_RESET;
-                lastPressureReadCounter[ sensor ].ovData   = lastPressureReadCounter[ sensor ].ovInitData;
-            }
-
-            result = TRUE;
-        }
-    }
-
     return result;
 }
 
@@ -514,35 +434,8 @@
  *************************************************************************/
 BOOL testPressureSensorErrorCounterOverride( MESSAGE_T *message )
 {
-    BOOL                          result = FALSE;
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
+    BOOL result = u32ArrayOverride( message, &lastPressureErrorCounter[0], NUM_OF_PRESSURE_SENSORS - 1, 0, PRES_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 pressure sensor index of override
-        if ( sensor < NUM_OF_PRESSURE_SENSORS )
-        {
-            if ( OVERRIDE_OVERRIDE == ovType )
-            {
-                U32 value = override.state.u32;
-
-                lastPressureErrorCounter[ sensor ].ovData   = value;
-                lastPressureErrorCounter[ sensor ].override = OVERRIDE_KEY;
-            }
-            else
-            {
-                lastPressureErrorCounter[ sensor ].override = OVERRIDE_RESET;
-                lastPressureErrorCounter[ sensor ].ovData   = lastPressureErrorCounter[ sensor ].ovInitData;
-            }
-
-            result = TRUE;
-        }
-    }
-
     return result;
 }