Index: AlarmDefs.h
===================================================================
diff -u -r6d67a5af1c17911281c2a4c16e6623e38857d5cc -rbb8318dec093411e13758f37c26e0d815010d8eb
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 6d67a5af1c17911281c2a4c16e6623e38857d5cc)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision bb8318dec093411e13758f37c26e0d815010d8eb)
@@ -341,6 +341,8 @@
     ALARM_ID__AVAILABLE_4 = 303,                                            ///< Alarm ID available for use
     ALARM_ID_HD_INVALID_USAGE_RECORD_CRC = 304,                             ///< HD invalid usage record
     ALARM_ID_HD_CPU_RAM_ERROR = 305,                                        ///< HD processor RAM error
+    ALARM_ID_HD_AIR_TRAP_OVERFILL = 306,                                    ///< HD air trap over-fill alarm
+    ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT = 307,                           ///< HD AC power lost second alarm
     NUM_OF_ALARM_IDS                                                        ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -776,7 +778,9 @@
     { ALARM_PRIORITY_HIGH,     3,  FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPU_RAM_ERROR,                                 0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_4,                                     0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     1,  FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_USAGE_RECORD_CRC,                      0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CPU_RAM_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_CPU_RAM_ERROR,                                 0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_AIR_TRAP_OVERFILL,                             0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,    18,  FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT,                    0,              ALARM_ID_NO_ALARM }
 };  //   Priority            Rank  Fault DFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoBRcr NoDRcr ClrOnly TxLog  ID                                                        Escalate In     Escalate To
 
 /// Table of alarms and their rank.
@@ -995,6 +999,7 @@
     {   3, ALARM_ID_HD_CPU_RAM_ERROR },
     {   3, ALARM_ID_HD_OCCLUSION_SENSOR_FPGA_FAULT },
     {   3, ALARM_ID_HD_ARTERIAL_SENSOR_FPGA_FAULT },
+    {   3, ALARM_ID_HD_AIR_TRAP_OVERFILL },
     {   4, ALARM_ID_END_OF_TREATMENT_HIGH },
     {   5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK },
     {   6, ALARM_ID_HD_BLOOD_LEAK_DETECTED },
@@ -1011,6 +1016,7 @@
     {  17, ALARM_ID_HD_EXCESSIVE_TILT },
     {  17, ALARM_ID_DG_EXCESSIVE_TILT },
     {  18, ALARM_ID_HD_AC_POWER_LOST },
+    {  18, ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT },
     {  19, ALARM_ID_DG_COMM_TIMEOUT },
     {  20, ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT },
     {  21, ALARM_ID_OCCLUSION_BLOOD_PUMP },