Index: AlarmDefs.h
===================================================================
diff -u -r62790e47e7aeb79f59c25a7d4f4340b9d667fd88 -rc59c9f6929055b3dd5d59fd025beb92f8201b7fc
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 62790e47e7aeb79f59c25a7d4f4340b9d667fd88)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision c59c9f6929055b3dd5d59fd025beb92f8201b7fc)
@@ -250,6 +250,7 @@
     ALARM_ID_DG_FPGA_POST_TEST_FAILED = 212,                        ///< DG FPGA POST failure
     ALARM_ID_HD_ARTERIAL_BUBBLE_FAULT = 213,                        ///< HD arterial air bubble detector fault
     ALARM_ID_HD_VENOUS_BUBBLE_FAULT = 214,                          ///< HD venous air bubble detector fault
+    ALARM_ID_DG_HEATERS_SELF_TEST_FAILURE = 215,                    ///< DG heaters failed POST
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -330,6 +331,8 @@
 };
 typedef enum Alarm_State_Flag_Bit_Positions ALARM_STATE_FLAG_BIT_POSITIONS_T;
 
+#ifdef __ALARM_MGMT_C__
+
 /// Record defining the properties of each individual alarm.
 struct AlarmsStateRecord
 {
@@ -350,13 +353,6 @@
 };
 typedef struct AlarmsStateRecord ALARM_T;
 
-#ifndef __ALARM_MGMT_C__
-
-/// Only alarm mgmt module should include the populated alarm table.
-extern const ALARM_T ALARM_TABLE[];
-
-#else
-
 #define ALARM_NO_RESUME       ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME
 #define ALARM_NO_RINSEBACK    ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK
 #define ALARM_PRIME_DONE_MED  ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY
@@ -578,6 +574,9 @@
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_DP_FLOW_SENSOR_ERROR
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT
     { ALARM_PRIORITY_HIGH,     1,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_FPGA_POST_TEST_FAILED
+    { ALARM_PRIORITY_HIGH,     1,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_ARTERIAL_BUBBLE_FAULT
+    { ALARM_PRIORITY_HIGH,     1,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_VENOUS_BUBBLE_FAULT
+    { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_HEATERS_SELF_TEST_FAI
     // Priority              Rank   Escalate In     Escalate To                              Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck
 };