Index: AlarmDefs.h
===================================================================
diff -u -rb9bbf97360faf3c4d801419b309e4052e323fd2f -r3379ea368a12543304f2d9c7491d2e0aa19c5f66
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision b9bbf97360faf3c4d801419b309e4052e323fd2f)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 3379ea368a12543304f2d9c7491d2e0aa19c5f66)
@@ -101,7 +101,7 @@
     ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 63,                           ///< FPGA reports failure reading arterial pressure sensor
     ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 64,                             ///< FPGA reports failure reading venous pressure sensor
     ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 65,                       ///< HD requests DG command with invalid parameter fault
-    ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID = 66,               ///< DG non-volatile calibration group invalid record CRC
+    ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID = 66,                      ///< DG non-volatile calibration group invalid record CRC TODO remove this alarm when merging DEN-9480 into staging
     ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE = 67,                        ///< HD blood pump occlusion self-test failure alarm
     ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE = 68,                       ///< HD dialysate inlet pump occlusion self-test failure alarm
     ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE = 69,                       ///< HD dialysate outlet pump occlusion self-test failure alarm
@@ -140,7 +140,7 @@
     ALARM_ID_RTC_COMM_ERROR = 102,                                          ///< Real-time clock communication error
     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_SYSTEM_GROUP_RECORD_CRC_INVALID = 105,           ///< DG non-volatile system group invalid record CRC
+    ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 105,           ///< DG non-volatile system group invalid record CRC
     ALARM_ID_DG_NVDATAMGMT_SERVICE_GROUP_RECORD_CRC_INVALID = 106,          ///< DG non-volatile service group invalid record CRC
     ALARM_ID_DG_RESTARTED_FAULT = 107,                                      ///< HD reports DG restarted fault
     ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR = 108,                               ///< HD syringe pump ADC error
@@ -542,9 +542,9 @@
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , 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 , 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 , TRUE , FALSE, FALSE, ALARM_ID_RTC_COMM_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_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID,             0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , 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 , TRUE , FALSE, TRUE,  ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS,                          0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_NVDATAMGMT_SYSTEM_GROUP_RECORD_CRC_INVALID,    0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  TRUE , 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 },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_NVDATAMGMT_SERVICE_GROUP_RECORD_CRC_INVALID,   0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_RESTARTED_FAULT,                               0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR,                        0,              ALARM_ID_NO_ALARM },
@@ -846,7 +846,7 @@
     {   3, ALARM_ID_RTC_COMM_ERROR },
     {   3, ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID },
     {   3, ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS },
-    {   3, ALARM_ID_DG_NVDATAMGMT_SYSTEM_GROUP_RECORD_CRC_INVALID },
+    {   3, ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID },
     {   3, ALARM_ID_DG_NVDATAMGMT_SERVICE_GROUP_RECORD_CRC_INVALID },
     {   3, ALARM_ID_DG_RESTARTED_FAULT },
     {   3, ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR },