Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r26de67dd19c2cc0f475d1e77b4a887857841f6c1 -r6bc8195ee389210c6213fab87b14c8c5880abd54
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 26de67dd19c2cc0f475d1e77b4a887857841f6c1)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 6bc8195ee389210c6213fab87b14c8c5880abd54)
@@ -15,6 +15,7 @@
 ############################################################################
 import struct
 from .accelerometer import HDAccelerometer
+from .air_bubble import HDAirBubbles
 from .air_trap import HDAirTrap
 from .alarms import HDAlarms
 from .blood_leak import HDBloodLeak
@@ -92,6 +93,7 @@
         # Create command groups
         self.accel = HDAccelerometer(self.can_interface, self.logger)
         self.air_trap = HDAirTrap(self.can_interface, self.logger)
+        self.air_bubbles = HDAirBubbles(self.can_interface, self.logger)
         self.alarms = HDAlarms(self.can_interface, self.logger)
         self.buttons = HDButtons(self.can_interface, self.logger)
         self.blood_leak = HDBloodLeak(self.can_interface, self.logger)
Index: tests/hd_air_bubbles_data.py
===================================================================
diff -u
--- tests/hd_air_bubbles_data.py	(revision 0)
+++ tests/hd_air_bubbles_data.py	(revision 6bc8195ee389210c6213fab87b14c8c5880abd54)
@@ -0,0 +1,43 @@
+###########################################################################
+#
+# Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
+#
+# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+#
+# @file hd_blood_leak_state.py
+#
+# @author (last) Peman Montazemi
+# @date (last) 18-May-2021
+# @author (original) Peman Montazemi
+# @date (original) 18-May-2021
+#
+############################################################################
+
+import sys
+sys.path.append("..")
+from dialin.hd.hemodialysis_device import HD
+from time import sleep
+
+if __name__ == "__main__":
+    # Create an HD object called hd
+    hd = HD()
+    sleep(2)
+
+    hd.cmd_log_in_to_hd()
+    sleep(1)
+    #hd.air_bubbles.cmd_air_bubbles_data_broadcast_interval_override(100)
+
+    # Self-test state
+    #hd.air_bubbles.cmd_air_bubble_self_test_request(0)
+    #sleep(0.1)
+    #hd.air_bubbles.cmd_air_bubble_self_test_request(1)
+    #leep(0.1)
+
+    while True:
+        if hd.air_bubbles.air_bubbles_status == hd.air_bubbles.FLUID_DETECTED_STATUS:
+            status = "Fluid"
+        else:   # BUBBLE_DETECTED
+            status = "Bubble"
+        print("Status = " + status, "   State = " + str(hd.air_bubbles.air_bubbles_state))
+        sleep(0.1)