Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0 -rd830f37cf6a42a16399c87985bd51dfd9312ced3
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision d830f37cf6a42a16399c87985bd51dfd9312ced3)
@@ -42,6 +42,21 @@
     ALARM_ID_WATCHDOG_EXPIRED,
     ALARM_ID_RTC_COMM_ERROR,
     ALARM_ID_RTC_CONFIG_ERROR,                          // 20
+    ALARM_ID_DG_COMM_TIMEOUT,
+    ALARM_ID_UI_COMM_TIMEOUT,
+    ALARM_ID_COMM_TOO_MANY_BAD_CRCS,
+    ALARM_ID_TREATMENT_STOPPED_BY_USER,
+    ALARM_ID_BLOOD_SITTING_WARNING,                     // 25
+    ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME,
+    ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK,
+    ALARM_ID_CAN_MESSAGE_NOT_ACKED,
+    ALARM_ID_OCCLUSION_BLOOD_PUMP,
+    ALARM_ID_OCCLUSION_DIAL_IN_PUMP,                    // 30
+    ALARM_ID_OCCLUSION_DIAL_OUT_PUMP,
+    ALARM_ID_ARTERIAL_PRESSURE_LOW,
+    ALARM_ID_ARTERIAL_PRESSURE_HIGH,
+    ALARM_ID_VENOUS_PRESSURE_LOW,
+    ALARM_ID_VENOUS_PRESSURE_HIGH,                      // 35
     NUM_OF_ALARM_IDS
 } ALARM_ID_T;
 
@@ -168,6 +183,12 @@
     SW_FAULT_ID_RTC_EXEC_INVALID_STATE,
     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_PRES_OCCL_INVALID_PRES_SENSOR,
+    SW_FAULT_ID_PRES_OCCL_INVALID_OCCL_SENSOR,
+    SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL,                              // 50
+    SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER,
+    SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;