Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0 -r07a5add2dff254f7be3699e4efac2b99d3554847
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 07a5add2dff254f7be3699e4efac2b99d3554847)
@@ -29,6 +29,11 @@
 
 #define ALARM_SILENCE_EXPIRES_IN_SECS           (60)
 
+#define ALM_ESC_1_MIN                           (1 * SEC_PER_MIN * MS_PER_SECOND)
+#define ALM_ESC_4_MIN                           (4 * SEC_PER_MIN * MS_PER_SECOND)
+#define ALM_ESC_5_MIN                           (5 * SEC_PER_MIN * MS_PER_SECOND)
+#define ALM_ESC_10_MIN                          (10 * SEC_PER_MIN * MS_PER_SECOND)
+
 #pragma pack(push,1)
 typedef struct
 {
@@ -47,37 +52,56 @@
 #pragma pack(pop)
 
 const ALARM_T alarmTable[ NUM_OF_ALARM_IDS ] =
-{ //     Priority           Esc    Escalate To     Fault  Stops  NoClr  NoRes  NoRin  NoEnd  NoNew  Bypass
-    { ALARM_PRIORITY_NONE,   0, ALARM_ID_NO_ALARM, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NO_ALARM
-    { ALARM_PRIORITY_HIGH,   0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_SOFTWARE_FAULT
-    { ALARM_PRIORITY_HIGH,   0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_STUCK_BUTTON_TEST_FAILED
-    { ALARM_PRIORITY_HIGH,   0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_FPGA_POST_TEST_FAILED
-    { ALARM_PRIORITY_HIGH,   0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_WATCHDOG_POST_TEST_FAILED
-    { ALARM_PRIORITY_HIGH,   0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_UI_COMM_POST_FAILED
-    { ALARM_PRIORITY_MEDIUM, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK
-    { ALARM_PRIORITY_MEDIUM, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_MC_SPEED_CHECK
-    { ALARM_PRIORITY_MEDIUM, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK
-    { ALARM_PRIORITY_HIGH,   0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK
-    { ALARM_PRIORITY_MEDIUM, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK
-    { ALARM_PRIORITY_MEDIUM, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_MC_SPEED_CHECK
-    { ALARM_PRIORITY_MEDIUM, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK
-    { ALARM_PRIORITY_HIGH,   0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK
-    { ALARM_PRIORITY_MEDIUM, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK
-    { ALARM_PRIORITY_MEDIUM, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_MC_SPEED_CHECK
-    { ALARM_PRIORITY_MEDIUM, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK
-    { ALARM_PRIORITY_HIGH,   0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK
-    { ALARM_PRIORITY_HIGH,   0, ALARM_ID_NO_ALARM, TRUE,  TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }  // ALARM_ID_WATCHDOG_EXPIRED
+{ //     Priority            Escalate In        Escalate To                                Fault  Stops  NoClr  NoRes  NoRin  NoEnd  NoNew  Bypass
+    { ALARM_PRIORITY_NONE,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NO_ALARM
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_SOFTWARE_FAULT
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_STUCK_BUTTON_TEST_FAILED
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_FPGA_POST_TEST_FAILED
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_WATCHDOG_POST_TEST_FAILED
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_UI_COMM_POST_FAILED
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_MC_SPEED_CHECK
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_MC_SPEED_CHECK
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_MC_SPEED_CHECK
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_WATCHDOG_EXPIRED
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_RTC_COMM_ERROR
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_RTC_CONFIG_ERROR
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_COMM_TIMEOUT
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_UI_COMM_TIMEOUT
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_BLOOD_SITTING_WARNING,               TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_COMM_TOO_MANY_BAD_CRCS
+    { ALARM_PRIORITY_LOW,    ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_STOPPED_BY_USER
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_1_MIN,  ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME,    FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_SITTING_WARNING
+    { ALARM_PRIORITY_MEDIUM, ALM_ESC_5_MIN,  ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK, FALSE, TRUE , FALSE, TRUE,  FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            FALSE, TRUE , FALSE, TRUE,  TRUE,  FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK
+    { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_CAN_MESSAGE_NOT_ACKED
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_OCCLUSION_BLOOD_PUMP
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_OCCLUSION_DIAL_IN_PUMP
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_OCCLUSION_DIAL_OUT_PUMP
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_ARTERIAL_PRESSURE_LOW
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_ARTERIAL_PRESSURE_HIGH
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_VENOUS_PRESSURE_LOW
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_VENOUS_PRESSURE_HIGH
 };
 
 const ALARM_DATA_T blankAlarmData = { ALARM_DATA_TYPE_NONE, 0 };
 
 // ********** private data **********
 
-static U32 alarmStatusPublicationTimerCounter = 0;     // used to schedule alarm status publication to CAN bus
 // interval (in ms) at which to publish alarm status to CAN bus
 DATA_DECL( U32, AlarmStatusPub, alarmStatusPublishInterval, ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL );
+static U32 alarmStatusPublicationTimerCounter = 0;     // used to schedule alarm status publication to CAN bus
 
+// table - current state of each alarm
 DATA_ARRAY_DECL( BOOL, AlarmStates, NUM_OF_ALARM_IDS, alarmIsActive );
+// table - when alarm became active for each alarm (if active) or zero (if inactive)
 DATA_ARRAY_DECL( U32, AlarmStarts, NUM_OF_ALARM_IDS, alarmStartedAt );
 
 static COMP_ALARM_STATUS_T alarmStatus;