Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r563f516a81cb41290008f93b33e7cf5e121717db -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 563f516a81cb41290008f93b33e7cf5e121717db)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -49,15 +49,6 @@
     NUM_OF_AIR_TRAP_STATES                  ///< Number of air trap controller states
 } AIR_TRAP_STATE_T;
 
-/// Defined states for the air trap self-test state machine.
-typedef enum AirTrap_Self_Test_States
-{
-    AIR_TRAP_SELF_TEST_STATE_START = 0,     ///< Self-test start state
-    AIR_TRAP_SELF_TEST_STATE_IN_PROGRESS,   ///< Self-test in progress state
-    AIR_TRAP_SELF_TEST_STATE_COMPLETE,      ///< Self-test completed state
-    NUM_OF_AIR_TRAP_SELF_TEST_STATES        ///< Number of air trap self-test states
-} AIR_TRAP_SELF_TEST_STATE_T;
-
 // ********** private data **********
 
 static AIR_TRAP_STATE_T airTrapControllerState;                                             ///< Current state of air trap controller state machine.
@@ -66,9 +57,6 @@
 /// Interval (in ms) at which to publish air trap data to CAN bus.
 static OVERRIDE_U32_T airTrapDataPublishInterval = { AIR_TRAP_DATA_PUB_INTERVAL, AIR_TRAP_DATA_PUB_INTERVAL, 0, 0 };
 static OVERRIDE_U32_T airTrapLevels[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ];                       ///< Detected air trap level for each level sensor.
-
-static AIR_TRAP_SELF_TEST_STATE_T airTrapSelfTestState;                                     ///< Current air trap self-test state.
-static U32 airTrapSelfTestTimerCount = 0;                                                   ///< Timer counter for air trap self-test.
 
 static BOOL pendingStartAirTrapController = FALSE;                                          ///< Flag indicates an air trap controller start request is pending.
 static BOOL pendingStopAirTrapController = FALSE;                                           ///< Flag indicates an air trap controller stop request is pending.
@@ -83,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
@@ -97,7 +84,6 @@
     U32 i;
 
     resetAirTrap();
-    airTrapSelfTestState = AIR_TRAP_SELF_TEST_STATE_START;
     airTrapIllegalLevelSensorsCtr = 0;
 
     for ( i = 0; i < NUM_OF_AIR_TRAP_LEVEL_SENSORS; i++ )
@@ -375,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
     {
@@ -392,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
@@ -420,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 );