Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rdaa935b918b5e8290a6b10cf4dc3b532e5b10455 -r161503f32e66083ed9c6c16091d6e669d2ba15d9
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision daa935b918b5e8290a6b10cf4dc3b532e5b10455)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 161503f32e66083ed9c6c16091d6e669d2ba15d9)
@@ -68,6 +68,7 @@
 /// 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, AIR_TRAP_DATA_PUB_INTERVAL, 0 };
 static OVERRIDE_U32_T airTrapLevels[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ];                       ///< Detected air trap level for each level sensor.
+static OVERRIDE_U32_T rawAirTrapLevels[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ];                    ///< Raw air trap level before debouncing time
 static U32 airTrapLevelsDebounceStartTime[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ];                 ///< Debounce start time for airtrap level sensor.
 
 static BOOL pendingStartAirTrapController = FALSE;                                          ///< Flag indicates an air trap controller start request is pending.
@@ -103,11 +104,15 @@
 
     for ( i = 0; i < NUM_OF_AIR_TRAP_LEVEL_SENSORS; i++ )
     {
-        airTrapLevels[i].data = 0;
-        airTrapLevels[i].ovData = 0;
-        airTrapLevels[i].ovInitData = 0;
-        airTrapLevels[i].override = OVERRIDE_RESET;
-        airTrapLevelsDebounceStartTime[i] = 0;
+        airTrapLevels[i].data               = 0;
+        airTrapLevels[i].ovData             = 0;
+        airTrapLevels[i].ovInitData         = 0;
+        airTrapLevels[i].override           = OVERRIDE_RESET;
+        rawAirTrapLevels[i].data            = 0;
+        rawAirTrapLevels[i].ovData          = 0;
+        rawAirTrapLevels[i].ovInitData      = 0;
+        rawAirTrapLevels[i].override        = OVERRIDE_RESET;
+        airTrapLevelsDebounceStartTime[i]   = 0;
     }
 
     initPersistentAlarm( ALARM_ID_HD_AIR_TRAP_ILLEGAL_LEVELS, AIR_TRAP_ILLEGAL_LEVELS_TIMEOUT_MS, AIR_TRAP_ILLEGAL_LEVELS_TIMEOUT_MS );
@@ -193,18 +198,17 @@
     BOOL isAirTrapLevelsValid = FALSE;
     AIR_TRAP_LEVELS_T lowerAirTrap, upperAirTrap;
     AIR_TRAP_LEVEL_SENSORS_T airTrapLevelSensor;
-    AIR_TRAP_LEVELS_T currentLevelStatus[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ];
 
     // Get latest level readings
     getFPGAAirTrapLevels( &lower, &upper );
-    currentLevelStatus[ AIR_TRAP_LEVEL_SENSOR_LOWER ] = ( TRUE == lower ? AIR_TRAP_LEVEL_AIR : AIR_TRAP_LEVEL_FLUID );
-    currentLevelStatus[ AIR_TRAP_LEVEL_SENSOR_UPPER ] = ( TRUE == upper ? AIR_TRAP_LEVEL_AIR : AIR_TRAP_LEVEL_FLUID );
+    rawAirTrapLevels[ AIR_TRAP_LEVEL_SENSOR_LOWER ].data = (U32)( TRUE == lower ? AIR_TRAP_LEVEL_AIR : AIR_TRAP_LEVEL_FLUID );
+    rawAirTrapLevels[ AIR_TRAP_LEVEL_SENSOR_UPPER ].data = (U32)( TRUE == upper ? AIR_TRAP_LEVEL_AIR : AIR_TRAP_LEVEL_FLUID );
 
     // Read the level after expiry of debouncing time
-    for( airTrapLevelSensor = AIR_TRAP_LEVEL_SENSOR_LOWER; airTrapLevelSensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS; airTrapLevelSensor++  )
+    for( airTrapLevelSensor = AIR_TRAP_LEVEL_SENSOR_LOWER; airTrapLevelSensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS; airTrapLevelSensor++ )
     {
-        // Check if the current level sensor status is not the same as the recorded data
-        if ( currentLevelStatus[ airTrapLevelSensor ] != (AIR_TRAP_LEVELS_T)airTrapLevels[ airTrapLevelSensor ].data )
+        // Check if the raw level sensor status is not the same as the recorded data
+        if ( getRawAirTrapLevel( airTrapLevelSensor ) != (AIR_TRAP_LEVELS_T)airTrapLevels[ airTrapLevelSensor ].data )
         {
             // If the debounce time is 0, start the timer
             if ( 0 == airTrapLevelsDebounceStartTime[ airTrapLevelSensor ] )
@@ -217,7 +221,7 @@
                 // reset the debounce time
                 airTrapLevelsDebounceStartTime[ airTrapLevelSensor ]    = 0;
                 // update recent level status
-                airTrapLevels[ airTrapLevelSensor ].data                = (U32)currentLevelStatus[ airTrapLevelSensor ];
+                airTrapLevels[ airTrapLevelSensor ].data                = (U32)getRawAirTrapLevel( airTrapLevelSensor );
             }
         }
         else
