Index: leahi_dialin/common/alarm_defs.py
===================================================================
diff -u -rfc99e89f17c6c06ee5b783d92eabf405de39abf9 -rd0d72ba74208cb43073ec38c7bbfebb2d32dcc66
--- leahi_dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision fc99e89f17c6c06ee5b783d92eabf405de39abf9)
+++ leahi_dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision d0d72ba74208cb43073ec38c7bbfebb2d32dcc66)
@@ -56,10 +56,10 @@
     ALARM_ID_TD_VOLTAGE_OUT_OF_RANGE = 33
     ALARM_ID_TD_AC_POWER_LOST = 34
     ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT = 35
-    ALARM_ID_DD_CD1_SENSOR_FPGA_FAULT = 36
-    ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT = 37
-    ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT = 38
-    ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT = 39
+    ALARM_ID_DD_D17_COND_SENSOR_FPGA_FAULT = 36
+    ALARM_ID_DD_D27_COND_SENSOR_FPGA_FAULT = 37
+    ALARM_ID_DD_D29_COND_SENSOR_FPGA_FAULT = 38
+    ALARM_ID_DD_D43_COND_SENSOR_FPGA_FAULT = 39
     ALARM_ID_TD_VENOUS_BUBBLE_DETECTED = 40
     ALARM_ID_TD_CARTRIDGE_DOOR_OPENED = 41
     ALARM_ID_TD_STUCK_BUTTON_TEST_FAILED = 42
@@ -72,26 +72,26 @@
     ALARM_ID_TD_VENOUS_PRESSURE_OUT_OF_RANGE = 49
     ALARM_ID_TD_VENOUS_PRESSURE_SELF_TEST_FAILURE = 50
     ALARM_ID_TD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE = 51
-    ALARM_ID_DD_CP1_SPEED_CONTROL_ERROR = 52
-    ALARM_ID_DD_CP2_SPEED_CONTROL_ERROR = 53
+    ALARM_ID_DD_D11_PUMP_SPEED_CONTROL_ERROR = 52
+    ALARM_ID_DD_D10_PUMP_SPEED_CONTROL_ERROR = 53
     ALARM_ID_DD_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE = 54
     ALARM_ID_DD_CONCENTRATE_PUMP_FAULT = 55
     ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE = 56
     ALARM_ID_DD_RTD_SENSORS_FPGA_FAULT = 57
     ALARM_ID_DD_BARO_SENSOR_FPGA_FAULT = 58
     ALARM_ID_DD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC = 59
-    ALARM_ID_DD_FRESH_DIALYSATE_PUMP_RPM_OUT_OF_RANGE = 60
-    ALARM_ID_DD_FRESH_DIALYSATE_PUMP_OFF_FAULT = 61
-    ALARM_ID_DD_FRESH_DIALYSATE_PUMP_CURRENT_OUT_OF_RANGE = 62
-    ALARM_ID_DD_FRESH_DIALYSATE_PUMP_DIRECTION_INVALID = 63
-    ALARM_ID_DD_FRESH_DIALYSATE_PUMP_DIRECTION_FPGA_FAULT = 64
-    ALARM_ID_DD_SPENT_DIALYSATE_PUMP_RPM_OUT_OF_RANGE = 65
-    ALARM_ID_DD_SPENT_DIALYSATE_PUMP_OFF_FAULT = 66
-    ALARM_ID_DD_SPENT_DIALYSATE_PUMP_CURRENT_OUT_OF_RANGE = 67
-    ALARM_ID_DD_SPENT_DIALYSATE_PUMP_DIRECTION_INVALID = 68
-    ALARM_ID_DD_SPENT_DIALYSATE_PUMP_DIRECTION_FPGA_FAULT = 69
-    ALARM_ID_DD_FLUID_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON = 70
-    ALARM_ID_DD_FLUID_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON = 71
+    ALARM_ID_DD_D12_PUMP_RPM_OUT_OF_RANGE = 60
+    ALARM_ID_DD_D12_PUMP_OFF_FAULT = 61
+    ALARM_ID_DD_D12_PUMP_CURRENT_OUT_OF_RANGE = 62
+    ALARM_ID_DD_D12_PUMP_DIRECTION_INVALID = 63
+    ALARM_ID_DD_D12_PUMP_DIRECTION_FPGA_FAULT = 64
+    ALARM_ID_DD_D48_PUMP_RPM_OUT_OF_RANGE = 65
+    ALARM_ID_DD_D48_PUMP_OFF_FAULT = 66
+    ALARM_ID_DD_D48_PUMP_CURRENT_OUT_OF_RANGE = 67
+    ALARM_ID_DD_D48_PUMP_DIRECTION_INVALID = 68
+    ALARM_ID_DD_D48_PUMP_DIRECTION_FPGA_FAULT = 69
+    ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D5_HEAT_IS_ON = 70
+    ALARM_ID_DD_FLUID_TOO_LOW_WHILE_D45_HEAT_IS_ON = 71
     ALARM_ID_DD_WATER_INLET_INPUT_PRES_TIMEOUT_FAULT = 72
     ALARM_ID_DD_WATER_INLET_OUTPUT_PRES_TIMEOUT_FAULT = 73
     ALARM_ID_DD_INLET_WATER_PRESSURE_IN_LOW_RANGE = 74
@@ -106,5 +106,13 @@
     ALARM_ID_RO_CAN_MESSAGE_NOT_ACKED_BY_DD = 83
     ALARM_ID_RO_FPGA_COMM_TIMEOUT = 84
     ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS = 85
+    ALARM_ID_RO_VALVE_CONTROL_FAILURE = 86
+    ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE = 87
+    ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE = 88
+    ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE = 89
+    ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE = 90
+    ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE = 91
+    ALARM_ID_DD_GEND_FRESH_DIAL_PRESS_OUT_OF_RANGE = 92
+    ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE = 93