Index: AlarmDefs.h
===================================================================
diff -u -r2286870bb6faeaaed144b43e7f1af253ba0e3689 -r0cb1008e8419fb38d89ca2ebcbff68d8141bd111
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 2286870bb6faeaaed144b43e7f1af253ba0e3689)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 0cb1008e8419fb38d89ca2ebcbff68d8141bd111)
@@ -64,7 +64,11 @@
     ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD,                  ///< HD accelerometer invalid calibration record
     ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD,                      ///< HD blood flow invalid calibration record
     ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD,                  ///< HD dialyzer flow invalid calibration record
-    ALARM_ID_HD_HEPARING_FORCE_SENSOR_INVALID_CAL_RECORD,           ///< HD heparin force sensor invalid calibration record
+    ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD,            ///< HD heparin force sensor invalid calibration record
+    ALARM_ID_HD_INVALID_SYSTEM_RECORD,                              ///< HD invalid system record
+    ALARM_ID_HD_INVALID_SERVICE_RECORD,                             ///< HD invalid service record
+    ALARM_ID_DG_INVALID_SYSTEM_RECORD,                              ///< DG invalid sytem record
+    ALARM_ID_DG_INVALID_SERVICE_RECORD,                             ///< DG invalid service record
     ALARM_ID_HD_SOFTWARE_FAULT,                                     ///< HD Software fault. Software found itself in an unexpected state
     ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK,                           ///< Blood pump failed motor controller current check.  Too high when pump should be off or out of range when pump should be running
     ALARM_ID_BLOOD_PUMP_OFF_CHECK,                                  ///< Blood pump failed motor off check.  Measured speed while commanded off
@@ -425,7 +429,11 @@
     { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD,             0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD,                 0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD,             0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_HEPARING_FORCE_SENSOR_INVALID_CAL_RECORD,      0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD,       0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_INVALID_SYSTEM_RECORD,                         0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_INVALID_SERVICE_RECORD,                        0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_INVALID_SYSTEM_RECORD,                         0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     1,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_INVALID_SERVICE_RECORD,                        0,              ALARM_ID_NO_ALARM },
 
     // Machine fault high priority alarms
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_SOFTWARE_FAULT,                                0,              ALARM_ID_NO_ALARM },