Index: dialin/common/alarm_defs.py
===================================================================
diff -u -ra17d8b94b9cd8f473b1a885eb663eb2642bf13e6 -rc395352cad31f029410029b2df987fbe21934843
--- dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision a17d8b94b9cd8f473b1a885eb663eb2642bf13e6)
+++ dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision c395352cad31f029410029b2df987fbe21934843)
@@ -1,34 +1,215 @@
 ###########################################################################
 #
-# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+# Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 #
 # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
 # @file alarm_defs.py
 #
-# @author (last) Sean Nash
-# @date (last) 03-Nov-2020
+# @author (last) Peter Lucia
+# @date (last) 29-Apr-2021
 # @author (original) Peter Lucia
-# @date (original) 07-Aug-2020
+# @date (original) 29-Apr-2021
 #
 ############################################################################
-import os
 from enum import unique
-from ..utils.base import AlarmEnum, DialinEnum
+from ..utils.base import AlarmEnum
 
-enum_list = {}
-with open(os.path.join(os.path.dirname(__file__), 'AlarmIds.txt'), 'r') as file_obj:
-    for line in file_obj:
-        split_str = line.split('=')
-        enum_list[split_str[0].strip()] = int(split_str[1].strip())
 
-AlarmList = AlarmEnum('AlarmList', enum_list)
-
+# Branch: staging
 @unique
-class AlarmPriorities(DialinEnum):
-    ALARM_PRIORITY_NONE = 0                                        # Indicates not an alarm or no alarms active at this time
-    ALARM_PRIORITY_LOW = 1                                         # Low priority alarm
-    ALARM_PRIORITY_MEDIUM = 2                                      # Medium priority alarm
-    ALARM_PRIORITY_HIGH = 3                                        # High priority alarm
-    NUM_OF_ALARM_PRIORITIES = 4                                    # Total number of alarm priorities
+class AlarmList(AlarmEnum):
+    ALARM_ID_NO_ALARM = 0
+    ALARM_ID_HD_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_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_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_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
+    ALARM_ID_RTC_COMM_ERROR = 19
+    ALARM_ID_RTC_CONFIG_ERROR = 20
+    ALARM_ID_DG_COMM_TIMEOUT = 21
+    ALARM_ID_UI_COMM_TIMEOUT = 22
+    ALARM_ID_COMM_TOO_MANY_BAD_CRCS = 23
+    ALARM_ID_TREATMENT_STOPPED_BY_USER = 24
+    ALARM_ID_BLOOD_SITTING_WARNING = 25
+    ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME = 26
+    ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK = 27
+    ALARM_ID_CAN_MESSAGE_NOT_ACKED = 28
+    ALARM_ID_OCCLUSION_BLOOD_PUMP = 29
+    ALARM_ID_OCCLUSION_DIAL_IN_PUMP = 30
+    ALARM_ID_OCCLUSION_DIAL_OUT_PUMP = 31
+    ALARM_ID_ARTERIAL_PRESSURE_LOW = 32
+    ALARM_ID_ARTERIAL_PRESSURE_HIGH = 33
+    ALARM_ID_VENOUS_PRESSURE_LOW = 34
+    ALARM_ID_VENOUS_PRESSURE_HIGH = 35
+    ALARM_ID_UF_RATE_TOO_HIGH_ERROR = 36
+    ALARM_ID_UF_VOLUME_ACCURACY_ERROR = 37
+    ALARM_ID_RTC_BATTERY_LOW = 38
+    ALARM_ID_RTC_OR_TIMER_ACCURACY_FAILURE = 39
+    ALARM_ID_RTC_RAM_OPS_ERROR = 40
+    ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = 41
+    ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR = 42
+    ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR = 43
+    ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR = 44
+    ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 45
+    ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE = 47
+    ALARM_ID_TEMPERATURE_SENSORS_FAULT = 48
+    ALARM_ID_FPGA_COMM_TIMEOUT = 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_HD_PRIME_PURGE_AIR_TIME_OUT = 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_LOW_CONDUCTIVITY = 59
+    ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY = 60
+    ALARM_ID_DG_SOFTWARE_FAULT = 61
+    ALARM_ID_CONDUCTIVITY_SENSOR_FAULT = 62
+    ALARM_ID_INLET_WATER_LOW_TEMPERATURE = 63
+    ALARM_ID_INLET_WATER_HIGH_TEMPERATURE = 64
+    ALARM_ID_PRESSURE_SENSOR_FAULT = 65
+    ALARM_ID_INLET_WATER_LOW_PRESSURE = 66
+    ALARM_ID_HD_CRITICAL_DATA_ERROR = 67
+    ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE = 68
+    ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE = 69
+    ALARM_ID_HD_EXCESSIVE_TILT = 70
+    ALARM_ID_DG_EXCESSIVE_TILT = 71
+    ALARM_ID_HD_SHOCK = 72
+    ALARM_ID_DG_SHOCK = 73
+    ALARM_ID_HD_ACCELEROMETER_FAILURE = 74
+    ALARM_ID_DG_ACCELEROMETER_FAILURE = 75
+    ALARM_ID_DG_CRITICAL_DATA_ERROR = 76
+    ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE = 77
+    ALARM_ID_INLET_WATER_PRESSURE_FAULT = 78
+    ALARM_ID_HD_VALVE_HOMING_FAILED = 79
+    ALARM_ID_HD_VALVE_TRANSITION_TIMEOUT = 80
+    ALARM_ID_HD_VALVE_NOT_FUNCTIONAL = 81
+    ALARM_ID_HD_VALVE_CURRENT_OUT_OF_RANGE = 82
+    ALARM_ID_HD_VALVE_POSITION_OUT_OF_RANGE = 83
+    ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS = 84
+    ALARM_ID_AIR_TRAP_FILL_DURING_PRIME = 85
+    ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT = 86
+    ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW = 87
+    ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW = 88
+    ALARM_ID_EMPTY_SALINE_BAG = 89
+    ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE = 90
+    ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 91
+    ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 92
+    ALARM_ID_UV_REACTOR_NOT_HEALTHY = 93
+    ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE = 94
+    ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 95
+    ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE = 96
+    ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE = 97
+    ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE = 98
+    ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME = 99
+    ALARM_ID_CP1_SPEED_CONTROL_ERROR = 100
+    ALARM_ID_CP2_SPEED_CONTROL_ERROR = 101
+    ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE = 102
+    ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE = 103
+    ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE = 104
+    ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE = 105
+    ALARM_ID_DG_HEATERS_FAULT = 106
+    ALARM_ID_END_OF_TREATMENT_WARNING = 107
+    ALARM_ID_END_OF_TREATMENT_ALARM = 108
+    ALARM_ID_END_OF_TREATMENT_HIGH = 109
+    ALARM_ID_DG_HEAT_DISINFECT_CYCLE_FAILED = 110
+    ALARM_ID_RO_PUMP_RAMP_UP_TO_FLOW_TIMEOUT = 111
+    ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE = 112
+    ALARM_ID_DRAIN_PUMP_OFF_FAULT = 113
+    ALARM_ID_RO_PUMP_OFF_FAULT = 114
+    ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT = 115
+    ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT = 116
+    ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY = 117
+    ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY = 118
+    ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY = 119
+    ALARM_ID_PRIME_OUT_OF_TIME = 120
+    ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 121
+    ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM = 122
+    ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM = 123
+    ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK = 124
+    ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM = 125
+    ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM = 126
+    ALARM_ID_CARTRIDGE_DOOR_OPENED = 127
+    ALARM_ID_PRE_TREATMENT_NO_CART_SELF_TEST_FAILURE = 128
+    ALARM_ID_INSTALL_NEW_CARTRIDGE = 129
+    ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY = 130
+    ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE = 131
+    ALARM_ID_NO_CARTRIDGE_LOADED = 132
+    ALARM_ID_END_TREATMENT_TIMEOUT_ALARM = 133
+    ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE = 134
+    ALARM_ID_DIALYSATE_TEMPERATURE_TOO_HIGH = 135
+    ALARM_ID_DIALYSATE_TEMPERATURE_TOO_LOW = 136
+    ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE = 137
+    ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE = 138
+    ALARM_ID_DG_FLOW_METER_CHECK_FAILURE = 139
+    ALARM_ID_DG_RO_PUMP_TOO_MANY_RAMP_UP_RETRY = 140
+    ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID = 141
+    ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID = 142
+    ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID = 143
+    ALARM_ID_HD_AC_POWER_LOST = 144
+    ALARM_ID_DG_RESTARTED_FAULT = 145
+    ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE = 146
+    ALARM_ID_HD_FLUID_LEAK_DETECTED = 147
+    ALARM_ID_DG_FLUID_LEAK_DETECTED = 148
+    ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR = 149
+    ALARM_ID_HD_SYRINGE_DETECTED = 150
+    ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR = 151
+    ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR = 152
+    ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY = 153
+    ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION = 154
+    ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED = 155
+    ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR = 156
+    ALARM_ID_HD_BLOOD_LEAK_DETECTED = 157
+    ALARM_ID_CARTRIDGE_REMOVAL_FAILURE = 158
+    ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT = 159
+    ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT = 160
+    ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT = 161
+    ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT = 162
+    ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE = 163
+    ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT = 164
+    ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT = 165
+    ALARM_ID_DG_BAD_INLET_WATER_QUALITY = 166
+    ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE = 167
+    ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE = 168
+    ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE = 169
+    ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE = 170
+    ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE = 171
+    ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE = 172
+    ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE = 173
+    ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE = 174
+    ALARM_ID_HD_BLOOD_LEAK_FAULT = 175
+    ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION = 176
+    ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE = 177
+    ALARM_ID_DG_PRIMARY_HEATERS_INTERNAL_TEMP_OUT_OF_RANGE = 178
+    ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 179
+    ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT = 180
+    ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT = 181
+    ALARM_ID_DIALYSATE_TEMPERATURE_HIGH = 182
+    ALARM_ID_DIALYSATE_TEMPERATURE_LOW = 183
+    ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE = 184
+    ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT = 185
+    ALARM_ID_DG_INVALID_LOAD_CELL_VALUE = 186
+    ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR = 187
+    ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR = 188
+    ALARM_ID_HD_SYRINGE_PUMP_FAULT = 189
+    ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_ERROR = 190
+    ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM = 191
+    ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR = 192
+    ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR = 193
Index: dialin/common/msg_ids.py
===================================================================
diff -u -raf21ad6b590a05515b33e573d1c9236f21cafa3e -rc395352cad31f029410029b2df987fbe21934843
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision af21ad6b590a05515b33e573d1c9236f21cafa3e)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision c395352cad31f029410029b2df987fbe21934843)
@@ -8,9 +8,9 @@
 # @file msg_ids.py
 #
 # @author (last) Peter Lucia
-# @date (last) 14-Apr-2021
+# @date (last) 29-Apr-2021
 # @author (original) Peter Lucia
-# @date (original) 14-Apr-2021
+# @date (original) 29-Apr-2021
 #
 ############################################################################
 from enum import unique
@@ -119,7 +119,7 @@
     MSG_ID_HD_SYRINGE_PUMP_DATA = 0X69
     MSG_ID_HD_FLUID_LEAK_STATE = 0X6A
     MSG_ID_DG_FLUID_LEAK_STATE = 0X6B
-    MSG_ID_HD_BLOOD_LEAK_STATUS = 0X6C
+    MSG_ID_HD_BLOOD_LEAK_DATA = 0X6C
     MSG_ID_UI_HD_SET_RTC_REQUEST = 0X6D
     MSG_ID_HD_UI_SET_RTC_RESPONSE = 0X6E
     MSG_ID_UI_DG_SET_RTC_REQUEST = 0X6F
@@ -132,9 +132,12 @@
     MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST = 0X75
     MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0X76
     MSG_ID_HD_POST_TREATMENT_STATE = 0X77
-    MSG_ID_HD_BLOOD_LEAK_STATE = 0X78
+    MSG_ID___AVAILABLE_16 = 0X78
     MSG_ID_DG_START_STOP_FLUSH = 0X79
     MSG_ID_DG_FLUSH_DATA = 0X7A
+    MSG_ID_HD_VOLTAGES_DATA = 0X7B
+    MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0X7C
+    MSG_ID_HD_ALARM_INFORMATION = 0X7D
     MSG_ID_DIALYSATE_FLOW_DATA = 0X8
     MSG_ID_TESTER_LOGIN_REQUEST = 0X8000
     MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0X8001
@@ -208,14 +211,22 @@
     MSG_ID_HD_SEND_SERVICE_RECORD = 0X8045
     MSG_ID_HD_SET_OP_MODE_REQUEST = 0X8046
     MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0X8047
-    MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0X8048
+    MSG_ID_HD_FLUID_LEAK_STATE_OVERRIDE = 0X8048
     MSG_ID_HD_SYRINGE_PUMP_MEASURED_HOME_OVERRIDE = 0X8049
     MSG_ID_HD_SYRINGE_PUMP_MEASURED_POSITION_OVERRIDE = 0X804A
     MSG_ID_HD_SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE = 0X804B
-    MSG_ID_HD_BLOOD_LEAK_STATUS_SEND_INTERVAL_OVERRIDE = 0X804C
-    MSG_ID_HD_BLOOD_LEAK_STATUS_DETECTOR_OVERRIDE = 0X804D
-    MSG_ID_HD_BLOOD_LEAK_STATE_SEND_INTERVAL_OVERRIDE = 0X804E
-    MSG_ID_HD_BLOOD_LEAK_STATE_DETECTOR_OVERRIDE = 0X804F
+    MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE = 0X804C
+    MSG_ID_HD_BLOOD_LEAK_STATUS_OVERRIDE = 0X804D
+    MSG_ID_HD_BLOOD_LEAK_ZERO_REQUEST = 0X804E
+    MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE = 0X8050
+    MSG_ID_HD_MONITORED_VOLTAGES_OVERRIDE = 0X8051
+    MSG_ID_HD_ALARM_INFO_SEND_INTERVAL_OVERRIDE = 0X8052
+    MSG_ID_HD_ALARM_AUDIO_VOLUME_LEVEL_OVERRIDE = 0X8053
+    MSG_ID_HD_ALARM_AUDIO_CURRENT_HG_OVERRIDE = 0X8054
+    MSG_ID_HD_ALARM_AUDIO_CURRENT_LG_OVERRIDE = 0X8055
+    MSG_ID_HD_ALARM_BACKUP_AUDIO_CURRENT_OVERRIDE = 0X8056
+    MSG_ID_HD_VALVES_CURRENT_OVERRIDE = 0X8057
+    MSG_ID_DG_VOLTAGES_DATA = 0X86
     MSG_ID_PRESSURE_OCCLUSION_DATA = 0X9
     MSG_ID_CAN_ERROR_COUNT = 0X999
     MSG_ID_RTC_EPOCH = 0XA
@@ -243,7 +254,8 @@
     MSG_ID_DG_ACCEL_OVERRIDE = 0XA017
     MSG_ID_DG_ACCEL_MAX_OVERRIDE = 0XA018
     MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE = 0XA019
-    MSG_ID___AVAILABLE_11 = 0XA01A
+    MSG_ID_DG_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE = 0XA01A
+    MSG_ID_DG_MONITORED_VOLTAGES_OVERRIDE = 0XA01B
     MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0XA01C
     MSG_ID___AVAILABLE_12 = 0XA01D
     MSG_ID___AVAILABLE_13 = 0XA01E
Index: dialin/hd/fluid_leak.py
===================================================================
diff -u -r79b47911f0ea424cd8dc10c1e1f150b84d4dfa54 -rc395352cad31f029410029b2df987fbe21934843
--- dialin/hd/fluid_leak.py	(.../fluid_leak.py)	(revision 79b47911f0ea424cd8dc10c1e1f150b84d4dfa54)
+++ dialin/hd/fluid_leak.py	(.../fluid_leak.py)	(revision c395352cad31f029410029b2df987fbe21934843)
@@ -90,7 +90,7 @@
         payload = rst + det
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_HD_FLUID_LEAK_STATE_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("Override fluid leak detector state value")
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -rcb04db4bbb066c806d47398f3b2e819bbacc55e4 -rc395352cad31f029410029b2df987fbe21934843
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision cb04db4bbb066c806d47398f3b2e819bbacc55e4)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision c395352cad31f029410029b2df987fbe21934843)
@@ -19,6 +19,7 @@
 from .alarms import HDAlarms
 from .blood_leak import HDBloodLeak
 from .buttons import HDButtons
+from .fluid_leak import HDFluidLeak
 from .ui_proxy import HDUIProxy
 from .watchdog import HDWatchdog
 from .rtc import HDRTC
@@ -27,7 +28,12 @@
 from .dialysate_outlet_flow import HDDialysateOutletFlow
 from .treatment import HDTreatment
 from .valves import HDValves
+from .calibration_record import HDCalibrationNVRecord
+from .system_record import HDSystemNVRecords
+from .service_record import HDServiceNVRecords
 from .pressure_occlusion import HDPressureOcclusion
+from .pretreatment import HDPreTreatment
+from .syringe_pump import HDSyringePump
 from ..protocols.CAN import (DenaliMessage,
                              DenaliCanMessenger,
                              DenaliChannels)
@@ -36,6 +42,7 @@
 from ..utils.base import _AbstractSubSystem, _publish, _LogManager
 from .constants import NO_RESET
 from ..common.msg_defs import MsgIds, MsgFieldPositions
+from ..common.hd_defs import HDOpModes
 
 
 class HD(_AbstractSubSystem):
@@ -47,16 +54,6 @@
     # HD login password
     HD_LOGIN_PASSWORD = '123'
 
-    # HD operation modes
-    HD_OP_MODE_FAULT = 0
-    HD_OP_MODE_SERVICE = 1
-    HD_OP_MODE_INIT_POST = 2
-    HD_OP_MODE_STANDBY = 3
-    HD_OP_MODE_TREATMENT_PARAMS = 4
-    HD_OP_MODE_PRE_TREATMENT = 6
-    HD_OP_MODE_TREATMENT = 7
-    HD_OP_MODE_POST_TREATMENT = 8
-
     def __init__(self, can_interface="can0", log_level=None):
         """
         HD object provides test/service commands for the HD sub-system.
@@ -69,9 +66,8 @@
 
         @param can_interface: (str) CANBus interface name, e.g. "can0"
         @param log_level: (str) Logging level, defaults to None
-
-
         """
+
         super().__init__()
         self._log_manager = _LogManager(log_level=log_level, log_filepath=self.__class__.__name__+".log")
         self.logger = self._log_manager.logger
@@ -88,38 +84,32 @@
             msg_id = MsgIds.MSG_ID_HD_OP_MODE.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_hd_op_mode_sync)
-            msg_id = MsgIds.MSG_ID_HD_CALIBRATION_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                       self._handler_hd_cal_data_sync)
 
         # create properties
-        self.hd_operation_mode = self.HD_OP_MODE_INIT_POST
+        self.hd_operation_mode = HDOpModes.MODE_INIT.value
         self.hd_operation_sub_mode = 0
-        self.hd_calibration_data = {"Revision":0,
-                                    "AccelXOffset":0.0,
-                                    "AccelYOffset":0.0,
-                                    "AccelZOffset":0.0,
-                                    "BloodFlowGain":0.0,
-                                    "BloodFlowOffset":0.0,
-                                    "DialysateFlowGain":0.0,
-                                    "DialysateFlowOffset":0.0}
 
         # Create command groups
-
         self.accel = HDAccelerometer(self.can_interface, self.logger)
         self.air_trap = HDAirTrap(self.can_interface, self.logger)
         self.alarms = HDAlarms(self.can_interface, self.logger)
         self.buttons = HDButtons(self.can_interface, self.logger)
         self.blood_leak = HDBloodLeak(self.can_interface, self.logger)
+        self.fluid_leak = HDFluidLeak(self.can_interface, self.logger)
         self.ui = HDUIProxy(self.can_interface, self.logger)
         self.rtc = HDRTC(self.can_interface, self.logger)
         self.watchdog = HDWatchdog(self.can_interface, self.logger)
         self.bloodflow = HDBloodFlow(self.can_interface, self.logger)
         self.dialysate_inlet_flow = HDDialysateInletFlow(self.can_interface, self.logger)
         self.dialysate_outlet_flow = HDDialysateOutletFlow(self.can_interface, self.logger)
         self.treatment = HDTreatment(self.can_interface, self.logger)
+        self.pretreatment = HDPreTreatment(self.can_interface, self.logger)
         self.pressure_occlusion = HDPressureOcclusion(self.can_interface, self.logger)
+        self.syringe_pump = HDSyringePump(self.can_interface, self.logger)
         self.valves = HDValves(self.can_interface, self.logger)
+        self.calibration_record = HDCalibrationNVRecord(self.can_interface, self.logger)
+        self.system_record = HDSystemNVRecords(self.can_interface, self.logger)
+        self.service_record = HDServiceNVRecords(self.can_interface, self.logger)
 
     def get_operation_mode(self):
         """
@@ -129,50 +119,6 @@
         """
         return self.hd_operation_mode
 
-    def get_hd_calibration_data(self):
-        """
-        Gets the HD calibration record
-
-        @return: The hd calibration record
-        """
-        return self.hd_calibration_data
-
-    @_publish(["hd_calibration_data"])
-    def _handler_hd_cal_data_sync(self, message):
-        """
-        Handles published HD calibration data messages.  Current HD calibration data
-        is captured for reference.  Call cmd_request_hd_calibration_data() method
-        to request HD to publish HD calibration data.
-
-        @param message:  published HD calibration data broadcast message
-        @return: None
-        """
-        rev = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
-        acc_x = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
-        acc_y = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
-        acc_z = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
-        bf_g = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
-        bf_o = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
-        df_g = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
-        df_o = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
-
-        self.hd_calibration_data["Revision"] = rev[0]
-        self.hd_calibration_data["AccelXOffset"] = acc_x[0]
-        self.hd_calibration_data["AccelYOffset"] = acc_y[0]
-        self.hd_calibration_data["AccelZOffset"] = acc_z[0]
-        self.hd_calibration_data["BloodFlowGain"] = bf_g[0]
-        self.hd_calibration_data["BloodFlowOffset"] = bf_o[0]
-        self.hd_calibration_data["DialysateFlowGain"] = df_g[0]
-        self.hd_calibration_data["DialysateFlowOffset"] = df_o[0]
-
     @_publish(["hd_operation_mode"])
     def _handler_hd_op_mode_sync(self, message):
         """
@@ -230,8 +176,9 @@
 
         """
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_REQUEST_CALIBRATION_DATA.value)
+                                              message_id=MsgIds.MSG_ID_HD_GET_CALIBRATION_RECORD.value)
 
+
         self.logger.debug("requesting HD calibration data.")
 
         # Send message
@@ -247,38 +194,6 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_hd_erase_calibration_data(self):
-        """
-        Constructs and sends an erase HD calibration data request command via CAN bus.
-        Constraints:
-            Must be logged into HD.
-
-        \returns response message if received, False if no response received
-
-        @return: 1 if successful, zero otherwise
-
-        """
-        key = integer_to_bytearray(-758926171)   # 0xD2C3B4A5
-
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_ERASE_CALIBRATION_DATA.value,
-                                              payload=key)
-
-        self.logger.debug("requesting HD calibration data be erased.")
-
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        if received_message is not None:
-            if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1:
-                self.logger.debug("HD calibration data erasure request accepted.")
-            else:
-                self.logger.debug("HD calibration data erasure request failed.")
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.debug("Timeout!!!!")
-            return False
-
     def cmd_hd_set_operation_mode(self, newMode=0):
         """
         Constructs and sends a set operation mode request command via CAN bus.