Index: Alarms/Alarms.conf
===================================================================
diff -u -r99267d15f547caea0dc88faaa8e8766123c9df69 -ra0b3e71e3bb0ba51509b2370dbd9b20e4e526af5
--- Alarms/Alarms.conf	(.../Alarms.conf)	(revision 99267d15f547caea0dc88faaa8e8766123c9df69)
+++ Alarms/Alarms.conf	(.../Alarms.conf)	(revision a0b3e71e3bb0ba51509b2370dbd9b20e4e526af5)
@@ -49,15 +49,23 @@
 DG accelerometer failed POST = ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE
 
 [10]
-Title   = Machine Error
-Message = Call service to schedule a repair.
-RTC or MCU timer inaccurate = ALARM_ID_HD_BLOOD_LEAK_FAULT
+Title   = 
+Message = 
 
 [11]
 Title   = 
 Message = 
-DG heaters failed POST = ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE
 
+[10]
+Title   = 
+Message = 
+ = ALARM_ID_HD_BLOOD_LEAK_FAULT
+
+[11]
+Title   = 
+Message = 
+ = ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE
+
 [12]
 Title   = Self Test Error
 Message = Call service to schedule a repair.
@@ -71,12 +79,12 @@
 [14]
 Title   = 
 Message = 
-HD blood flow invalid calibration = ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION
+ = ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION
 
 [15]
 Title   = 
 Message = 
-HD dialysate flow invalid calibration = ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION
+ = ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION
 
 [16]
 Title   = Self Test Error
@@ -136,13 +144,21 @@
 [27]
 Title   = 
 Message = 
-HD blood flow invalid calibration record = ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD
 
 [28]
 Title   = 
 Message = 
-HD dialyzer flow invalid calibration record = ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD
 
+[27]
+Title   = 
+Message = 
+ = ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD
+
+[28]
+Title   = 
+Message = 
+ = ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD
+
 [29]
 Title   = Calibration Error
 Message = Call service to schedule a repair.
@@ -216,7 +232,7 @@
 [43]
 Title   = Machine Error
 Message = Call service to schedule a repair.
-Watchdog expired error.  Watchdog was not "pet" within the appropriate time = ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAULT
+BLD failed its internal self-test after cartridge prime = ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAULT
 
 [44]
 Title   = Machine Error
@@ -329,8 +345,8 @@
 HD requests DG command with invalid parameter fault = ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT
 
 [66]
-Title   = 
-Message = 
+Title   = Machine Error
+Message = Call service to schedule a repair.
 HD blood leak sensor set point set failure = ALARM_ID_HD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE
 
 [67]
@@ -344,8 +360,8 @@
 HD active reservoir recirculation out of range = ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE
 
 [69]
-Title   = 
-Message = 
+Title   = Self-Test Error
+Message = Call service to schedule a repair.
 HD blood leak sensor invalid calibration record = ALARM_ID_HD_BLOOD_LEAK_INVALID_CAL_RECORD
 
 [70]
@@ -361,13 +377,21 @@
 [72]
 Title   = 
 Message = 
-HD blood flow meter status check self-test failure alarm = ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE
 
 [73]
 Title   = 
 Message = 
-HD dialysate flow meter status check self-test failure alarm = ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE
 
+[72]
+Title   = 
+Message = 
+ = ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE
+
+[73]
+Title   = 
+Message = 
+ = ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE
+
 [74]
 Title   = Self Test Error
 Message = Call service to schedule a repair.
@@ -436,12 +460,12 @@
 [87]
 Title   = 
 Message = 
-This alarm ID is available for use = ALARM_ID_DG_HEATING_INVALID_CAL_RECORD
+ = ALARM_ID_DG_HEATING_INVALID_CAL_RECORD
 
 [88]
 Title   = 
 Message = 
-This alarm ID is available for use = ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE
+ = ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE
 
 [89]
 Title   = Occlusion Sensor Error
@@ -451,7 +475,7 @@
 [90]
 Title   = 
 Message = 
-This alarm ID is available for use = ALARM_ID_DG_LOAD_CELL_FPGA_READ_ERROR
+ = ALARM_ID_DG_LOAD_CELL_FPGA_READ_ERROR
 
 [91]
 Title   = Dialysate Measurement Error
@@ -461,32 +485,32 @@
 [92]
 Title   = 
 Message = 
-This alarm ID is available for use = ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS
+ = ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS
 
 [93]
 Title   = 
 Message = 
-This alarm ID is available for use = ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE
+ = ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE
 
 [94]
 Title   = 
 Message = 
-This alarm ID is available for use = ALARM_ID_DG_PRESSURE_OUT_OF_RANGE
+ = ALARM_ID_DG_PRESSURE_OUT_OF_RANGE
 
 [95]
 Title   = 
 Message = 
-This alarm ID is available for use = ALARM_ID_DG_WATCHDOG_EXPIRED
+ = ALARM_ID_DG_WATCHDOG_EXPIRED
 
 [96]
 Title   = 
 Message = 
-This alarm ID is available for use = ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE
+ = ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE
 
 [97]
 Title   = 
 Message = 
-This alarm ID is available for use = ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE
+ = ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE
 
 [98]
 Title   = Battery Error
@@ -509,9 +533,9 @@
 HD dry self-test timeout = ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT
 
 [102]
-Title   = 
-Message = 
-Real-time clock communication error = ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANAGE
+Title   = Self-Test Error
+Message = Call service to schedule a repair.
+DG heat disinfection temperature gradient out of range = ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANAGE
 
 [103]
 Title   = Machine Error
@@ -564,9 +588,9 @@
 HD blood leak detector fault = ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_SEND_TIMEOUT
 
 [113]
-Title   = 
-Message = 
-HD arterial air bubble detector self-test failure = ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_FAULT
+Title   = Blood Leak Detector Error
+Message = Call service to schedule a repair.
+HD blood leak zero command fault = ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_FAULT
 
 [114]
 Title   = Air Bubble Detector Error
@@ -729,9 +753,9 @@
 DG Concentrate conductivity after adding acid out of range alarm = ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE
 
 [146]
-Title   = 
-Message = 
-Dialysate conductivity out of range = ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE
+Title   = Self-Test Error
+Message = Call service to schedule a repair.
+DG RTC vs. Timer accuracy error = ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE
 
 [147]
 Title   = Dialysate Conductivity Error
@@ -764,8 +788,8 @@
 Inlet water pressure too low = ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE
 
 [153]
-Title   = 
-Message = 
+Title   = Prime Complete
+Message = Prime of the bloodlines is complete.
 HD prime completed high priority alarm = ALARM_ID_PRIME_COMPLETED_HIGH
 
 [154]
@@ -776,22 +800,22 @@
 [155]
 Title   = 
 Message = 
-This alarm ID is available for use = ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE
+ = ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE
 
 [156]
 Title   = 
 Message = 
-HW usage data (treatment time in HD and total consumed water in DG) failure = ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT
+ = ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT
 
 [157]
 Title   = 
 Message = 
 This alarm ID is available for use = ALARM_ID_DG_CHEM_DISINFECT_PRIME_ACID_LINE_TIME_OUT
 
 [158]
-Title   = 
+Title   = Inlet water temperature low
 Message = 
-Blood pump failed flow vs. motor speed check. = ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE
+Inlet water temperature low = ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE
 
 [159]
 Title   = Dialysate Pump Failure
@@ -804,14 +828,14 @@
 Blood pump rotor speed too high = ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH
 
 [161]
-Title   = 
-Message = 
-Blood flow sensor signal strength too low               TODO remove this alarm when FMB fully removed = ALARM_ID_DG_COMM_TOO_MANY_BAD_CRCS
+Title   = Machine Error
+Message = Call service to schedule a repair.
+Too many bad CRCs detected on received system messages = ALARM_ID_DG_COMM_TOO_MANY_BAD_CRCS
 
 [162]
 Title   = 
 Message = 
-Dialysate flow sensor signal strength too low           TODO remove this alarm when FMD fully removed = ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE
+ = ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE
 
 [163]
 Title   = Ultrafiltration Measurement Error
@@ -864,14 +888,14 @@
 HD syringe pump not enough Heparin alarm = ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM
 
 [173]
-Title   = 
-Message = 
-HD arterial air bubble detected alarm = ALARM_ID_HD_RTC_CONFIG_ERROR
+Title   = Self-Test Error
+Message = Call service to schedule a repair.
+HD RTC configuration error = ALARM_ID_HD_RTC_CONFIG_ERROR
 
 [174]
-Title   = 
-Message = 
-HD arterial air bubble detected rinseback alarm = ALARM_ID_HD_RTC_OR_TIMER_ACCURACY_FAILURE
+Title   = Self-Test Error
+Message = Call service to schedule a repair.
+HD RTC vs. Timer accuracy error = ALARM_ID_HD_RTC_OR_TIMER_ACCURACY_FAILURE
 
 [175]
 Title   = Blood Pump Error
@@ -966,7 +990,7 @@
 [193]
 Title   = 
 Message = 
-RO pump flow rate out of range = ALARM_ID__AVAILABLE_13
+ = ALARM_ID__AVAILABLE_13
 
 [194]
 Title   = RO Pump Error
