Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r28741ce21fea6cf6bbcb59c691c56629e4d061b6 -r59db8aee013909ad99e034b638b27e16a2d88df7
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 28741ce21fea6cf6bbcb59c691c56629e4d061b6)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 59db8aee013909ad99e034b638b27e16a2d88df7)
@@ -96,8 +96,8 @@
 
 static BOOL airTrapHasDetectedFaultMode;                                                          ///< Flag indicates air trap unit has handled transition to fault mode.
 
-static U32 airTrapLowerEventCount;                                                                ///< Air trap lower event count flag
-static U32 airTrapLowerEventStartTime;                                                            ///< Air trap lower event start time flag
+static U32 airTrapLowerEventCount;                                                                ///< Air trap lower event count
+static U32 airTrapLowerEventStartTime;                                                            ///< Air trap lower event start time
 
 // ********** private function prototypes **********
 
@@ -257,7 +257,8 @@
  * @brief
  * The execAirTrapMonitorTreatment function executes the air trap monitor
  * for treatment mode.
- * @details \b Alarm: ALARM_ID_TD_AIR_TRAP_FILL_DURING_TREATMENT if air trap
+ * @details \b Alarm: ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS,
+ * ALARM_ID_TD_AIR_TRAP_FILL_DURING_TREATMENT,  if air trap
  * fill exceeds maximum allowed time to complete.
  * @details \b Inputs: airTrapControllerState, fillStartTime
  * @details \b Outputs: none
@@ -291,7 +292,8 @@
         }
     }
     // Check repeated air trap lower events alarm
-    if ( ( airTrapLowerEventCount >= AIR_TRAP_REPEATED_LOWER_EVENT_LIMIT ) && ( FALSE == didTimeout( airTrapLowerEventStartTime, AIR_TRAP_REPEATED_LOWER_EVENTS_TIMEOUT_MS ) ) )
+    if ( ( airTrapLowerEventCount >= AIR_TRAP_REPEATED_LOWER_EVENT_LIMIT ) &&
+         ( FALSE == didTimeout( airTrapLowerEventStartTime, AIR_TRAP_REPEATED_LOWER_EVENTS_TIMEOUT_MS ) ) )
     {
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS, airTrapLowerEventCount, 0 )
     }
@@ -403,8 +405,8 @@
  * The handleAirTrapClosedState function handles the closed state of the
  * air trap.
  * @details \b Message \b Sent: MSG_ID_TD_EVENT if starting a level change.
- * @details \b Inputs: pendingStopAirTrapController
- * @details \b Outputs: none
+ * @details \b Inputs: pendingStopAirTrapController, airTrapLowerEventCount
+ * @details \b Outputs: airTrapLowerEventStartTime, airTrapLowerEventCount
  * @return next state
  *************************************************************************/
 static AIR_TRAP_STATE_T handleAirTrapClosedState( void )