Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r61153247029a9a246ca1beadc66d772e3e583e4e -r37a8a58b766a496b39241dd7ae46dc10dbda35e4
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 61153247029a9a246ca1beadc66d772e3e583e4e)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 37a8a58b766a496b39241dd7ae46dc10dbda35e4)
@@ -78,9 +78,8 @@
 /*********************************************************************//**
  * @brief
  * The initAirTrap function initializes the Air Trap module.
- * @details
- * Inputs : none
- * Outputs : Air Trap module initialized.
+ * @details Inputs: none
+ * @details Outputs: Air Trap module initialized.
  * @return none
  *************************************************************************/
 void initAirTrap( void )
@@ -93,9 +92,8 @@
  * @brief
  * The resetAirTrap function resets certain parts of the air trap module
  * between treatments.
- * @details
- * Inputs : none
- * Outputs : Air Trap module reset.
+ * @details Inputs: none
+ * @details Outputs: Air Trap module reset.
  * @return none
  *************************************************************************/
 void resetAirTrap( void )
@@ -108,9 +106,8 @@
 /*********************************************************************//**
  * @brief
  * The startAirTrapControl function requests a start to air trap control.
- * @details
- * Inputs : airTrapControllerState
- * Outputs : pendingStartAirTrapController
+ * @details Inputs: airTrapControllerState
+ * @details Outputs: pendingStartAirTrapController
  * @return none
  *************************************************************************/
 void startAirTrapControl( void )
@@ -124,9 +121,8 @@
 /*********************************************************************//**
  * @brief
  * The endAirTrapControl function requests a stop to air trap control.
- * @details
- * Inputs : airTrapControllerState
- * Outputs : pendingStopAirTrapController
+ * @details Inputs: airTrapControllerState
+ * @details Outputs: pendingStopAirTrapController
  * @return none
  *************************************************************************/
 void endAirTrapControl( void )
@@ -142,9 +138,8 @@
  * @brief
  * The isAirTrapControlling function determines whether the air trap is
  * currently controlling.
- * @details
- * Inputs : airTrapControllerState
- * Outputs : none
+ * @details Inputs: airTrapControllerState
+ * @details Outputs: none
  * @return TRUE if air trap is currently controlling, FALSE if not.
  *************************************************************************/
 BOOL isAirTrapControlling( void )
@@ -162,9 +157,8 @@
 /*********************************************************************//**
  * @brief
  * The execAirTrapMonitor function executes the air trap monitor.
- * @details
- * Inputs : TBD
- * Outputs : airTrapLevels[]
+ * @details Inputs: TBD
+ * @details Outputs: airTrapLevels[]
  * @return none
  *************************************************************************/
 void execAirTrapMonitor( void )
@@ -187,9 +181,8 @@
 /*********************************************************************//**
  * @brief
  * The execAirTrapController function executes the air trap control state machine.
- * @details
- * Inputs : airTrapControllerState
- * Outputs : airTrapControllerState
+ * @details Inputs: airTrapControllerState
+ * @details Outputs: airTrapControllerState
  * @return none
  *************************************************************************/
 void execAirTrapController( void )
@@ -227,9 +220,8 @@
  * @brief
  * The handleAirTrapManualControlState function handles the manual control
  * state of the air trap.
- * @details
- * Inputs : pendingStartAirTrapController
- * Outputs : none
+ * @details Inputs: pendingStartAirTrapController
+ * @details Outputs: none
  * @return next state
  *************************************************************************/
 static AIR_TRAP_STATE_T handleAirTrapManualControlState( void )
@@ -251,9 +243,8 @@
  * @brief
  * The handleAirTrapValveClosedState function handles the valve closed state
  * of the air trap.
- * @details
- * Inputs : pendingStopAirTrapController, airTrapLevels[]
- * Outputs : none
+ * @details Inputs: pendingStopAirTrapController, airTrapLevels[]
+ * @details Outputs: none
  * @return next state
  *************************************************************************/
 static AIR_TRAP_STATE_T handleAirTrapValveClosedState( void )