@@ -996,7 +1020,7 @@
 [199]
 Title   = 
 Message = 
-DG heaters fault = ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON
+ = ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON
 
 [200]
 Title   = Dialysate Temperature Error
@@ -1064,8 +1088,8 @@
 Blood sitting too long warning (> 4 min) = ALARM_ID_END_OF_TREATMENT_ALARM
 
 [213]
-Title   = 
-Message = 
+Title   = Prime Complete
+Message = Prime of the bloodlines is complete.
 HD prime completed medium priority alarm = ALARM_ID_PRIME_COMPLETED_MEDIUM
 
 [214]
@@ -1164,9 +1188,9 @@
 HD pre-treatment mode wet self-tests failure = ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE
 
 [233]
-Title   = Battery Error
-Message = Battery pack error.
-RTC battery low = ALARM_ID__AVAILABLE_8
+Title   = 
+Message = 
+ = ALARM_ID__AVAILABLE_8
 
 [234]
 Title   = Communication Failure
@@ -1279,8 +1303,8 @@
 HD and UI software builds are not compatible = ALARM_ID_HD_UI_COMPATIBILITY_ERROR
 
 [256]
-Title   = 
-Message = 
+Title   = Self-Test Error
+Message = Call service to schedule a repair.
 HD and DG software builds are not compatible = ALARM_ID_HD_DG_COMPATIBILITY_ERROR
 
 [257]
@@ -1299,53 +1323,53 @@
 HD temperatures out of range = ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE
 
 [260]
-Title   = 
-Message = 
+Title   = Machine Error
+Message = Call service to schedule a repair.
 UI POST Application Integrity (Sha256Sum) failure = ALARM_ID_UI_POST_FAILURE_SHASUM
 
 [261]
-Title   = 
-Message = 
+Title   = Machine Error
+Message = Call service to schedule a repair.
 UI POST CANBus failure = ALARM_ID_UI_POST_FAILURE_CANBUS
 
 [262]
-Title   = 
-Message = 
+Title   = Machine Error
+Message = Call service to schedule a repair.
 UI POST Display failure = ALARM_ID_UI_POST_FAILURE_DISPLAY
 
 [263]
-Title   = 
-Message = 
+Title   = Machine Error
+Message = Call service to schedule a repair.
 UI POST Touch failure = ALARM_ID_UI_POST_FAILURE_TOUCH
 
 [264]
-Title   = 
-Message = 
+Title   = Machine Error
+Message = Call service to schedule a repair.
 UI POST SD-Card failure = ALARM_ID_UI_POST_FAILURE_SDCARD
 
 [265]
-Title   = 
-Message = 
+Title   = Machine Error
+Message = Call service to schedule a repair.
 UI POST RTC failure = ALARM_ID_UI_POST_FAILURE_RTC
 
 [266]
-Title   = 
-Message = 
+Title   = Machine Error
+Message = Call service to schedule a repair.
 UI POST WiFi failure = ALARM_ID_UI_POST_FAILURE_WIFI
 
 [267]
-Title   = 
-Message = 
+Title   = Machine Error
+Message = Call service to schedule a repair.
 UI POST Bluetooth failure = ALARM_ID_UI_POST_FAILURE_BLUETOOTH
 
 [268]
-Title   = 
-Message = 
+Title   = Machine Error
+Message = Call service to schedule a repair.
 UI POST Ethernet failure = ALARM_ID_UI_POST_FAILURE_ETHERNET
 
 [269]
-Title   = 
-Message = 
+Title   = Machine Error
+Message = Call service to schedule a repair.
 UI POST Sound failure = ALARM_ID_UI_POST_FAILURE_SOUND
 
 [270]
@@ -1419,8 +1443,8 @@
 DG load cells weight out of range = ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE
 
 [284]
-Title   = 
-Message = 
+Title   = Self-Test Error
+Message = Call service to schedule a repair.
 DG load cells primary/back up drift out of range = ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE
 
 [285]
@@ -1441,15 +1465,15 @@
 [288]
 Title   = Dialysate Temperature Error
 Message = Call service to schedule a repair.
-DG trimmer heater on with flow timeout. = ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE
+HD load cell inconsistency = ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE
 
 [289]
 Title   = DG Cap State Error
 Message = Check dialysate/concentrate caps.
 DG cap in wrong state = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION
 
 [290]
-Title   = 
+Title   = RO Flow Low
 Message = 
- = ALARM_ID_DG_FLOW_TOO_LOW_WHILE_HEATER_ON
+DG RO flow too low while heating = ALARM_ID_DG_FLOW_TOO_LOW_WHILE_HEATER_ON