Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r44a100f8e5210a02c23b8fcc4527d8e96d577381 -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -71,7 +71,6 @@
 static AIR_TRAP_STATE_T handleAirTrapValveClosedState( void );
 static AIR_TRAP_STATE_T handleAirTrapValveOpenState( void );
 static void publishAirTrapData( void );
-static U32  getPublishAirTrapDataInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -362,11 +361,7 @@
 
     if ( sensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS )
     {
-        result = (AIR_TRAP_LEVELS_T)airTrapLevels[ sensor ].data;
-        if ( OVERRIDE_KEY == airTrapLevels[ sensor ].override )
-        {
-            result = (AIR_TRAP_LEVELS_T)airTrapLevels[ sensor ].ovData;
-        }
+        result = (AIR_TRAP_LEVELS_T)getU32OverrideValue( &airTrapLevels[ sensor ] );
     }
     else
     {
@@ -379,26 +374,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishAirTrapDataInterval function gets the air trap data
- * publication interval.
- * @details Inputs: airTrapDataPublishInterval
- * @details Outputs: none
- * @return the current air trap data publication interval (in task intervals).
- *************************************************************************/
-static U32  getPublishAirTrapDataInterval( void )
-{
-    U32 result = airTrapDataPublishInterval.data;
-
-    if ( OVERRIDE_KEY == airTrapDataPublishInterval.override )
-    {
-        result = airTrapDataPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The publishAirTrapData function publishes air trap data at the set interval.
  * @details Inputs: airTrapLevels[]
  * @details Outputs: if broadcast is due, send air trap data
@@ -407,7 +382,7 @@
 static void publishAirTrapData( void )
 {
     // Publish air trap data on interval
-    if ( ++airTrapDataPublicationTimerCounter >= getPublishAirTrapDataInterval() )
+    if ( ++airTrapDataPublicationTimerCounter >= getU32OverrideValue( &airTrapDataPublishInterval ) )
     {
         AIR_TRAP_LEVELS_T lowLevel = getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER );
         AIR_TRAP_LEVELS_T highLevel = getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER );