Index: AlarmDefs.h
===================================================================
diff -u -rfb2f03c013a4452cf90e4c1048aeaa34b8c7dd43 -r6069c489e186c8834af63a2ff661a0555108cfc4
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision fb2f03c013a4452cf90e4c1048aeaa34b8c7dd43)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 6069c489e186c8834af63a2ff661a0555108cfc4)
@@ -137,7 +137,7 @@
     ALARM_ID_HD_SYRINGE_PUMP_STALL = 99,                                    ///< HD syringe pump stall alarm
     ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 100,                            ///< HD no cartridge self-test timeout
     ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT = 101,                                ///< HD dry self-test timeout
-    ALARM_ID_SERVICE_MODE = 102,                                            ///< System is in service mode
+    ALARM_ID_AVAILABLE_1 = 102,                                             ///< Alarm available for use
     ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 103,              ///< HD non-volatile calibration group invalid record CRC
     ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS = 104,                                 ///< Air trap level sensors reporting illegal combination of air/fluid
     ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 105,              ///< DG non-volatile system group invalid record CRC
@@ -549,7 +549,7 @@
     //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoRcr ClrOnly TxLog  ID                                                        Escalate In     Escalate To
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT,                     0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT,                         0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_SERVICE_MODE,                                     0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_1,                                     0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE, FALSE, ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID,       0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE,  ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS,                          0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     1,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID,       0,              ALARM_ID_NO_ALARM },
@@ -864,7 +864,7 @@
     {   3, ALARM_ID_HD_SYRINGE_PUMP_STALL },
     {   3, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT },
     {   3, ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT },
-    {   3, ALARM_ID_SERVICE_MODE },
+    {   3, ALARM_ID_AVAILABLE_1 },
     {   3, ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID },
     {   3, ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS },
     {   3, ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY },
Index: MsgDefs.h
===================================================================
diff -u -r964a33bd9ba9a6257c6d0f2017586d82ef72b242 -r6069c489e186c8834af63a2ff661a0555108cfc4
--- MsgDefs.h	(.../MsgDefs.h)	(revision 964a33bd9ba9a6257c6d0f2017586d82ef72b242)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 6069c489e186c8834af63a2ff661a0555108cfc4)
@@ -344,7 +344,6 @@
     MSG_ID_HD_SEND_USAGE_INFO_RECORD = 0x8080,                          ///< HD send usage information record
     MSG_ID_HD_SET_BLOOD_LEAK_2_EMB_MODE = 0x8081,                       ///< HD set blood leak sensor to embedded mode
     MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND = 0x8082,                 ///< HD set blood leak embedded mode command
-    MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_SET_POINT = 0x8083,               ///< HD set blood leak embedded mode set point.
 
     MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000,                            ///< First DG test message ID
     MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE,    ///< DG tester log-in