Index: firmware/App/Monitors/Bubbles.c
===================================================================
diff -u -r494b19c85bdea2b8fc273c648b4f1955f9d07dc3 -r0c8ae7b952186d912c77d8c2cfb7dad809fa5225
--- firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision 494b19c85bdea2b8fc273c648b4f1955f9d07dc3)
+++ firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision 0c8ae7b952186d912c77d8c2cfb7dad809fa5225)
@@ -20,7 +20,6 @@
 #include "FpgaTD.h"
 #include "Messaging.h"
 #include "OperationModes.h"
-#include "TaskGeneral.h"
 #include "TaskPriority.h"
 #include "Timers.h"
 
@@ -64,7 +63,7 @@
 
 /*********************************************************************//**
  * @brief
- * The initBubbles function initializes the air bubble detectors module.
+ * The initBubbles function initializes the air bubble monitor unit.
  * @details \b Inputs: none
  * @details \b Outputs: Air bubble monitor unit initialized.
  * @return none
@@ -92,8 +91,9 @@
 /*********************************************************************//**
  * @brief
  * The execBubbles function executes the air bubble monitor state machine.
- * @details \b Inputs: bubblesState
- * @details \b Outputs: bubblesState
+ * @details \b Alarm: ALARM_ID_TD_SOFTWARE_FAULT if invalid bubble monitor state.
+ * @details \b Inputs: bubblesState[]
+ * @details \b Outputs: bubblesState[]
  * @return none
  *************************************************************************/
 void execBubbles( void )
@@ -192,7 +192,7 @@
  * @brief
  * The handleBubbleNormalState function handles a given air bubble module
  * in normal state.
- * @details \b Alarm: ALARM_ID_HD_VENOUS_BUBBLE_DETECTED if venous bubble detected.
+ * @details \b Alarm: ALARM_ID_TD_VENOUS_BUBBLE_DETECTED if venous bubble detected.
  * @details \b Alarm: ALARM_ID_TD_SOFTWARE_FAULT if given bubble sensor is invalid.
  * @details \b Inputs: none
  * @details \b Outputs: bubblesSelfTestStatus
@@ -202,7 +202,6 @@
 static BUBBLE_STATES_T handleBubbleNormalState( BUBBLE_DETECTOR_T bubble )
 {
     BUBBLE_STATES_T state = BUBBLE_NORMAL_STATE;
-//    TREATMENT_STATE_T treatmentState = getTreatmentState();
 
     if ( bubble < NUM_OF_BUBBLE_DETECTORS )
     {
@@ -215,7 +214,7 @@
             if ( ( BUBBLE_DETECTED == getBubbleDetectedState( bubble ) ) &&
                  ( bubbleDetectionEnabled[ bubble ] != FALSE ) )
             {
-//                activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
+                activateAlarmNoData( ALARM_ID_TD_VENOUS_BUBBLE_DETECTED );
             }
         }
 
@@ -341,7 +340,7 @@
         if ( OVERRIDE_OVERRIDE == ovType )
         {
             U32 value = override.state.u32;
-            U32 intvl = value / TASK_GENERAL_INTERVAL;
+            U32 intvl = value / TASK_PRIORITY_INTERVAL;
 
             if ( intvl > 0 )
             {