Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -rc672f41061bcd500d6593655641cb27ce3ae58fc -rf6888c7e4e05cb84b11fceb4340458d8af543ce8
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision c672f41061bcd500d6593655641cb27ce3ae58fc)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision f6888c7e4e05cb84b11fceb4340458d8af543ce8)
@@ -39,6 +39,17 @@
 
 #define MAX_ALARM_VOLUME_LEVEL                          7
 
+/// Enumeration of alarm actions.
+typedef enum Alarm_Actions
+{
+    ALARM_ACTION_STOP = 0,                                          ///< Alarm state requests HD in safe state (pumps stopped, heater off, valves in safe state)
+    ALARM_ACTION_BYPASS_DIALYZER,                                   ///< Alarm state requests dialysate re-circ while bypassing dialyzer
+    ALARM_ACTION_RESUME,                                            ///< User selected resume from alarm recovery options
+    ALARM_ACTION_RINSEBACK,                                         ///< User selected rinseback from alarm recovery options
+    ALARM_ACTION_END_TREATMENT,                                     ///< User selected end treatment from alarm recovery options
+    NUMBER_OF_ALARM_ACTIONS                                         ///< Number of alarm actions
+} ALARM_ACTION_T;
+
 /// Alarm data types list.
 typedef enum Alarm_Data_Types
 {
@@ -177,13 +188,13 @@
     SW_FAULT_ID_RTC_SELF_TEST_INVALID_STATE,                            // 45
     SW_FAULT_ID_RTC_TRANSACTION_SERVICE_INVALID_STATE,
     SW_FAULT_ID_PRES_OCCL_INVALID_STATE,
-    SW_FAULT_ID____AVAILABLE_3,
-    SW_FAULT_ID____AVAILABLE_4,
+    SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_SIGNAL_ACTION,
+    SW_FAULT_ID____AVAILABLE_1,
     SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL,                              // 50
     SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER,
     SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL,
-    SW_FAULT_ID____AVAILABLE_5,
-    SW_FAULT_ID____AVAILABLE_6,
+    SW_FAULT_ID____AVAILABLE_2,
+    SW_FAULT_ID____AVAILABLE_3,
     SW_FAULT_ID_DIALYSIS_INVALID_STATE,                                 // 55
     SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE,
     SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,