Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -ra7675f3c917b632cf16207fc7ccfc1f38eb83f9b -r1c7149a0ff9ea2497c7765128ba24404fd49a30c
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision a7675f3c917b632cf16207fc7ccfc1f38eb83f9b)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 1c7149a0ff9ea2497c7765128ba24404fd49a30c)
@@ -38,23 +38,23 @@
 static const U32 AIR_TRAP_ILLEGAL_LEVELS_PERSISTENCE = ( MS_PER_SECOND * 2 / TASK_PRIORITY_INTERVAL );
 /// Volume (in mL) of venous portion of blood circuit line.  TODO - get actual volume from Systems.
 #define VENOUS_LINE_VOLUME_ML               ( 200.0F )
-#define DATA_PUBLISH_COUNTER_START_COUNT    7                                                      ///< Data publish counter start count.
-
-/// Defined states for the air trap controller state machine.
-typedef enum AirTrap_States
-{
-    AIR_TRAP_INIT_STATE = 0,                ///< Initialization state
+#define DATA_PUBLISH_COUNTER_START_COUNT    7                                                      ///< Data publish counter start count.
+
+/// Defined states for the air trap controller state machine.
+typedef enum AirTrap_States
+{
+    AIR_TRAP_INIT_STATE = 0,                ///< Initialization state
     AIR_TRAP_MANUAL_CONTROL_STATE,          ///< Manually control air trap valve state
     AIR_TRAP_VALVE_CLOSED_STATE,            ///< Valve closed state - until air detected at lower level
-    AIR_TRAP_VALVE_OPEN_STATE,              ///< Valve open state - until fluid detected at upper level
-    NUM_OF_AIR_TRAP_STATES                  ///< Number of air trap controller states
-} AIR_TRAP_STATE_T;
-
-// ********** private data **********
-
-static AIR_TRAP_STATE_T airTrapControllerState;                                             ///< Current state of air trap controller state machine.
-static U32 airTrapDataPublicationTimerCounter;                                              ///< Used to schedule air trap data publication to CAN bus.
+    AIR_TRAP_VALVE_OPEN_STATE,              ///< Valve open state - until fluid detected at upper level
+    NUM_OF_AIR_TRAP_STATES                  ///< Number of air trap controller states
+} AIR_TRAP_STATE_T;
 
+// ********** private data **********
+
+static AIR_TRAP_STATE_T airTrapControllerState;                                             ///< Current state of air trap controller state machine.
+static U32 airTrapDataPublicationTimerCounter;                                              ///< Used to schedule air trap data publication to CAN bus.
+
 /// 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.
@@ -353,6 +353,7 @@
         result = AIR_TRAP_VALVE_CLOSED_STATE;
     }
 
+
     return result;
 }