Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r4790fb46181f78a19f0a557b0e9688cc03a74e97 -rd3819286869611f9c02add72a0f8e321598fdf42
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 4790fb46181f78a19f0a557b0e9688cc03a74e97)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision d3819286869611f9c02add72a0f8e321598fdf42)
@@ -87,7 +87,6 @@
 static PRESSURE_STATE_T handlePressuresInitState( void );
 static PRESSURE_STATE_T handlePressuresContReadState( void );
 static void publishPressuresData( void );
-static U32 getPublishPressuresDataInterval( void );
 static BOOL processCalibrationData( void );
 
 static SELF_TEST_STATUS_T handleSelfTestADCCheck( void );
@@ -169,18 +168,11 @@
 
     if ( pressureID < NUM_OF_PRESSURE_SENSORS )
     {
-        if ( OVERRIDE_KEY == pressures[ pressureID ].override )
-        {
-            result = pressures[ pressureID ].ovData;
-        }
-        else
-        {
-            result = pressures[ pressureID ].data;
-        }
+        getF32OverrideValue( &pressures[ pressureID ] );
     }
     else
     {
-        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_PRESSURE_SENSOR_ID, pressureID );
     }
 
     return result;
@@ -346,26 +338,6 @@
     }
 
     return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The getPublishPressuresDataInterval function gets the pressure data
- * publish interval.
- * @details Inputs: pressuresDataPublishInterval
- * @details Outputs: none
- * @return the current pressures data publication interval (in task intervals).
- *************************************************************************/
-static U32 getPublishPressuresDataInterval( void )
-{
-    U32 result = pressuresDataPublishInterval.data;
-
-    if ( OVERRIDE_KEY == pressuresDataPublishInterval.override )
-    {
-        result = pressuresDataPublishInterval.ovData;
-    }
-
-    return result;
 }
 
 /*********************************************************************//**
@@ -420,7 +392,7 @@
 static void publishPressuresData( void )
 {
     // publish pressure/occlusion data on interval
-    if ( ++pressuresDataPublicationTimerCounter >= getPublishPressuresDataInterval() )
+    if ( ++pressuresDataPublicationTimerCounter >= getU32OverrideValue( &pressuresDataPublishInterval ) )
     {
         F32 roIn = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
         F32 roOut = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET );