Index: dialin/hd/alarms.py
===================================================================
diff -u -r128445d89a7a0379b1cd99e2097943741e608e5c -r7599f1d9d052276275cd79bdae626e706539044d
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 128445d89a7a0379b1cd99e2097943741e608e5c)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 7599f1d9d052276275cd79bdae626e706539044d)
@@ -67,21 +67,21 @@
 
     # See AlarmDefs.h
     ALARM_ID_NO_ALARM = 0
-    ALARM_ID_SOFTWARE_FAULT = 1 # Requires reboot
+    ALARM_ID_SOFTWARE_FAULT = 1
     ALARM_ID_STUCK_BUTTON_TEST_FAILED = 2
     ALARM_ID_FPGA_POST_TEST_FAILED = 3
     ALARM_ID_WATCHDOG_POST_TEST_FAILED = 4
     ALARM_ID_UI_COMM_POST_FAILED = 5
     ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK = 6
-    ALARM_ID_BLOOD_PUMP_MC_SPEED_CHECK = 7
+    ALARM_ID_BLOOD_PUMP_OFF_CHECK = 7
     ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK = 8
     ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK = 9
     ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK = 10
-    ALARM_ID_DIAL_IN_PUMP_MC_SPEED_CHECK = 11
+    ALARM_ID_DIAL_IN_PUMP_OFF_CHECK = 11
     ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK = 12
     ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK = 13
     ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK = 14
-    ALARM_ID_DIAL_OUT_PUMP_MC_SPEED_CHECK = 15
+    ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK = 15
     ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK = 16
     ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = 17
     ALARM_ID_WATCHDOG_EXPIRED = 18
@@ -117,6 +117,15 @@
     ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE = 48
     ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT = 49
     ALARM_ID_HD_COMM_TIMEOUT = 50
+    ALARM_ID_VALVE_CONTROL_FAILURE = 51
+    ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 52
+    ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 53
+    ALARM_ID_DIAL_OUT_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 54
+    ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK = 55
+    ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK = 56
+    ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK = 57
+    ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 58
+    ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE = 59
 
     def __init__(self, can_interface):
         """