Index: AlarmDefs.h
===================================================================
diff -u -r2c54b5f20c532089bd6854e15d835efb7cb021c1 -r4effb800b3fd04d9270724d2f439adc42b5f6548
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 2c54b5f20c532089bd6854e15d835efb7cb021c1)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 4effb800b3fd04d9270724d2f439adc42b5f6548)
@@ -249,13 +249,13 @@
     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_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_ARTERIAL_BUBBLE_DETECTED_RINSEBACK = 214,           ///< HD arterial air bubble detected rinseback alarm
     ALARM_ID_DG_HEATERS_SELF_TEST_FAILURE = 215,                    ///< DG heaters failed POST
     ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 216,              ///< HD venous air bubble detector self-test failure
-    ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT = 217,       ///< HD venous air bubble detector treatment fault
-    ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT = 218,       ///< HD venous air bubble detector rinseback fault
-    ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED = 219,                     ///< HD arterial bubble detected alarm
-    ALARM_ID_HD_VENOUS_BUBBLE_DETECTED = 220,                       ///< HD venous bubble detected alarm
+    ALARM_ID_AVAILABLE_6 = 217,                                     ///< HD venous air bubble detector treatment fault
+    ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK = 218,             ///< HD venous air bubble detected rinseback alarm
+    ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED = 219,                     ///< HD arterial air bubble detected alarm
+    ALARM_ID_HD_VENOUS_BUBBLE_DETECTED = 220,                       ///< HD venous air bubble detected alarm
     ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR = 221,              ///< HD blood flow sensor not being read - slow packet
     ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR = 222,              ///< HD dialysate flow sensor not being read - slow packet
     ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR = 223,                  ///< HD pump direction status error
@@ -591,11 +591,11 @@
     { 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_ARTERIAL_BUBBLE_DETECTED_RINSEBACK
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_HEATERS_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_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
+    { ALARM_PRIORITY_HIGH,     9,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE,  TRUE,  TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_AVAILABLE_6
+    { ALARM_PRIORITY_HIGH,    10,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE,  TRUE,  TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK
     { ALARM_PRIORITY_HIGH,     9,   0,              ALARM_ID_NO_ALARM,                       FALSE, TRUE , TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED
     { ALARM_PRIORITY_HIGH,     9,   0,              ALARM_ID_NO_ALARM,                       FALSE, TRUE , TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_VENOUS_BUBBLE_DETECTED
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR