Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r4d509fa074423027c3106a209ead0beffd57cc3e -r8f2b9d878195896cf41091e97630e264f11394bb
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 4d509fa074423027c3106a209ead0beffd57cc3e)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 8f2b9d878195896cf41091e97630e264f11394bb)
@@ -39,7 +39,7 @@
 #define AIR_TRAP_FILL_TIMEOUT_MS            ( 6 * MS_PER_SECOND )                               ///< Air trap fill timeout period (in ms).
 #define AIR_PUMP_UPPER_LEVEL_PERSISTENCE    ( 100 / TASK_GENERAL_INTERVAL )                     ///< Persistence time for air pump operation after air trap upper level reads air.
 /// Persistence period for illegal level sensors fault.
-static const U32 AIR_TRAP_ILLEGAL_LEVELS_PERSISTENCE = ( MS_PER_SECOND * 2 / TASK_GENERAL_INTERVAL );
+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 )
@@ -61,7 +61,7 @@
 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 airTrapDataPublishInterval = { AIR_TRAP_DATA_PUB_INTERVAL, AIR_TRAP_DATA_PUB_INTERVAL, AIR_TRAP_DATA_PUB_INTERVAL, 0 };
 static OVERRIDE_U32_T airTrapLevels[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ];                       ///< Detected air trap level for each level sensor.
 
 static BOOL pendingStartAirTrapController = FALSE;                                          ///< Flag indicates an air trap controller start request is pending.
@@ -91,8 +91,9 @@
     U32 i;
 
     resetAirTrap();
-    airTrapIllegalLevelSensorsCtr = DATA_PUBLISH_COUNTER_START_COUNT;
-    airPumpUpperLevelCtr = 0;
+    airTrapIllegalLevelSensorsCtr      = 0;
+    airTrapDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+    airPumpUpperLevelCtr               = 0;
 
     for ( i = 0; i < NUM_OF_AIR_TRAP_LEVEL_SENSORS; i++ )
     {