Index: AlarmDefs.h
===================================================================
diff -u -rb57f2263b5045371f680667b233f2faee439262d -r139243757a9da772531d4e196c915579ad2a3837
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision b57f2263b5045371f680667b233f2faee439262d)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 139243757a9da772531d4e196c915579ad2a3837)
@@ -81,7 +81,7 @@
     ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT = 43,                        ///< DG main primary heater FPGA fault
     ALARM_ID_UI_COMM_TIMEOUT = 44,                                          ///< User interface communication timeout
     ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS = 45,                                ///< HD too many bad communications CRC
-    ALARM_ID_CAN_MESSAGE_NOT_ACKED = 46,                                    ///< System message that required acknowledgment was not acknowledged
+    ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED = 46,                                    ///< System message that required acknowledgment was not acknowledged
     ALARM_ID_UF_RATE_TOO_HIGH_ERROR = 47,                                   ///< Ultrafiltration rate is too high error during treatment
     ALARM_ID_UF_VOLUME_ACCURACY_ERROR = 48,                                 ///< Ultrafiltration volume accuracy error during treatment
     ALARM_ID_HD_FPGA_COMM_TIMEOUT = 49,                                     ///< HD FPGA communication down for too long
@@ -514,7 +514,7 @@
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_COMM_TIMEOUT,                                  0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS,                        0,              ALARM_ID_NO_ALARM },//add DG version
     //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoBRcr NoDRcr ClrOnly TxLog  ID                                                        Escalate In     Escalate To
-    { ALARM_PRIORITY_HIGH,     3,  TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_CAN_MESSAGE_NOT_ACKED,                            0,              ALARM_ID_NO_ALARM },//add DG version
+    { ALARM_PRIORITY_HIGH,     3,  TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED,                            0,              ALARM_ID_NO_ALARM },//add DG version
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UF_RATE_TOO_HIGH_ERROR,                           0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UF_VOLUME_ACCURACY_ERROR,                         0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_FPGA_COMM_TIMEOUT,                             0,              ALARM_ID_NO_ALARM },
@@ -856,7 +856,7 @@
     {   3, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT },
     {   3, ALARM_ID_UI_COMM_TIMEOUT },
     {   3, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS },
-    {   3, ALARM_ID_CAN_MESSAGE_NOT_ACKED },
+    {   3, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED },
     {   3, ALARM_ID_UF_RATE_TOO_HIGH_ERROR },
     {   3, ALARM_ID_UF_VOLUME_ACCURACY_ERROR },
     {   3, ALARM_ID_HD_FPGA_COMM_TIMEOUT },
@@ -1167,7 +1167,7 @@
      { 43  , ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT                     , "       |                                                            |                                                                                                                                                                                                                                                                                                                                                    |                                                                                                                                           |                                                                                                                                                                                                    | "},
      { 44  , ALARM_ID_UI_COMM_TIMEOUT                                       , "HD     | Machine Error                                              | Call service to schedule a repair.                                                                                                                                                                                                                                                                                                                 | User interface communication timeout                                                                                                      | If the sub-system communication timeout has occurred.  UI is 5 seconds.  DG is 2 seconds.                                                                                                          | "},
      { 45  , ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS                             , "HD     | Machine Error                                              | Call service to schedule a repair.                                                                                                                                                                                                                                                                                                                 | Too many bad CRCs detected on received system messages                                                                                    | If too many bad messages CRCs are received within a set period of time                                                                                                                             | "},
-     { 46  , ALARM_ID_CAN_MESSAGE_NOT_ACKED                                 , "???    | Machine Error                                              | Call service to schedule a repair.                                                                                                                                                                                                                                                                                                                 | System message that required acknowledgment was not acknowledged                                                                          | If no retries left in the pending acknowlegement list.                                                                                                                                             | "},
+     { 46  , ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED                                 , "???    | Machine Error                                              | Call service to schedule a repair.                                                                                                                                                                                                                                                                                                                 | System message that required acknowledgment was not acknowledged                                                                          | If no retries left in the pending acknowlegement list.                                                                                                                                             | "},
      { 47  , ALARM_ID_UF_RATE_TOO_HIGH_ERROR                                , "HD     | Ultrafiltration Error                                      | Call service to schedule a repair.                                                                                                                                                                                                                                                                                                                 | Ultrafiltration rate is too high error during treatment                                                                                   | If the UF rate > 2750.0 mL per hour.                                                                                                                                                               | "},
      { 48  , ALARM_ID_UF_VOLUME_ACCURACY_ERROR                              , "HD     | Ultrafiltration Error                                      | Call service to schedule a repair.                                                                                                                                                                                                                                                                                                                 | Ultrafiltration volume accuracy error during treatment                                                                                    | If the UF volume (refUFvolume - measureVolume) > 250.0 mL.                                                                                                                                         | "},
      { 49  , ALARM_ID_HD_FPGA_COMM_TIMEOUT                                  , "HD     | Machine Error                                              | Call service to schedule a repair.                                                                                                                                                                                                                                                                                                                 | HD FPGA communication down for too long                                                                                                   | If retries for commands > 5 counts.                                                                                                                                                                | "},