@@ -280,9 +271,8 @@
  * @brief
  * The handleAirTrapValveOpenState function handles the valve open state of
  * the air trap.
- * @details
- * Inputs : pendingStopAirTrapController, airTrapLevels[]
- * Outputs : none
+ * @details Inputs: pendingStopAirTrapController, airTrapLevels[]
+ * @details Outputs: none
  * @return next state
  *************************************************************************/
 static AIR_TRAP_STATE_T handleAirTrapValveOpenState( void )
@@ -309,9 +299,8 @@
  * @brief
  * The getAirTrapLevel function gets the current reading for the given
  * level sensor.
- * @details
- * Inputs : airTrapLevels[]
- * Outputs : none
+ * @details Inputs: airTrapLevels[]
+ * @details Outputs: none
  * @param sensor ID of level sensor to get reading for
  * @return the current level sensor reading for the given sensor (air or fluid).
  *************************************************************************/
@@ -340,9 +329,8 @@
  * @brief
  * The getPublishAirTrapDataInterval function gets the air trap data
  * publication interval.
- * @details
- * Inputs : airTrapDataPublishInterval
- * Outputs : none
+ * @details Inputs: airTrapDataPublishInterval
+ * @details Outputs: none
  * @return the current air trap data publication interval (in task intervals).
  *************************************************************************/
 static U32  getPublishAirTrapDataInterval( void )
@@ -360,9 +348,8 @@
 /*********************************************************************//**
  * @brief
  * The publishAirTrapData function publishes air trap data at the set interval.
- * @details
- * Inputs : airTrapLevels[]
- * Outputs : if broadcast is due, send air trap data
+ * @details Inputs: airTrapLevels[]
+ * @details Outputs: if broadcast is due, send air trap data
  * @return none
  *************************************************************************/
 static void publishAirTrapData( void )
@@ -382,9 +369,8 @@
  * @brief
  * The execAirTrapTest function executes the state machine for the air trap
  * self-test.
- * @details
- * Inputs : none
- * Outputs : none
+ * @details Inputs: none
+ * @details Outputs: none
  * @return the current state of the PresOccl self-test.
  *************************************************************************/
 SELF_TEST_STATUS_T execAirTrapTest( void )
@@ -406,9 +392,8 @@
  * @brief
  * The testSetAirTrapDataPublishIntervalOverride function overrides the
  * air trap data publish interval.
- * @details
- * Inputs : none
- * Outputs : airTrapDataPublishInterval
+ * @details Inputs: none
+ * @details Outputs: airTrapDataPublishInterval
  * @param value override air trap data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
@@ -432,9 +417,8 @@
  * @brief
  * The testResetAirTrapDataPublishIntervalOverride function resets the override
  * of the air trap data publish interval.
- * @details
- * Inputs : none
- * Outputs : airTrapDataPublishInterval
+ * @details Inputs: none
+ * @details Outputs: airTrapDataPublishInterval
  * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetAirTrapDataPublishIntervalOverride( void )
@@ -455,9 +439,8 @@
  * @brief
  * The testSetAirTrapLevelOverride function overrides the measured level
  * for a given level sensor.
- * @details
- * Inputs : none
- * Outputs : airTrapLevels[]
+ * @details Inputs: none
+ * @details Outputs: airTrapLevels[]
  * @param sensor ID of level sensor to override
  * @param level override level sensor with this
  * @return TRUE if override successful, FALSE if not
@@ -483,9 +466,8 @@
  * @brief
  * The testResetAirTrapLevelOverride function resets the override of the
  * level sensor.
- * @details
- * Inputs : none
- * Outputs : airTrapLevels[]
+ * @details Inputs: none
+ * @details Outputs: airTrapLevels[]
  * @param sensor ID of level sensor to reset override
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/