Index: firmware/App/Monitors/Bubbles.c
===================================================================
diff -u -rca46a119bf717b09ae9d02f36382f75576ca9a5e -r63e0be64e4c6bc78e4d46ab01b3a322284c2ed04
--- firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision ca46a119bf717b09ae9d02f36382f75576ca9a5e)
+++ firmware/App/Monitors/Bubbles.c	(.../Bubbles.c)	(revision 63e0be64e4c6bc78e4d46ab01b3a322284c2ed04)
@@ -259,7 +259,7 @@
  * The handleBubbleDisabledState function handles a given air bubble module
  * in disable state.
  * @details \b Alarm: ALARM_ID_TD_SOFTWARE_FAULT if given bubble sensor is invalid.
- * @details \b Inputs: none
+ * @details \b Inputs: bubblesSelfTestRequested, bubbleDetectionEnabled.
  * @details \b Outputs: bubblesSelfTestStatus
  * @param bubble ID of bubble detector to execute disable state for
  * @return next state
@@ -281,7 +281,7 @@
             {
                 setFPGAVenousBubbleSelfTest();
             }
-            bubblesSelfTestStartTime[ bubble ] = getMSTimerCount();
+            bubblesSelfTestStatus[ bubble ] = getMSTimerCount();
         }
         else if ( bubbleDetectionEnabled[ bubble ] != FALSE )
         {
@@ -300,7 +300,7 @@
  * The handleBubbleSelfTestState function handles a given air bubble detector
  * in self-test state.
  * @details \b Alarm: ALARM_ID_TD_SOFTWARE_FAULT if given bubble sensor is invalid.
- * @details \b Inputs: bubblesSelfTestStatus
+ * @details \b Inputs: bubblesSelfTestStatus, bubblesSelfTestStartTime.
  * @details \b Outputs: bubblesSelfTestStatus
  * @param bubble ID of bubble detector to execute self-test state for
  * @return next state
@@ -354,10 +354,11 @@
 
 /*********************************************************************//**
  * @brief
- * The publishBubblesData function publishes air bubble detectors data at
- * the set interval.
- * @details \b Inputs: status, bubblesState
- * @details \b Outputs: if broadcast is due, send air bubble detectors data
+ * The publishBubblesData function publishes air bubble detectors data to
+ * broadcast message.
+ * @details \b Message \b Sent: MSG_ID_TD_BUBBLES_DATA
+ * @details \b Inputs: bubblesDataPublicationTimerCounter, currentBubbleState
+ * @details \b Outputs: bubblesDataPublicationTimerCounter
  * @return none
  *************************************************************************/
 static void publishBubblesData( void )
Index: firmware/App/Monitors/Bubbles.h
===================================================================
diff -u -r92f941f177999a7d55f072e08f0dbecf0c0a62ee -r63e0be64e4c6bc78e4d46ab01b3a322284c2ed04
--- firmware/App/Monitors/Bubbles.h	(.../Bubbles.h)	(revision 92f941f177999a7d55f072e08f0dbecf0c0a62ee)
+++ firmware/App/Monitors/Bubbles.h	(.../Bubbles.h)	(revision 63e0be64e4c6bc78e4d46ab01b3a322284c2ed04)
@@ -34,12 +34,14 @@
 
 // ********** public definitions **********
 
+#pragma pack(push,1)
 /// Bubble detectors data publish
 typedef struct
 {
     U32 h18Status;                          ///< Venous bubble detector status
     U32 h18State;                           ///< Venous bubble detector state
 } BUBBLES_DATA_T;
+#pragma pack(pop)
 
 // ********** public function prototypes **********