Index: dialin/common/alarm_defs.py
===================================================================
diff -u -racd09d02879e8add4cf7f694f5db8e423a76c341 -r2deb7bfab0ee5aab963cd6a62729844605ecb827
--- dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision acd09d02879e8add4cf7f694f5db8e423a76c341)
+++ dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision 2deb7bfab0ee5aab963cd6a62729844605ecb827)
@@ -39,7 +39,7 @@
     ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE = 16
     ALARM_ID_HD_UI_POST_FAILED = 17
     ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD = 18
-    ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP = 19                      
+    ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP = 19
     ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD = 20
     ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD = 21
     ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD = 22
@@ -66,11 +66,11 @@
     ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT = 43
     ALARM_ID_UI_COMM_TIMEOUT = 44
     ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS = 45
-    ALARM_ID_CAN_MESSAGE_NOT_ACKED = 46
+    ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED = 46
     ALARM_ID_UF_RATE_TOO_HIGH_ERROR = 47
     ALARM_ID_UF_VOLUME_ACCURACY_ERROR = 48
     ALARM_ID_HD_FPGA_COMM_TIMEOUT = 49
-    ALARM_ID_VALVE_CONTROL_FAILURE = 50
+    ALARM_ID_DG_VALVE_CONTROL_FAILURE = 50
     ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK = 51
     ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK = 52
     ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK = 53
@@ -122,7 +122,7 @@
     ALARM_ID_HD_SYRINGE_PUMP_STALL = 99
     ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 100
     ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT = 101
-    ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANGE  = 102
+    ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANGE = 102
     ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 103
     ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS = 104
     ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 105
@@ -179,7 +179,7 @@
     ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE = 156
     ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT = 157
     ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE = 158
-    ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 159
+    ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID = 159
     ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 160
     ALARM_ID_DG_COMM_TOO_MANY_BAD_CRCS = 161
     ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE = 162
@@ -254,7 +254,7 @@
     ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE = 231
     ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE = 232
     ALARM_ID_DG_BAROMETRIC_SENSOR_COEFFS_BAD_CRC = 233
-    ALARM_ID_RTC_RAM_OPS_ERROR = 234
+    ALARM_ID_INLET_WATER_PRESSURE_IN_HIGH_RANGE = 234
     ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK = 235
     ALARM_ID_INSTALL_NEW_CARTRIDGE = 236
     ALARM_ID_PRIME_SALINE_DIALYZER_TIME_OUT = 237
@@ -264,13 +264,13 @@
     ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT = 241
     ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT = 242
     ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT = 243
-    ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE = 244
+    ALARM_ID_DG_CLEANING_MODE_TEMP_SENSORS_DIFF_OUT_OF_RANGE = 244
     ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT = 245
-    ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT = 246
+    ALARM_ID_DG_CLEANING_MODE_COND_SENSORS_OUT_OF_RANGE = 246
     ALARM_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_TIME_OUT = 247
-    ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT = 248
-    ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT = 249
-    ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT = 250
+    ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_OUT_OF_RANGE = 248
+    ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE = 249
+    ALARM_ID_DG_CHEM_DISINFECT_INSERT_ACID = 250
     ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC = 251
     ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC = 252
     ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC = 253
@@ -338,4 +338,6 @@
     ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW = 315
     ALARM_ID_DG_ACID_CONCENTRATE_PUMP_PARK_FAULT = 316
     ALARM_ID_DG_BICARB_CONCENTRATE_PUMP_PARK_FAULT = 317
-
+    ALARM_ID_HD_AIR_PUMP_TIMEOUT = 318
+    ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE = 319
+    ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT = 320