Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r620104f4a9e3148575703981a3063b9605b6e9b8 -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 620104f4a9e3148575703981a3063b9605b6e9b8)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- *  Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved.
+ *  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  *
  *  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  *  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
@@ -31,6 +31,17 @@
     ALARM_ID_BLOOD_PUMP_MC_SPEED_CHECK,
     ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK,
     ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK,
+    ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK,             // 10
+    ALARM_ID_DIAL_IN_PUMP_MC_SPEED_CHECK,
+    ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK,
+    ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK,
+    ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK,
+    ALARM_ID_DIAL_OUT_PUMP_MC_SPEED_CHECK,              // 15
+    ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK,
+    ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK,
+    ALARM_ID_WATCHDOG_EXPIRED,
+    ALARM_ID_RTC_COMM_ERROR,
+    ALARM_ID_RTC_CONFIG_ERROR,                          // 20
     NUM_OF_ALARM_IDS
 } ALARM_ID_T;
 
@@ -60,6 +71,7 @@
     BOOL                alarmsSilenced;             // alarms are currently silenced?
     U32                 alarmsSilenceStart;         // time stamp for when alarms were silenced (ms)
     U32                 alarmsSilenceExpiresIn;     // time until alarm silence expires (seconds)
+    BOOL                alarmsToEscalate;           // are any active alarms due to escalate (should UI show count down timer?)
     U32                 alarmsEscalatesIn;          // time until alarm will escalate (seconds)
     ALARM_ID_T          alarmTop;                   // ID of current top alarm that will drive lamp/audio and UI should be displaying right now
     BOOL                systemFault;                // a system fault is active?
@@ -129,24 +141,33 @@
     SW_FAULT_ID_ALARM_MGMT_LAMP_INVALID_ALARM_STATE,
     SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA,
     SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER,
-    SW_FAULT_ID_COMM_BUFFERS_GET_TOO_MUCH_DATA,                         // 20
-    SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER,
-    SW_FAULT_ID_COMM_BUFFERS_PEEK_TOO_MUCH_DATA,
+    SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER,                        // 20
     SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER,
     SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER,
-    SW_FAULT_ID_FPGA_INVALID_IN_STATE,                                  // 25
+    SW_FAULT_ID_FPGA_INVALID_IN_STATE,
     SW_FAULT_ID_FPGA_INVALID_OUT_STATE,
-    SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA,
+    SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA,                           // 25
     SW_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA,
     SW_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA,
-    SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA,                            // 30
+    SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA,
     SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL,
-    SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE,
+    SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE,                           // 30
     SW_FAULT_ID_MSG_QUEUES_GET_INVALID_QUEUE,
     SW_FAULT_ID_MSG_QUEUES_IS_EMPTY_INVALID_QUEUE,
-    SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE,                       // 35
+    SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE,
     SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE,
-    SW_FAULT_ID_ALARM_MGMT_INVALID_FIFO_TO_RESET,
+    SW_FAULT_ID_ALARM_MGMT_INVALID_FIFO_TO_RESET,                       // 35
+    SW_FAULT_ID_DIAL_IN_FLOW_INVALID_DIAL_IN_PUMP_DIRECTION,
+    SW_FAULT_ID_DIAL_IN_FLOW_INVALID_DIAL_IN_PUMP_STATE,
+    SW_FAULT_ID_DIAL_IN_FLOW_SET_TOO_HIGH,
+    SW_FAULT_ID_DIAL_OUT_FLOW_INVALID_DIAL_OUT_PUMP_DIRECTION,
+    SW_FAULT_ID_DIAL_OUT_FLOW_INVALID_DIAL_OUT_PUMP_STATE,              // 40
+    SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH,
+    SW_FAULT_ID_BLOOD_FLOW_INVALID_FILTER_STATE,
+    SW_FAULT_ID_DIAL_IN_FLOW_INVALID_FILTER_STATE,
+    SW_FAULT_ID_RTC_EXEC_INVALID_STATE,
+    SW_FAULT_ID_RTC_SELF_TEST_INVALID_STATE,                            // 45
+    SW_FAULT_ID_RTC_TRANSACTION_SERVICE_INVALID_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;