Index: firmware/App/Controllers/AirTrap.h
===================================================================
diff -u -r7092920786ccf9d52c00b84c6f47ccebc4d28118 -r8d3dbd25627fb7e993409eb47b2575e0430afddd
--- firmware/App/Controllers/AirTrap.h	(.../AirTrap.h)	(revision 7092920786ccf9d52c00b84c6f47ccebc4d28118)
+++ firmware/App/Controllers/AirTrap.h	(.../AirTrap.h)	(revision 8d3dbd25627fb7e993409eb47b2575e0430afddd)
@@ -14,40 +14,42 @@
 * @date    (original)  16-Sep-2020
 *
 ***************************************************************************/
-
-#ifndef __AIR_TRAP_H__
-#define __AIR_TRAP_H__
-
-#include "HDCommon.h"
-
-/**
- *  @defgroup AirTrap AirTrap
- *  @brief Air Trap valve controller / level sensor monitor module.  Monitors the
+
+#ifndef __AIR_TRAP_H__
+#define __AIR_TRAP_H__
+
+#include "HDCommon.h"
+
+/**
+ *  @defgroup AirTrap AirTrap
+ *  @brief Air Trap valve controller / level sensor monitor module.  Monitors the
  *  air trap level sensors.  Controls the air trap valve when level controlling is
- *  turned on.
- *
- *  @addtogroup AirTrap
- *  @{
- */
-
-// ********** public definitions **********
-
-/// Enumeration of air trap level sensors monitored by this module.
-typedef enum AirTrapLevelSensors
-{
-    AIR_TRAP_LEVEL_SENSOR_LOWER = 0,        ///< Lower air trap sensor
-    AIR_TRAP_LEVEL_SENSOR_UPPER,            ///< Upper air trap sensor
-    NUM_OF_AIR_TRAP_LEVEL_SENSORS           ///< Number of air trap sensors
-} AIR_TRAP_LEVEL_SENSORS_T;
-
-/// Enumeration of air trap level sensor levels.
-typedef enum AirTrapLevelSensorLevels
-{
-    AIR_TRAP_LEVEL_AIR = 0,                 ///< Air trap level sensor detects air
-    AIR_TRAP_LEVEL_FLUID,                   ///< Air trap level sensor detects fluid
-    NUM_OF_AIR_TRAP_LEVELS                  ///< Number of air trap level sensor levels
-} AIR_TRAP_LEVELS_T;
-
+ *  turned on.
+ *
+ *  @addtogroup AirTrap
+ *  @{
+ */
+
+// ********** public definitions **********
+
+#define AIR_TRAP_FILL_BLOOD_FLOW_RATE  150  ///< Blood flow rate (mL/min) at which an air trap fill is done.
+
+/// Enumeration of air trap level sensors monitored by this module.
+typedef enum AirTrapLevelSensors
+{
+    AIR_TRAP_LEVEL_SENSOR_LOWER = 0,        ///< Lower air trap sensor
+    AIR_TRAP_LEVEL_SENSOR_UPPER,            ///< Upper air trap sensor
+    NUM_OF_AIR_TRAP_LEVEL_SENSORS           ///< Number of air trap sensors
+} AIR_TRAP_LEVEL_SENSORS_T;
+
+/// Enumeration of air trap level sensor levels.
+typedef enum AirTrapLevelSensorLevels
+{
+    AIR_TRAP_LEVEL_AIR = 0,                 ///< Air trap level sensor detects air
+    AIR_TRAP_LEVEL_FLUID,                   ///< Air trap level sensor detects fluid
+    NUM_OF_AIR_TRAP_LEVELS                  ///< Number of air trap level sensor levels
+} AIR_TRAP_LEVELS_T;
+
 /// Payload record structure for air trap data broadcast message
 typedef struct
 {
@@ -57,28 +59,29 @@
     U32 rawUpperLevel;                      ///< Raw Upper air trap level sensor state
 } AIR_TRAP_PAYLOAD_T;
 
-// ********** public function prototypes **********
-
+// ********** public function prototypes **********
+
 void initAirTrap( void );
-void resetAirTrap( void );
+void resetAirTrap( void );
 void execAirTrapController( void );
 void execAirTrapMonitor( void );
-void execAirTrapMonitorTreatment( void );
-
-void startAirTrapControl( void );
+void execAirTrapMonitorTreatment( void );
+
+void startAirTrapControl( void );
 void endAirTrapControl( void );
 BOOL isAirTrapControlling( void );
-
+BOOL isAirTrapFillInProgress( void );
+
 AIR_TRAP_LEVELS_T getAirTrapLevel( AIR_TRAP_LEVEL_SENSORS_T sensor );
 AIR_TRAP_LEVELS_T getRawAirTrapLevel( AIR_TRAP_LEVEL_SENSORS_T sensor );
 
-BOOL testSetAirTrapDataPublishIntervalOverride( U32 value );
-BOOL testResetAirTrapDataPublishIntervalOverride( void );
-BOOL testSetAirTrapLevelOverride( AIR_TRAP_LEVEL_SENSORS_T sensor, AIR_TRAP_LEVELS_T level );
+BOOL testSetAirTrapDataPublishIntervalOverride( U32 value );
+BOOL testResetAirTrapDataPublishIntervalOverride( void );
+BOOL testSetAirTrapLevelOverride( AIR_TRAP_LEVEL_SENSORS_T sensor, AIR_TRAP_LEVELS_T level );
 BOOL testResetAirTrapLevelOverride( AIR_TRAP_LEVEL_SENSORS_T sensor );
 BOOL testSetRawAirTrapLevelOverride( AIR_TRAP_LEVEL_SENSORS_T sensor, AIR_TRAP_LEVELS_T level );
-BOOL testResetRawAirTrapLevelOverride( AIR_TRAP_LEVEL_SENSORS_T sensor );
-
-/**@}*/
-
-#endif
+BOOL testResetRawAirTrapLevelOverride( AIR_TRAP_LEVEL_SENSORS_T sensor );
+
+/**@}*/
+
+#endif