Index: AlarmDefs.h
===================================================================
diff -u -r62790e47e7aeb79f59c25a7d4f4340b9d667fd88 -rfc70939a0d02c63ebe0ca039c17320014304136b
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 62790e47e7aeb79f59c25a7d4f4340b9d667fd88)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision fc70939a0d02c63ebe0ca039c17320014304136b)
@@ -248,8 +248,11 @@
     ALARM_ID_HD_DP_FLOW_SENSOR_ERROR = 210,                         ///< HD dialysate flow sensor error
     ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT = 211,           ///< DG chemical disinfect could not reach to target temperature
     ALARM_ID_DG_FPGA_POST_TEST_FAILED = 212,                        ///< DG FPGA POST failure
-    ALARM_ID_HD_ARTERIAL_BUBBLE_FAULT = 213,                        ///< HD arterial air bubble detector fault
-    ALARM_ID_HD_VENOUS_BUBBLE_FAULT = 214,                          ///< HD venous air bubble detector fault
+    ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE = 213,            ///< HD arterial air bubble detector self-test failure
+    ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTOR_FAULT = 214,               ///< HD arterial air bubble detector fault
+    ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 215,              ///< HD venous air bubble detector self-test failure
+    ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT = 216,       ///< HD venous air bubble detector treatment fault
+    ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT = 217,       ///< HD venous air bubble detector rinseback fault
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -578,6 +581,11 @@
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_DP_FLOW_SENSOR_ERROR
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT
     { ALARM_PRIORITY_HIGH,     1,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_FPGA_POST_TEST_FAILED
+    { ALARM_PRIORITY_HIGH,     9,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE
+    { ALARM_PRIORITY_HIGH,     9,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTOR_FAULT
+    { ALARM_PRIORITY_HIGH,     9,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE
+    { ALARM_PRIORITY_HIGH,     9,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT
+    { ALARM_PRIORITY_HIGH,    10,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT
     // Priority              Rank   Escalate In     Escalate To                              Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck
 };