Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r070554b23739bf16ea2bf9528ebabda1ce0ffeb3 -r8e53754325653805a454de6d82c0c8ca90e068a0
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 070554b23739bf16ea2bf9528ebabda1ce0ffeb3)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 8e53754325653805a454de6d82c0c8ca90e068a0)
@@ -26,7 +26,11 @@
     ALARM_ID_STUCK_BUTTON_TEST_FAILED,
     ALARM_ID_FPGA_POST_TEST_FAILED,
     ALARM_ID_WATCHDOG_POST_TEST_FAILED,
-    ALARM_ID_UI_COMM_POST_FAILED,
+    ALARM_ID_UI_COMM_POST_FAILED,                       // 5
+    ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK,
+    ALARM_ID_BLOOD_PUMP_MC_SPEED_CHECK,
+    ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK,
+    ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK,
     NUM_OF_ALARM_IDS
 } ALARM_ID_T;
 
@@ -110,37 +114,37 @@
     SW_FAULT_ID_ALARM_LAMP_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_BLOOD_FLOW_SET_TOO_HIGH,
     SW_FAULT_ID_BLOOD_FLOW_INVALID_BLOOD_PUMP_STATE,
-    SW_FAULT_ID_BLOOD_FLOW_INVALID_BLOOD_PUMP_DIRECTION,
+    SW_FAULT_ID_BLOOD_FLOW_INVALID_BLOOD_PUMP_DIRECTION,                // 5
     SW_FAULT_ID_BUTTONS_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_BUTTONS_STOP_BUTTON_NOT_CONSUMED,
     SW_FAULT_ID_INT_ADC_DATA_OVERRUN,
     SW_FAULT_ID_INT_ADC_INVALID_CHANNEL_REQUESTED,
-    SW_FAULT_ID_MODE_INIT_POST_INVALID_POST_STATE,
+    SW_FAULT_ID_MODE_INIT_POST_INVALID_POST_STATE,                      // 10
     SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED,
     SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE,
     SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED,
     SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO,
-    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE,
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE,                   // 15
     SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR,
     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,
+    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_PEEK_INVALID_BUFFER,
     SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER,
-    SW_FAULT_ID_FPGA_INVALID_IN_STATE,
+    SW_FAULT_ID_FPGA_INVALID_IN_STATE,                                  // 25
     SW_FAULT_ID_FPGA_INVALID_OUT_STATE,
     SW_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA,
     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,
+    SW_FAULT_ID_FPGA_READ_RSP_TOO_MUCH_DATA,                            // 30
     SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL,
     SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE,
     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,
+    SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE,                       // 35
     SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;