Index: firmware/App/Drivers/LevelSensors.c
===================================================================
diff -u -r58c82eeb7e6113e610babd4e36b3968552b35260 -r961784c895cb8f551a2623cd02dcbfe42d04b7c2
--- firmware/App/Drivers/LevelSensors.c	(.../LevelSensors.c)	(revision 58c82eeb7e6113e610babd4e36b3968552b35260)
+++ firmware/App/Drivers/LevelSensors.c	(.../LevelSensors.c)	(revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2)
@@ -15,36 +15,36 @@
 *
 ***************************************************************************/
 
-#include "LevelSensors.h"
+#include "LevelSensors.h"
 #include "FpgaTD.h"
 #include "Messaging.h"
 #include "TaskPriority.h"
-#include "Timers.h"
-
+#include "Timers.h"
+
 /**
  *  @addtogroup LevelSensors
  *  @{
  */
 
-// ********** private definitions **********
-
+// ********** private definitions **********
+
 #define AIR_TRAP_LEVEL_DEBOUNCE_TIME_MS     ( 400 / TASK_PRIORITY_INTERVAL )                    ///< Air trap level sensor debounce time (in priority task intervals).
 
-// ********** private data **********
+// ********** private data **********
 
 static OVERRIDE_U32_T rawLevelStates[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ];                          ///< Raw air trap level states before debounce (overrideable).
 static OVERRIDE_U32_T currentLevelStates[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ];                      ///< Current raw level sensor states (overrideable).
 static U32 airTrapLevelsDebounceTimerCtr[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ];                      ///< Debounce timer counter for air trap level sensors.
-
+
 // ********** private function prototypes **********
 
-/*********************************************************************//**
- * @brief
- * The initLevelSensors function initializes the Level Sensors unit.
- * @details \b Inputs: none
- * @details \b Outputs: Level Sensors unit is initialized.
- * @return none
- *************************************************************************/
+/*********************************************************************//**
+ * @brief
+ * The initLevelSensors function initializes the Level Sensors unit.
+ * @details \b Inputs: none
+ * @details \b Outputs: Level Sensors unit is initialized.
+ * @return none
+ *************************************************************************/
 void initLevelSensors( void )
 {
     AIR_TRAP_LEVEL_SENSORS_T airTrapLevelSensor;
@@ -61,8 +61,8 @@
         currentLevelStates[ airTrapLevelSensor ].ovInitData = AIR_TRAP_LEVEL_AIR;
         currentLevelStates[ airTrapLevelSensor ].override = OVERRIDE_RESET;
     }
-}
-
+}
+
 /*********************************************************************//**
  * @brief
  * The readLevelSensors function gets the current level sensor state
@@ -81,8 +81,8 @@
 
     // Get latest raw level sensor states from FPGA
     getFPGAAirTrapLevels( &lowAir, &highAir );
-    currentLevelStates[ AIR_TRAP_LEVEL_SENSOR_LOWER ].data = (U32)( FALSE == lowAir ? AIR_TRAP_LEVEL_FLUID : AIR_TRAP_LEVEL_AIR );
-    currentLevelStates[ AIR_TRAP_LEVEL_SENSOR_UPPER ].data = (U32)( FALSE == highAir ? AIR_TRAP_LEVEL_FLUID : AIR_TRAP_LEVEL_AIR );
+    currentLevelStates[ H17_LEVL ].data = (U32)( FALSE == lowAir ? AIR_TRAP_LEVEL_FLUID : AIR_TRAP_LEVEL_AIR );
+    currentLevelStates[ H16_LEVL ].data = (U32)( FALSE == highAir ? AIR_TRAP_LEVEL_FLUID : AIR_TRAP_LEVEL_AIR );
 
     // Debounce raw air trap level sensor readings
     for( airTrapLevelSensor = AIR_TRAP_LEVEL_FIRST; airTrapLevelSensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS; airTrapLevelSensor++ )
@@ -104,16 +104,16 @@
     }
 }
 
-/*********************************************************************//**
- * @brief
+/*********************************************************************//**
+ * @brief
  * The getLevelSensorState function gets the current debounced sensor state
  * for a given level sensor.
- * @details \b Alarm: ALARM_ID_TD_SOFTWARE_FAULT if given sensor is invalid.
- * @details \b Inputs: currentLevelStates[]
- * @details \b Outputs: none
- * @param sensor ID of level sensor to get state for.
- * @return The current state of the given level sensor.
- *************************************************************************/
+ * @details \b Alarm: ALARM_ID_TD_SOFTWARE_FAULT if given sensor is invalid.
+ * @details \b Inputs: currentLevelStates[]
+ * @details \b Outputs: none
+ * @param sensor ID of level sensor to get state for.
+ * @return The current state of the given level sensor.
+ *************************************************************************/
 AIR_TRAP_LEVELS_T getLevelSensorState( AIR_TRAP_LEVEL_SENSORS_T sensor )
 {
     AIR_TRAP_LEVELS_T result = AIR_TRAP_LEVEL_AIR;
@@ -131,7 +131,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_LEVEL_SENSOR_INVALID_SENSOR, sensor )
     }
 
-    return result;
+    return result;
 }
 
 /*********************************************************************//**
@@ -203,5 +203,5 @@
 
     return result;
 }
-
+
 /**@}*/