Index: AlarmDefs.h
===================================================================
diff -u -r423db52192055ff7131750a7c7466965a6cf25a8 -r8c577c70fc78bcb784e3ae7f2a4f0a8ab2be3603
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 423db52192055ff7131750a7c7466965a6cf25a8)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 8c577c70fc78bcb784e3ae7f2a4f0a8ab2be3603)
@@ -295,19 +295,19 @@
     ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT = 257,                               ///< DG FPGA power out timeout
     ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT = 258,                               ///< HD FPGA power out timeout
     ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE = 259,                            ///< HD temperatures out of range
-    // UI Alarms
-    ALARM_ID_UI_POST_FAILURE_FILESYSTEM     = 260,                          ///< UI POST File System Integrity failure.
-    ALARM_ID_UI_POST_FAILURE_CANBUS         = 261,                          ///< UI POST CANBus failure.
-    ALARM_ID_UI_POST_FAILURE_DISPLAY        = 262,                          ///< UI POST Display failure.
-    ALARM_ID_UI_POST_FAILURE_TOUCH          = 263,                          ///< UI POST Touch failure.
-    ALARM_ID_UI_POST_FAILURE_SDCARD         = 264,                          ///< UI POST SD-Card failure.
-    ALARM_ID_UI_POST_FAILURE_RTC            = 265,                          ///< UI POST RTC failure.
-    ALARM_ID_UI_POST_FAILURE_WIFI           = 266,                          ///< UI POST WiFi failure.
-    ALARM_ID_UI_POST_FAILURE_BLUETOOTH      = 267,                          ///< UI POST Bluetooth failure.
-    ALARM_ID_UI_POST_FAILURE_ETHERNET       = 268,                          ///< UI POST Ethernet failure.
-    ALARM_ID_UI_POST_FAILURE_SOUND          = 269,                          ///< UI POST Sound failure.
+    ALARM_ID_UI_POST_FAILURE_FILESYSTEM = 260,                              ///< UI POST File System Integrity failure.
+    ALARM_ID_UI_POST_FAILURE_CANBUS = 261,                                  ///< UI POST CANBus failure.
+    ALARM_ID_UI_POST_FAILURE_DISPLAY = 262,                                 ///< UI POST Display failure.
+    ALARM_ID_UI_POST_FAILURE_TOUCH = 263,                                   ///< UI POST Touch failure.
+    ALARM_ID_UI_POST_FAILURE_SDCARD = 264,                                  ///< UI POST SD-Card failure.
+    ALARM_ID_UI_POST_FAILURE_RTC = 265,                                     ///< UI POST RTC failure.
+    ALARM_ID_UI_POST_FAILURE_WIFI = 266,                                    ///< UI POST WiFi failure.
+    ALARM_ID_UI_POST_FAILURE_BLUETOOTH = 267,                               ///< UI POST Bluetooth failure.
+    ALARM_ID_UI_POST_FAILURE_ETHERNET = 268,                                ///< UI POST Ethernet failure.
+    ALARM_ID_UI_POST_FAILURE_SOUND = 269,                                   ///< UI POST Sound failure.
+    ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED = 270,                     ///< HD Watchdog POST failure
+    ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED = 271,                     ///< HD Watchdog POST failure
 
-
     NUM_OF_ALARM_IDS                                                        ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -696,6 +696,8 @@
     { ALARM_PRIORITY_HIGH,   999,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_BLUETOOTH,                        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   999,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_ETHERNET,                         0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   999,  FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_SOUND,                            0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED,              0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     1,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED,              0,              ALARM_ID_NO_ALARM },
 };  //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck TxLog  ID                                                        Escalate In     Escalate To
 
 /// Table of alarms and their rank.
@@ -734,6 +736,8 @@
     {   1, ALARM_ID_HD_INVALID_SERVICE_RECORD },
     {   1, ALARM_ID_DG_INVALID_SYSTEM_RECORD },
     {   1, ALARM_ID_DG_INVALID_SERVICE_RECORD },
+    {   1, ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED },
+    {   1, ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED },
     {   3, ALARM_ID_HD_SOFTWARE_FAULT },
     {   3, ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK },
     {   3, ALARM_ID_BLOOD_PUMP_OFF_CHECK },
Index: HDDefs.h
===================================================================
diff -u -ra42b3f3ff1f46c0e63d2ebcf7e6a37cc9ba2e1e9 -r8c577c70fc78bcb784e3ae7f2a4f0a8ab2be3603
--- HDDefs.h	(.../HDDefs.h)	(revision a42b3f3ff1f46c0e63d2ebcf7e6a37cc9ba2e1e9)
+++ HDDefs.h	(.../HDDefs.h)	(revision 8c577c70fc78bcb784e3ae7f2a4f0a8ab2be3603)
@@ -55,6 +55,7 @@
     POST_STATE_FW_INTEGRITY,                            ///< Run firmware integrity test state
     POST_STATE_BATTERY,                                 ///< Run battery SOC test state
     POST_STATE_WATCHDOG,                                ///< Run watchdog test state
+    POST_STATE_SAFETY_SHUTDOWN,                         ///< Run safety shutdown test state
     POST_STATE_RTC,                                     ///< Run RTC test state
     POST_STATE_NVDATAMGMT,                              ///< Run NV Data Mgmt. test state
     POST_STATE_BLOOD_FLOW,                              ///< Run blood flow test state