Index: AlarmDefs.h
===================================================================
diff -u -re5a62206cc48ba9cb29ba0afc53323951d1fa795 -rfc0c5865371e2ef97812fc2aa761a6aefae1c17a
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision e5a62206cc48ba9cb29ba0afc53323951d1fa795)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision fc0c5865371e2ef97812fc2aa761a6aefae1c17a)
@@ -341,7 +341,8 @@
     ALARM_ID_HD_SERVICE_TIME_INTERVAL_HAS_ELAPSED = 303,                    ///< HD service time interval has elapsed
     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_AC_POWER_LOST_SECOND = 307,                                 ///< HD AC power lost second alarm
+    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
@@ -778,7 +779,8 @@
     { ALARM_PRIORITY_MEDIUM, 899,  FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SERVICE_TIME_INTERVAL_HAS_ELAPSED,             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,    18,  FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_AC_POWER_LOST_SECOND,                          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.
@@ -993,6 +995,7 @@
     {   3, ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE },
     {   3, ALARM_ID_DG_CPU_RAM_ERROR },
     {   3, ALARM_ID_HD_CPU_RAM_ERROR },
+    {   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 },
@@ -1009,7 +1012,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_SECOND },
+    {  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 },