@@ -465,24 +469,52 @@
 
 /*********************************************************************//**
  * @brief
+ * The getRawAirTrapLevel function gets the raw level reading for the given
+ * level sensor.
+ * @details Inputs: rawAirTrapLevels[]
+ * @details Outputs: none
+ * @param sensor ID of level sensor to get reading for
+ * @return the raw level sensor reading for the given sensor (air or fluid).
+ *************************************************************************/
+AIR_TRAP_LEVELS_T getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSORS_T sensor )
+{
+   AIR_TRAP_LEVELS_T result;
+
+   if ( sensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS )
+   {
+       result = (AIR_TRAP_LEVELS_T)getU32OverrideValue( &rawAirTrapLevels[ sensor ] );
+   }
+   else
+   {
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (U32)SW_FAULT_ID_AIR_TRAP_INVALID_LEVEL_SENSOR, (U32)sensor )
+       result = AIR_TRAP_LEVEL_AIR;
+   }
+
+   return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The publishAirTrapData function publishes air trap data at the set interval.
- * @details Inputs: airTrapLevels[]
+ * @details Inputs: airTrapLevels[], rawAirTrapLevels[]
  * @details Outputs: if broadcast is due, send air trap data
  * @return none
  *************************************************************************/
 static void publishAirTrapData( void )
 {
-    // Publish air trap data on interval
-    if ( ++airTrapDataPublicationTimerCounter >= getU32OverrideValue( &airTrapDataPublishInterval ) )
-    {
-        AIR_TRAP_PAYLOAD_T data;
+   // Publish air trap data on interval
+   if ( ++airTrapDataPublicationTimerCounter >= getU32OverrideValue( &airTrapDataPublishInterval ) )
+   {
+       AIR_TRAP_PAYLOAD_T data;
 
-        data.lowerLevel = getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER );
-        data.upperLevel = getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER );
+       data.lowerLevel     = getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER );
+       data.upperLevel     = getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER );
+       data.rawLowerLevel  = getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER );
+       data.rawUpperLevel  = getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER );
 
-        broadcastData( MSG_ID_HD_AIR_TRAP_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( AIR_TRAP_PAYLOAD_T ) );
-        airTrapDataPublicationTimerCounter = 0;
-    }
+       broadcastData( MSG_ID_HD_AIR_TRAP_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( AIR_TRAP_PAYLOAD_T ) );
+       airTrapDataPublicationTimerCounter = 0;
+   }
 }
 
 /*********************************************************************//**
@@ -608,4 +640,57 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testSetRawAirTrapLevelOverride function overrides the measured raw level
+ * for a given level sensor.
+ * @details Inputs: none
+ * @details Outputs: rawAirTrapLevels[]
+ * @param sensor ID of level sensor to override
+ * @param level override level sensor with this
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testSetRawAirTrapLevelOverride( AIR_TRAP_LEVEL_SENSORS_T sensor, AIR_TRAP_LEVELS_T level )
+{
+   BOOL result = FALSE;
+
+   if ( ( sensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS ) && ( level < NUM_OF_AIR_TRAP_LEVELS ) )
+   {
+       if ( TRUE == isTestingActivated() )
+       {
+           result = TRUE;
+           rawAirTrapLevels[ sensor ].ovData = (U32)level;
+           rawAirTrapLevels[ sensor ].override = OVERRIDE_KEY;
+       }
+   }
+
+   return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetRawAirTrapLevelOverride function resets the override of the
+ * level sensor.
+ * @details Inputs: none
+ * @details Outputs: rawAirTrapLevels[]
+ * @param sensor ID of level sensor to reset override
+ * @return TRUE if reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetRawAirTrapLevelOverride( AIR_TRAP_LEVEL_SENSORS_T sensor )
+{
+   BOOL result = FALSE;
+
+   if ( sensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS )
+   {
+       if ( TRUE == isTestingActivated() )
+       {
+           result = TRUE;
+           rawAirTrapLevels[ sensor ].override = OVERRIDE_RESET;
+           rawAirTrapLevels[ sensor ].ovData = rawAirTrapLevels[ sensor ].ovInitData;
+       }
+   }
+
+   return result;
+}
+
 /**@}*/