Index: AlarmDefs.h
===================================================================
diff -u -r3e9c8d16e41646b5483a64247bdcc366d5f4ed8e -rcabc6d564f44e18c057908137cc867d56018059a
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 3e9c8d16e41646b5483a64247bdcc366d5f4ed8e)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision cabc6d564f44e18c057908137cc867d56018059a)
@@ -264,6 +264,8 @@
     ALARM_ID_HD_SYRINGE_PUMP_STALL = 226,                           ///< HD syringe pump stall alarm
     ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED = 227,                   ///< HD firmware image integrity POST test failed
     ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED = 228,                   ///< DG firmware image integrity POST test failed
+    ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 229,                    ///< HD no cartridge self-test timeout
+    ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT = 230,                        ///< HD dry self-test timeout
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -603,6 +605,8 @@
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_STALL
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED
+    { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT
+    { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT
     // Priority              Rank   Escalate In     Escalate To                              Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck
 };