Index: dialin/common/msg_defs.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -13,9 +13,12 @@
 # @date (original) 07-Aug-2020
 #
 ############################################################################
-import enum
+from enum import unique
+from ..protocols.CAN import DenaliMessage
+from ..utils.base import DialinEnum
 
-class MsgIds(enum.Enum):
+@unique
+class MsgIds(DialinEnum):
     MSG_ID_UNUSED = 0                                           # Zero is an undefined (un-used) message ID)
     MSG_ID_OFF_BUTTON_PRESS = 1                                 # HD/UI off button interactions
     MSG_ID_ALARM_STATUS = 2                                     # HD broadcast of system alarm state information
@@ -63,8 +66,8 @@
     MSG_ID_DG_HEATERS_DATA = 0x2C                               # DG broadcast of the heaters data
     MSG_ID_DG_TEMPERATURE_DATA = 0x2D                           # DG broadcast of the temperature sensors data
     MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x2E # HD response to user selection of ultrafiltration settings change option selection
-    MSG_ID_DG_START_STOP_HEAT_DISINFECT = 0x2F                  # HD request to start or stop DG heat disinfection
-    MSG_ID_SALINE_BOLUS_DATA = 0x30                             # HD broadcast of saline bolus data
+    MSG_ID_SALINE_BOLUS_DATA = 0x2F                             # HD broadcast of saline bolus data
+    MSG_ID_DG_START_STOP_HEAT_DISINFECT = 0x30                  # HD request to start or stop DG heat disinfection
     MSG_ID_DG_CONDUCTIVITY_DATA = 0x31                          # DG broadcast of the conductivity sensors data
     MSG_ID_USER_REQUEST_ALARM_SILENCE = 0x32                    # UI request alarm silence (or cancel)
     MSG_ID_HD_ACCELEROMETER_DATA = 0x33                         # HD broadcast of accelerometer data
@@ -74,19 +77,28 @@
     MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37                        # DG heat disinfection publish data
     MSG_ID_UI_START_TREATMENT = 0x38                            # UI user request to initiate a treatment
     MSG_ID_HD_START_TREATMENT_RESPONSE = 0x39                   # HD response to user request to initiate a treatment
-    MSG_ID_UI_ALARM_ACKNOWLEDGE = 0x3F                          # UI Tells HD an alarm has been acknowledged
     MSG_ID_HD_VALVES_DATA = 0x3B                                # HD broadcast of valves data
     MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3A              # UI user confirmation of treatment parameters
     MSG_ID_UI_TREATMENT_END_REQUEST = 0x3C                      # UI user treatment end request
     MSG_ID_HD_TREATMENT_END_RESPONSE = 0x3D                     # HD response to user request to end treatment
     MSG_ID_HD_AIR_TRAP_DATA = 0x003E                            # HD broadcast of air trap data
+    MSG_ID_UI_ALARM_USER_ACKNOWLEDGE = 0x3F                     # UI user has acknowledged alarm
+    MSG_ID_UI_ALARM_USER_ACTION = 0x40                          # UI user has requested an alarm action
+    MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE = 0x41                 # HD response to user request to pause or resume UF
+    MSG_ID_DG_CONCENTRATE_PUMP_DATA = 0x42                      # DG broadcast of concentrate pump data
+    MSG_ID_DG_PRIMING_STATUS_DATA = 0x43                        # HD priming status during cartridge prime
+    MSG_ID_DG_UV_REACTORS_DATA = 0x44                           # DG broadcast UV reactors data
+    MSG_ID_DG_THERMISTORS_DATA = 0x45                           # DG broadcast thermistors data
+    MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x46             # DG broadcast thermistors data
+    MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x47            # DG broadcast thermistors data
+    MSG_ID_DG_FANS_DATA = 0x48                                  # DG broadcast fans data
+    MSG_ID_HD_CALIBRATION_DATA = 0x49                           # HD broadcast calibration data
+    MSG_ID_DG_CALIBRATION_DATA = 0x4A                           # DG broadcast calibration data
 
     MSG_ID_CAN_ERROR_COUNT = 0x999                              # test code in support of EMC testing
 
     # service/test CAN messages
-    MSG_ID_FIRST_TESTER_MESSAGE = 0x8000                        # First HD test message ID
-    MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE   # HD tester log-in
-    MSG_ID_HD_MESSAGE = 0x8001                                  # Obsolete - TODO - remove when all references to this ID are deleted
+    MSG_ID_TESTER_LOGIN_REQUEST = 0x8000                        # HD tester log-in
     MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0x8001               # Dialysate outlet flow set point override request
     MSG_ID_OFF_BUTTON_STATE_OVERRIDE = 0x8002                   # Off button override request
     MSG_ID_STOP_BUTTON_STATE_OVERRIDE = 0x8003                  # Stop button override request
@@ -139,9 +151,15 @@
     MSG_ID_DG_AIR_TRAP_DATA_BROADCAST_INTERVAL_OVERRIDE = 0x8032  # HD air trap data broadcast interval override request
     MSG_ID_DG_AIR_TRAP_LEVEL_SENSOR_OVERRIDE = 0x8033           # HD air trap level sensor override request
     MSG_ID_HD_SOFTWARE_RESET_REQUEST = 0x8034                   # HD reset request
+    MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE = 0x8035            # Blood flow signal strength override request
+    MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE = 0x8036          # Dialysate flow signal strength override request
+    MSG_ID_BLOOD_PUMP_HOME_CMD = 0x8037                         # Blood pump home command
+    MSG_ID_DIAL_IN_PUMP_HOME_CMD = 0x8038                       # Dialysate inlet pump home command
+    MSG_ID_DIAL_OUT_PUMP_HOME_CMD = 0x8039                      # Dialysate outlet pump home command
+    MSG_ID_SUPER_CLEAR_ALARMS_CMD = 0x803A                      # Clears all alarms (even if non-recoverable or fault)
+    MSG_ID_HD_REQUEST_CALIBRATION_DATA = 0x803B                 # Requests calibration data from HD
 
-    MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000                     # First DG test message ID
-    MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE  # DG tester log-in
+    MSG_ID_DG_TESTER_LOGIN_REQUEST = 0XA000                     # DG tester log-in
     MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001                     # DG alarm state override message ID
     MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE = 0xA002           # Watchdog check-in override request
     MSG_ID_DG_SET_RTC_DATE_TIME = 0xA004                        # DG RTC set date/time
@@ -174,17 +192,22 @@
     MSG_ID_HEAT_DISINFECT_RSRVR2_TO_RSRVR1_DURATION_MINS = 0xA01F    # Heat disinfection reservoir 2 to reservoir 1 duration in minutes
     MSG_ID_HEAT_DISINFECT_NO_OF_CYCLES_TO_RUN = 0xA020          # Heat disinfection number of cycles to run
     MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE = 0xA021    # Heat disinfection data publish interval override request
-    MSG_ID_PRIMING_STATUS = 0x0037                              # The priming status
     MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022                   # DG reset request
-    MSG_ID_HD_VALVES_SET_BLOOD_TRAP_VALVE = 0x8030              # HD valves set blood trap valve state
+    MSG_ID_DG_OPERATION_MODE_REQUEST = 0xA023                   # DG operation mode request
+    MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024      # Concentrate pumps' target speed override request
+    MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA025  # UV reactors data publish interval override
+    MSG_ID_CONCENTRATE_PUMP_STATE_CHANGE_REQUEST = 0xA026       # Concentrate pumps' state change request (on / off)
+    MSG_ID_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE = 0xA027  # Concentrate pumps' data publish interval override request
+    MSG_ID_DG_START_STOP_UV_REACTORS_OVERRIDE = 0xA028          # DG start/stop UV reactors override request
+    MSG_ID_DG_REQUEST_CALIBRATION_DATA = 0xA029                 # Requests calibration data from DG
+
     MSG_ID_HD_DEBUG_EVENT = 0xFFF1                              # HD debug event text to be logged in event log
     MSG_ID_DG_DEBUG_EVENT = 0xFFF2                              # DG debug event text to be logged in event log
 
     END_OF_MSG_IDS = 0xFFF3                                     # End of system message IDs
 
-
-class RequestRejectReasons(enum.Enum):
-
+@unique
+class RequestRejectReasons(DialinEnum):
     REQUEST_REJECT_REASON_NONE = 0
     REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE = 1
     REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM = 2
@@ -202,4 +225,54 @@
     REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS = 14
     REQUEST_REJECT_REASON_UF_NOT_PAUSED = 15
     REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16
-    NUM_OF_REQUEST_REJECT_REASONS = 17
+    REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE = 17
+    REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION = 18
+    REQUEST_REJECT_REASON_ARTERIAL_PRESSURE_LOW_VS_HIGH = 19
+    REQUEST_REJECT_REASON_VENOUS_PRESSURE_LOW_VS_HIGH = 20
+    REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED = 21
+    REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 22
+    NUM_OF_REQUEST_REJECT_REASONS = 23
+
+
+class MsgFldPositions:
+    # Generic response msg field byte positions (where 32-bit data fields are used)
+    START_POS_FIELD_1 = DenaliMessage.PAYLOAD_START_INDEX
+    END_POS_FIELD_1 = START_POS_FIELD_1 + 4
+    START_POS_FIELD_2 = END_POS_FIELD_1
+    END_POS_FIELD_2 = START_POS_FIELD_2 + 4
+    START_POS_FIELD_3 = END_POS_FIELD_2
+    END_POS_FIELD_3 = START_POS_FIELD_3 + 4
+    START_POS_FIELD_4 = END_POS_FIELD_3
+    END_POS_FIELD_4 = START_POS_FIELD_4 + 4
+    START_POS_FIELD_5 = END_POS_FIELD_4
+    END_POS_FIELD_5 = START_POS_FIELD_5 + 4
+    START_POS_FIELD_6 = END_POS_FIELD_5
+    END_POS_FIELD_6 = START_POS_FIELD_6 + 4
+    START_POS_FIELD_7 = END_POS_FIELD_6
+    END_POS_FIELD_7 = START_POS_FIELD_7 + 4
+    START_POS_FIELD_8 = END_POS_FIELD_7
+    END_POS_FIELD_8 = START_POS_FIELD_8 + 4
+    START_POS_FIELD_9 = END_POS_FIELD_8
+    END_POS_FIELD_9 = START_POS_FIELD_9 + 4
+    START_POS_FIELD_10 = END_POS_FIELD_9
+    END_POS_FIELD_10 = START_POS_FIELD_10 + 4
+    START_POS_FIELD_11 = END_POS_FIELD_10
+    END_POS_FIELD_11 = START_POS_FIELD_11 + 4
+    START_POS_FIELD_12 = END_POS_FIELD_11
+    END_POS_FIELD_12 = START_POS_FIELD_12 + 4
+    START_POS_FIELD_13 = END_POS_FIELD_12
+    END_POS_FIELD_13 = START_POS_FIELD_13 + 4
+    START_POS_FIELD_14 = END_POS_FIELD_13
+    END_POS_FIELD_14 = START_POS_FIELD_14 + 4
+    START_POS_FIELD_15 = END_POS_FIELD_14
+    END_POS_FIELD_15 = START_POS_FIELD_15 + 4
+    START_POS_FIELD_16 = END_POS_FIELD_15
+    END_POS_FIELD_16 = START_POS_FIELD_16 + 4
+    START_POS_FIELD_17 = END_POS_FIELD_16
+    END_POS_FIELD_17 = START_POS_FIELD_17 + 4
+    START_POS_FIELD_18 = END_POS_FIELD_17
+    END_POS_FIELD_18 = START_POS_FIELD_18 + 4
+    START_POS_FIELD_19 = END_POS_FIELD_18
+    END_POS_FIELD_19 = START_POS_FIELD_19 + 4
+    START_POS_FIELD_20 = END_POS_FIELD_19
+    END_POS_FIELD_20 = START_POS_FIELD_20 + 4
Index: dialin/dg/accelerometer.py
===================================================================
diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/dg/accelerometer.py	(.../accelerometer.py)	(revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4)
+++ dialin/dg/accelerometer.py	(.../accelerometer.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -1,19 +1,17 @@
 ###########################################################################
 #
-#  Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved.
+# Copyright (c) 2019-2020 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.
+# 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 accelerometer.py
+# @file accelerometer.py
 #
-#  @date 28-Jul-2020
-#  @author S. Nash
+# @author (last) Sean Nash
+# @date (last) 10-Sep-2020
+# @author (original) Sean Nash
+# @date (original) 29-Jul-2020
 #
-#  @brief
-#  Provides access to accelerometer readings and commands to override the
-#  accelerometer sensor readings.
-#
 ############################################################################
 import struct
 from ..protocols.CAN import (DenaliMessage,
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -26,8 +26,11 @@
 from .heaters import Heaters
 from .temperature_sensors import TemperatureSensors
 from .conductivity_sensors import ConductivitySensors
+from .concentrate_pumps import ConcentratePumps
+from ..utils.conversions import integer_to_bytearray
 from ..protocols.CAN import (DenaliCanMessenger, DenaliMessage, DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish, _LogManager
+from ..common.msg_defs import MsgIds, MsgFldPositions
 
 
 class DG(_AbstractSubSystem):
@@ -36,23 +39,9 @@
     the DG firmware.
     """
 
-    # DG message IDs
-    MSG_ID_DG_OPERATION_MODE_BROADCAST = 0x0027
-    MSG_ID_DG_REQUEST_DG_VERSION = 0x001C
-    MSG_ID_DG_DG_VERSION_RESPONSE = 0x001E
-    MSG_ID_LOGIN_TO_DG = 0xA000
-    MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE = 0xA014
-    MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022
-
     # HD login password
     DG_LOGIN_PASSWORD = '123'
 
-    # broadcast message field positions
-    START_POS_DG_OP_MODE = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_DG_OP_MODE = START_POS_DG_OP_MODE + 4
-    START_POS_DG_SUB_MODE = END_POS_DG_OP_MODE
-    END_POS_DG_SUB_MODE = START_POS_DG_SUB_MODE + 4
-
     # DG version message field positions
     START_POS_MAJOR = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_MAJOR = START_POS_MAJOR + 1
@@ -123,11 +112,11 @@
         # register handler for HD operation mode broadcast messages
         if self.can_interface is not None:
             channel_id = DenaliChannels.dg_sync_broadcast_ch_id
-            msg_id = self.MSG_ID_DG_OPERATION_MODE_BROADCAST
+            msg_id = MsgIds.MSG_ID_DG_OP_MODE.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_dg_op_mode_sync)
             self.can_interface.register_receiving_publication_function(DenaliChannels.dg_sync_broadcast_ch_id,
-                                                                       self.MSG_ID_DG_DG_VERSION_RESPONSE,
+                                                                       MsgIds.MSG_ID_DG_VERSION.value,
                                                                        self._handler_dg_version)
 
         # initialize variables that will be populated by DG version response
@@ -149,6 +138,7 @@
         self.heaters = Heaters(self.can_interface, self.logger)
         self.temperature_sensors = TemperatureSensors(self.can_interface, self.logger)
         self.conductivity_sensors = ConductivitySensors(self.can_interface, self.logger)
+        self.concentrate_pumps = ConcentratePumps(self.can_interface, self.logger)
         self.alarms = DGAlarms(self.can_interface, self.logger)
 
     def get_version(self):
@@ -229,9 +219,9 @@
         """
 
         mode = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_DG_OP_MODE:self.END_POS_DG_OP_MODE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         smode = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_DG_SUB_MODE:self.END_POS_DG_SUB_MODE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
 
         self.dg_operation_mode = mode[0]
         self.dg_operation_sub_mode = smode[0]
@@ -245,7 +235,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_LOGIN_TO_DG,
+                                              message_id=MsgIds.MSG_ID_DG_TESTER_LOGIN_REQUEST.value,
                                               payload=list(map(int, map(ord, self.DG_LOGIN_PASSWORD))))
 
         self.logger.info("Logging in to the DG...")
@@ -270,7 +260,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_DG_REQUEST_DG_VERSION)
+                                              message_id=MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value)
 
         self.logger.debug("Sending Dialin request for version to DG")
 
@@ -286,7 +276,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE)
+                                              message_id=MsgIds.MSG_ID_DG_SAFETY_SHUTDOWN_OVERRIDE.value)
 
         self.logger.debug("overriding DG safety shutdown")
 
@@ -316,7 +306,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_DG_SOFTWARE_RESET_REQUEST)
+                                              message_id=MsgIds.MSG_ID_DG_SOFTWARE_RESET_REQUEST.value)
 
         self.logger.debug("requesting DG software reset")
 
@@ -332,3 +322,35 @@
         else:
             self.logger.debug("Timeout!!!!")
             return False
+
+    def cmd_dg_change_operation_mode_request(self, mode=0):
+        """
+        Constructs and sends an DG change operation mode request via CAN bus.
+        Constraints:
+            Must be logged into DG.
+
+        \returns response message if received, False if no response received
+
+        @return: 1 if successful, zero otherwise
+
+        """
+
+        mode_byte_array = integer_to_bytearray(mode)
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
+                                              message_id=MsgIds.MSG_ID_DG_OPERATION_MODE_REQUEST.value,
+                                              payload=mode_byte_array)
+
+        self.logger.debug("requesting DG operation mode change")
+
+        # 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("request changing DG operation mode succesfully...")
+            else:
+                self.logger.debug("DG operation mode change request failed.")
+            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+        else:
+            self.logger.debug("Timeout!!!!")
+            return False
Index: dialin/dg/hd_proxy.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/dg/hd_proxy.py	(.../hd_proxy.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/dg/hd_proxy.py	(.../hd_proxy.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -14,6 +14,7 @@
 #
 ############################################################################
 from ..utils.conversions import integer_to_bytearray
+from ..common.msg_defs import MsgIds
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
@@ -26,15 +27,7 @@
 
     \brief Dialysate Generator (DG) Dialin API sub-class for HD proxy commands.
     """
-    # Pressure/Occlusion message IDs
-    MSG_ID_HD_SWITCH_RESERVOIRS_CMD = 0x0021
-    MSG_ID_HD_FILL_CMD = 0x0022
-    MSG_ID_HD_DRAIN_CMD = 0x0023
-    MSG_ID_HD_START_STOP_DG_CMD = 0x0026
-    MSG_ID_HD_START_STOP_DG_TRIMMER_HEATER = 0x002B
 
-    MSG_ID_DG_START_STOP_HEAT_DISINFECT = 0x2F
-
     # Reservoir IDs
     RESERVOIR1 = 0
     RESERVOIR2 = 1
@@ -67,7 +60,7 @@
         payload = res
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_HD_SWITCH_RESERVOIRS_CMD,
+                                              message_id=MsgIds.MSG_ID_DG_SWITCH_RESERVOIR_CMD.value,
                                               payload=payload)
 
         self.logger.debug("switch reservoirs cmd sent to DG")
@@ -98,7 +91,7 @@
         payload = vol
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_HD_FILL_CMD,
+                                              message_id=MsgIds.MSG_ID_DG_FILL_CMD.value,
                                               payload=payload)
 
         self.logger.debug("fill cmd sent to DG")
@@ -129,7 +122,7 @@
         payload = vol
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_HD_DRAIN_CMD,
+                                              message_id=MsgIds.MSG_ID_DG_DRAIN_CMD.value,
                                               payload=payload)
 
         self.logger.debug("drain cmd sent to DG")
@@ -165,7 +158,7 @@
         payload = integer_to_bytearray(cmd)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_HD_START_STOP_DG_CMD,
+                                              message_id=MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD.value,
                                               payload=payload)
 
         self.logger.debug(str+"DG cmd sent to DG")
@@ -198,7 +191,7 @@
         payload = integer_to_bytearray(cmd)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_HD_START_STOP_DG_TRIMMER_HEATER,
+                                              message_id=MsgIds.MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD.value,
                                               payload=payload)
 
         self.logger.debug(str+"DG trimmer heater cmd sent to DG")
@@ -225,7 +218,7 @@
         # 1 is to start
         payload = integer_to_bytearray(1)
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_DG_START_STOP_HEAT_DISINFECT,
+                                              message_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT.value,
                                               payload=payload)
         print("Starting heat disinfection process")
         received_message = self.can_interface.send(message)
@@ -241,7 +234,7 @@
         # 1 is to start
         payload = integer_to_bytearray(0)
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_DG_START_STOP_HEAT_DISINFECT,
+                                              message_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT.value,
                                               payload=payload)
         print("Stopping heat disinfection process")
         received_message = self.can_interface.send(message)
@@ -255,7 +248,7 @@
         # 0 is to stop
         payload = integer_to_bytearray(0)
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_HD_START_STOP_DG_TRIMMER_HEATER,
+                                              message_id=MsgIds.MSG_ID_HD_START_STOP_DG_TRIMMER_HEATER.value,
                                               payload=payload)
         print("Stopping heat disinfection process")
-        self.can_interface.send(message, 0)
\ No newline at end of file
+        self.can_interface.send(message, 0)
Index: dialin/dg/heaters.py
===================================================================
diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/dg/heaters.py	(.../heaters.py)	(revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4)
+++ dialin/dg/heaters.py	(.../heaters.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -8,7 +8,7 @@
 # @file heaters.py
 #
 # @author (last) Peter Lucia
-# @date (last) 26-Aug-2020
+# @date (last) 02-Oct-2020
 # @author (original) Dara Navaei
 # @date (original) 29-May-2020
 #
Index: dialin/dg/load_cells.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/dg/load_cells.py	(.../load_cells.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/dg/load_cells.py	(.../load_cells.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -15,6 +15,7 @@
 ############################################################################
 import struct
 from ..utils.conversions import integer_to_bytearray, float_to_bytearray
+from ..common.msg_defs import MsgIds, MsgFldPositions
 from .constants import RESET,NO_RESET
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
@@ -29,21 +30,6 @@
     Dialysate Generator (DG) Dialin API sub-class for load cell related commands.
     """
 
-    # Load cell message IDs
-    MSG_ID_DG_LOAD_CELL_DATA = 0x000C
-    MSG_ID_DG_LOAD_CELL_OVERRIDE = 0xA005
-    MSG_ID_DG_LOAD_CELL_DATA_BROADCAST_INTERVAL_OVERRIDE = 0xA00D
-
-    # Load cell broadcast message field positions
-    START_POS_LC_A1 = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_LC_A1 = START_POS_LC_A1 + 4
-    START_POS_LC_A2 = END_POS_LC_A1
-    END_POS_LC_A2 = START_POS_LC_A2 + 4
-    START_POS_LC_B1 = END_POS_LC_A2
-    END_POS_LC_B1 = START_POS_LC_B1 + 4
-    START_POS_LC_B2 = END_POS_LC_B1
-    END_POS_LC_B2 = START_POS_LC_B2 + 4
-
     # Load Cell IDs
     LOAD_CELL_A1 = 0
     LOAD_CELL_A2 = 1
@@ -61,7 +47,7 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.dg_sync_broadcast_ch_id
-            msg_id = self.MSG_ID_DG_LOAD_CELL_DATA
+            msg_id = MsgIds.MSG_ID_LOAD_CELL_READINGS.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_load_cells_sync)
 
@@ -89,13 +75,13 @@
         """
 
         a1 = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_LC_A1:self.END_POS_LC_A1]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         a2 = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_LC_A2:self.END_POS_LC_A2]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         b1 = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_LC_B1:self.END_POS_LC_B1]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
         b2 = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_LC_B2:self.END_POS_LC_B2]))
+            message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
 
         self.load_cell_A1 = a1[0]
         self.load_cell_A2 = a2[0]
@@ -127,7 +113,7 @@
         payload = rst + grm + idx
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_DG_LOAD_CELL_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_LOAD_CELL_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override load cell weight value for sensor " + str(sensor))
@@ -160,7 +146,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_DG_LOAD_CELL_DATA_BROADCAST_INTERVAL_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_LOAD_CELLL_SEND_INTERVAL_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override DG load cell broadcast interval")
Index: dialin/dg/ro_pump.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -15,6 +15,7 @@
 ############################################################################
 import struct
 from ..utils.conversions import integer_to_bytearray, float_to_bytearray
+from ..common.msg_defs import MsgIds, MsgFldPositions
 from .constants import RESET, NO_RESET
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
@@ -29,23 +30,6 @@
 
     """
 
-    # RO pump message IDs
-    MSG_ID_DG_RO_PUMP_PUBLISHED_DATA = 0x001F
-    MSG_ID_DG_RO_PUMP_PRESSURE_SET_PT_OVERRIDE = 0xA008
-    #MSG_ID_DG_RO_FLOW_RATE_OVERRIDE = 0xA009
-    MSG_ID_DG_RO_PUMP_BROADCAST_INTERVAL_OVERRIDE = 0xA00A
-    MSG_ID_RO_PUMP_SET_PT_OVERRIDE = 0xA008
-
-    # RO pump broadcast message field positions
-    START_POS_PRES_SET_PT = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_PRES_SET_PT = START_POS_PRES_SET_PT + 4
-    START_POS_MEAS_FLOW = END_POS_PRES_SET_PT
-    END_POS_MEAS_FLOW = START_POS_MEAS_FLOW + 4
-    START_POS_PWM = END_POS_MEAS_FLOW
-    END_POS_PWM = START_POS_PWM + 4
-    START_POS_STATE = END_POS_PWM
-    END_POS_STATE = START_POS_STATE + 4
-
     #Enums
     RAMP_UP_STATE = 0
 
@@ -61,7 +45,7 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.dg_sync_broadcast_ch_id
-            msg_id = self.MSG_ID_DG_RO_PUMP_PUBLISHED_DATA
+            msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_ro_pump_sync)
 
@@ -107,13 +91,13 @@
         """
 
         tgt = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_PRES_SET_PT:self.END_POS_PRES_SET_PT]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         flow = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_FLOW:self.END_POS_MEAS_FLOW]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         pwm = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_PWM:self.END_POS_PWM]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
         ro_state = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_STATE:self.END_POS_STATE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
 
         self.target_pressure_psi = tgt[0]
         self.measured_flow_rate_lpm = flow[0]
@@ -149,7 +133,7 @@
         payload = rst + prs
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_RO_PUMP_SET_PT_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_RO_PUMP_SET_PT_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override RO pump pressure set point")
@@ -189,7 +173,7 @@
         payload = rst + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_RO_PUMP_SET_PT_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_RO_PUMP_SET_PT_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override RO pump pressure set point")
@@ -230,7 +214,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
-                                              message_id=self.MSG_ID_DG_RO_PUMP_BROADCAST_INTERVAL_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override RO pump data broadcast interval")
Index: dialin/dg/temperature_sensors.py
===================================================================
diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/dg/temperature_sensors.py	(.../temperature_sensors.py)	(revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4)
+++ dialin/dg/temperature_sensors.py	(.../temperature_sensors.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -7,8 +7,8 @@
 #
 # @file temperature_sensors.py
 #
-# @author (last) Peter Lucia
-# @date (last) 26-Aug-2020
+# @author (last) Dara Navaei
+# @date (last) 02-Oct-2020
 # @author (original) Dara Navaei
 # @date (original) 02-Jun-2020
 #
Index: dialin/hd/accelerometer.py
===================================================================
diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/hd/accelerometer.py	(.../accelerometer.py)	(revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4)
+++ dialin/hd/accelerometer.py	(.../accelerometer.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -1,19 +1,17 @@
 ###########################################################################
 #
-#  Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved.
+# Copyright (c) 2019-2020 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.
+# 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 accelerometer.py
+# @file accelerometer.py
 #
-#  @date 28-Jul-2020
-#  @author S. Nash
+# @author (last) Sean Nash
+# @date (last) 10-Sep-2020
+# @author (original) Sean Nash
+# @date (original) 29-Jul-2020
 #
-#  @brief
-#  Provides access to accelerometer readings and commands to override the
-#  accelerometer sensor readings.
-#
 ############################################################################
 import struct
 from ..protocols.CAN import (DenaliMessage,
Index: dialin/hd/alarms.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -13,30 +13,22 @@
 # @date (original) 02-Apr-2020
 #
 ############################################################################
+import struct
+from logging import Logger
+
+from .constants import RESET, NO_RESET
+from ..common.msg_defs import MsgIds
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
-from ..utils.conversions import integer_to_bytearray
 from ..utils.base import _AbstractSubSystem, _publish
-from .constants import RESET, NO_RESET
-from collections import OrderedDict
-import struct
-from logging import Logger
-from ..common.alarm_defs import AlarmList
+from ..utils.conversions import integer_to_bytearray
 
 
 class HDAlarms(_AbstractSubSystem):
     """
     HD interface containing alarm related commands.
     """
 
-    # alarms message IDs
-    MSG_ID_HD_ALARMS_PUBLISHED_STATUS = 0x0002
-    MSG_ID_HD_ALARM_ACTIVATE = 0x0003
-    MSG_ID_HD_ALARM_CLEAR = 0x0004
-    MSG_ID_HD_ALARM_LAMP_OVERRIDE = 0x8004
-    MSG_ID_HD_ALARM_STATE_OVERRIDE = 0x8006
-    MSG_ID_HD_ALARM_TIME_OVERRIDE = 0x8007
-
     # Alarm lamp patterns
     HD_ALARM_LAMP_PATTERN_OFF = 0
     HD_ALARM_LAMP_PATTERN_OK = 1
@@ -77,16 +69,16 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_alarm_broadcast_ch_id
-            msg_id = self.MSG_ID_HD_ALARMS_PUBLISHED_STATUS
+            msg_id = MsgIds.MSG_ID_ALARM_STATUS.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_alarms_status_sync)
 
             channel_id = DenaliChannels.hd_alarm_broadcast_ch_id
-            msg_id = self.MSG_ID_HD_ALARM_ACTIVATE
+            msg_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_alarm_activate)
             channel_id = DenaliChannels.hd_alarm_broadcast_ch_id
-            msg_id = self.MSG_ID_HD_ALARM_CLEAR
+            msg_id = MsgIds.MSG_ID_ALARM_CLEARED.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_alarm_clear)
 
@@ -100,11 +92,6 @@
         # alarm states based on received HD alarm activation and alarm clear messages
         self.alarm_states = [False] * 500
 
-        self.ids = OrderedDict()
-        for attr in dir(AlarmList):
-            if not callable(getattr(AlarmList, attr)) and attr.startswith("ALARM_ID"):
-                self.ids[attr] = getattr(AlarmList, attr)
-        self.ids = OrderedDict(sorted(self.ids.items(), key=lambda key: key[1].value))
 
     def get_alarm_states(self):
         """
@@ -166,14 +153,6 @@
         """
         return self.alarms_flags
 
-    def get_alarm_ids(self):
-        """
-        Returns a dictionary of the alarm short name and the corresponding id
-
-        @return: OrderedDict of the alarm ids
-        """
-        return self.ids
-
     @_publish(["alarms_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"])
     def _handler_alarms_status_sync(self, message):
         """
@@ -225,6 +204,33 @@
         alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
         self.alarm_states[alarm_id[0]] = False
 
+    def cmd_clear_all_alarms(self):
+        """
+        Constructs and sends the clear all active alarms command.
+        This will clear even non-recoverable alarms.
+        Constraints:
+            Must be logged into HD.
+
+        @return: 1 if successful, zero otherwise
+        """
+
+        key = integer_to_bytearray(-758926171)   # 0xD2C3B4A5
+        payload = key
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_SUPER_CLEAR_ALARMS_CMD.value,
+                                              payload=payload)
+
+        # Send message
+        received_message = self.can_interface.send(message)
+
+        # If there is content...
+        if received_message is not None:
+            self.logger.debug("All alarms cleared.")
+            # response payload is OK or not OK
+            return 1 == received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+        return False
+
     def cmd_alarm_state_override(self, state, alarm, reset=NO_RESET):
         """
         Constructs and sends the alarm state override command
@@ -245,7 +251,7 @@
         payload = rst + sta + alm
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_ALARM_STATE_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_ALARM_STATE_OVERRIDE.value,
                                               payload=payload)
 
         # Send message
@@ -281,7 +287,7 @@
         payload = rst + ms + alm
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_ALARM_TIME_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_ALARM_TIME_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override alarm time since activated")
@@ -329,7 +335,7 @@
         payload = rst + pat
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_ALARM_LAMP_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("Override Alarm Lamp Pattern")
Index: dialin/hd/blood_flow.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -19,6 +19,7 @@
 from .constants import RESET, NO_RESET
 from .constants import PUMP_CONTROL_MODE_CLOSED_LOOP, PUMP_CONTROL_MODE_OPEN_LOOP
 from ..utils.base import _AbstractSubSystem, _publish
+from ..common.msg_defs import MsgIds, MsgFldPositions
 import struct
 from logging import Logger
 
@@ -31,33 +32,6 @@
 
     """
 
-    # bloodflow message IDs
-    MSG_ID_HD_BLOOD_FLOW_PUBLISHED_DATA = 0x0005
-    MSG_ID_HD_BLOOD_FLOW_SET_RATE_OVERRIDE = 0x8008
-    MSG_ID_HD_BLOOD_FLOW_MEAS_RATE_OVERRIDE = 0x8009
-    MSG_ID_HD_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE = 0x800A
-    MSG_ID_HD_BLOOD_PUMP_MC_MEAS_CURRENT_OVERRIDE = 0x800B
-    MSG_ID_HD_BLOOD_FLOW_PUBLISH_INTERVAL_OVERRIDE = 0x800C
-    MSG_ID_HD_BLOOD_PUMP_MEAS_SPEED_OVERRIDE = 0x800E
-    MSG_ID_HD_BLOOD_PUMP_ROTOR_MEAS_SPEED_OVERRIDE = 0x800F
-    MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION = 0x802B
-
-    # bloodflow broadcast message field positions
-    START_POS_SET_PT = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_SET_PT = START_POS_SET_PT + 4
-    START_POS_MEAS_FLOW = END_POS_SET_PT
-    END_POS_MEAS_FLOW = START_POS_MEAS_FLOW + 4
-    START_POS_MEAS_ROT_SPEED = END_POS_MEAS_FLOW
-    END_POS_MEAS_ROT_SPEED = START_POS_MEAS_ROT_SPEED + 4
-    START_POS_MEAS_SPEED = END_POS_MEAS_ROT_SPEED
-    END_POS_MEAS_SPEED = START_POS_MEAS_SPEED + 4
-    START_POS_MEAS_MC_SPEED = END_POS_MEAS_SPEED
-    END_POS_MEAS_MC_SPEED = START_POS_MEAS_MC_SPEED + 4
-    START_POS_MEAS_MC_CURR = END_POS_MEAS_MC_SPEED
-    END_POS_MEAS_MC_CURR = START_POS_MEAS_MC_CURR + 4
-    START_POS_PWM_DC = END_POS_MEAS_MC_CURR
-    END_POS_PWM_DC = START_POS_PWM_DC + 4
-
     def __init__(self, can_interface, logger: Logger):
         """
         HD_BloodFlow constructor
@@ -68,7 +42,7 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = self.MSG_ID_HD_BLOOD_FLOW_PUBLISHED_DATA
+            msg_id = MsgIds.MSG_ID_BLOOD_FLOW_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_blood_flow_sync)
 
@@ -79,6 +53,7 @@
         self.measured_blood_pump_mc_speed = 0.0
         self.measured_blood_pump_mc_current = 0.0
         self.pwm_duty_cycle_pct = 0.0
+        self.flow_signal_strength = 0.0
 
     def get_target_blood_flow_rate(self):
         """
@@ -112,15 +87,15 @@
         """
         return self.measured_blood_pump_speed
 
-    def get_measured_blood_pump_mc_speed(self):
+    def get_measured_blood_pump_motor_controller_speed(self):
         """
         Gets the measured blood pump motor controller speed
 
         @return: The measured blood pump motor controller speed
         """
         return self.measured_blood_pump_mc_speed
 
-    def get_measured_blood_pump_mc_current(self):
+    def get_measured_blood_pump_motor_controller_current(self):
         """
         Gets the measured blood pump motor controller current
 
@@ -132,13 +107,21 @@
         """
         Gets the pwm duty cycle pct
 
-        @return: the pwm duty cycle pct
+        @return: the pwm duty cycle pct (0..100)
         """
         return self.pwm_duty_cycle_pct
 
+    def get_flow_signal_strength(self):
+        """
+        Gets the blood flow signal strength pct
+
+        @return: the blood flow signal strength pct (0..100)
+        """
+        return self.flow_signal_strength
+
     @_publish(["target_blood_flow_rate", "measured_blood_flow_rate", "measured_blood_pump_rotor_speed",
                "measured_blood_pump_speed", "measured_blood_pump_mc_speed", "measured_blood_pump_mc_current",
-               "pwm_duty_cycle_pct"])
+               "pwm_duty_cycle_pct", "flow_signal_strength"])
     def _handler_blood_flow_sync(self, message):
         """
         Handles published blood flow data messages.  Blood flow data are captured
@@ -148,24 +131,22 @@
         @return: none
         """
 
-        # self.target_blood_flow_rate = int.from_bytes(bytearray(
-        #    message['message'][self.START_POS_SET_PT:self.END_POS_SET_PT]),
-        #    byteorder=DenaliMessage.BYTE_ORDER)
         tgt = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_SET_PT:self.END_POS_SET_PT]))
-
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         flow = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_FLOW:self.END_POS_MEAS_FLOW]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         rotor = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_ROT_SPEED:self.END_POS_MEAS_ROT_SPEED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
         speed = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_SPEED:self.END_POS_MEAS_SPEED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
         mcspeed = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_MC_SPEED:self.END_POS_MEAS_MC_SPEED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5]))
         mccurr = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_MC_CURR:self.END_POS_MEAS_MC_CURR]))
+            message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6]))
         pwm = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_PWM_DC:self.END_POS_PWM_DC]))
+            message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7]))
+        sig = struct.unpack('f', bytearray(
+            message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8]))
 
         self.target_blood_flow_rate = tgt[0]
         self.measured_blood_flow_rate = flow[0]
@@ -174,6 +155,7 @@
         self.measured_blood_pump_mc_speed = mcspeed[0]
         self.measured_blood_pump_mc_current = mccurr[0]
         self.pwm_duty_cycle_pct = pwm[0]
+        self.flow_signal_strength = sig[0]
 
     def cmd_blood_flow_set_point_override(self, flow, mode=PUMP_CONTROL_MODE_CLOSED_LOOP, reset=NO_RESET):
         """
@@ -194,7 +176,7 @@
         payload = rst + flo + mod
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_BLOOD_FLOW_SET_RATE_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_BLOOD_FLOW_SET_PT_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override blood flow set point")
@@ -238,7 +220,7 @@
         payload = rst + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_BLOOD_FLOW_MEAS_RATE_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_BLOOD_FLOW_MEAS_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured blood flow")
@@ -261,7 +243,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_blood_pump_mc_measured_speed_override(self, speed, reset=NO_RESET):
+    def cmd_blood_pump_measured_motor_controller_speed_override(self, speed, reset=NO_RESET):
         """
         Constructs and sends the measured blood pump motor controller speed \n
         override command.
@@ -278,7 +260,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured blood pump motor controller speed")
@@ -301,7 +283,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_measured_blood_pump_mc_current_override(self, curr, reset=NO_RESET):
+    def cmd_blood_pump_measured_motor_controller_current_override(self, curr, reset=NO_RESET):
         """
         Constructs and sends the measured blood pump motor controller current override command
         Constraints:
@@ -317,7 +299,7 @@
         payload = rst + cur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_BLOOD_PUMP_MC_MEAS_CURRENT_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured blood pump motor controller current")
@@ -340,7 +322,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_blood_pump_measured_speed_override(self, speed, reset=NO_RESET):
+    def cmd_blood_pump_measured_motor_speed_override(self, speed, reset=NO_RESET):
         """
         Constructs and sends the measured blood pump motor  speed override \n
         command.
@@ -357,7 +339,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_BLOOD_PUMP_MEAS_SPEED_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured blood pump speed")
@@ -397,7 +379,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_BLOOD_PUMP_ROTOR_MEAS_SPEED_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured blood pump rotor speed")
@@ -420,6 +402,46 @@
             self.logger.debug("Timeout!!!!")
             return False
 
+    def cmd_blood_flow_signal_strength_override(self, signal_strength, reset=NO_RESET):
+        """
+        Constructs and sends the measured blood flow signal strength % override \n
+        command.
+        Constraints:
+            Must be logged into HD.
+
+        @param signal_strength:  float - pct (0..100) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
+        """
+
+        rst = integer_to_bytearray(reset)
+        sig = float_to_bytearray(signal_strength)
+        payload = rst + sig
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE.value,
+                                              payload=payload)
+
+        self.logger.debug("override measured blood flow signal strength")
+
+        # Send message
+        received_message = self.can_interface.send(message)
+
+        # If there is content...
+        if received_message is not None:
+            # self.logger.debug(received_message)
+            if reset == RESET:
+                str_sig = "reset back to normal"
+            else:
+                str_sig = str(signal_strength)
+            self.logger.debug("Blood pump flow signal strength overridden to " + str_sig + " %: " +
+                  str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
+            # response payload is OK or not OK
+            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+        else:
+            self.logger.debug("Timeout!!!!")
+            return False
+
     def cmd_blood_flow_broadcast_interval_override(self, ms, reset=NO_RESET):
         """
         Constructs and sends the measured blood flow broadcast interval override command
@@ -437,7 +459,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_BLOOD_FLOW_PUBLISH_INTERVAL_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override blood flow broadcast interval")
@@ -471,22 +493,47 @@
         payload = gan + off
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION,
+                                              message_id=MsgIds.MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION.value,
                                               payload=payload)
 
-        print("Setting blood flow calibration factors")
+        self.logger.debug("Setting blood flow calibration factors")
 
         # Send message
         received_message = self.can_interface.send(message)
 
         # If there is content...
         if received_message is not None:
-            print(received_message)
-            # str_res = str(flow)
-            print("Blood flow calibration factors set to : " + str(gain) + ", " + str(offset) + ".  " +
+            self.logger.debug("Blood flow calibration factors set to : " + str(gain) + ", " + str(offset) + ".  " +
                   str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
-            print("Timeout!!!!")
+            self.logger.debug("Timeout!!!!")
             return False
+
+    def cmd_home_blood_pump(self):
+        """
+            Constructs and sends a blood pump home request message to the HD.
+            Constraints:
+                Must be logged into HD.
+                Blood pump must be stopped (off) prior to requesting home position.
+
+            @return: 1 if successful, zero otherwise
+        """
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_BLOOD_PUMP_HOME_CMD.value)
+
+        self.logger.debug("Homing blood pump")
+
+        # Send message
+        received_message = self.can_interface.send(message)
+
+        # If there is content...
+        if received_message is not None:
+            self.logger.debug("Blood pump homed : " +
+                  str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
+            # response payload is OK or not OK
+            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+        else:
+            self.logger.debug("Timeout!!!!")
+            return False
Index: dialin/hd/dialysate_inlet_flow.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -20,55 +20,27 @@
 from .constants import RESET, NO_RESET
 from .constants import PUMP_CONTROL_MODE_CLOSED_LOOP, PUMP_CONTROL_MODE_OPEN_LOOP
 from ..utils.base import _AbstractSubSystem, _publish
+from ..common.msg_defs import MsgIds, MsgFldPositions
 from logging import Logger
 
 class HDDialysateInletFlow(_AbstractSubSystem):
     """
-        \class HD_DialysateInletFlow
+    HDDialysateInletFlow
 
-        \brief Hemodialysis Device (HD) Dialin API sub-class for dialysate inlet pump related commands.
-
+    Hemodialysis Device (HD) Dialin API sub-class for dialysate inlet pump related commands.
     """
 
-    # DialysateFlow message IDs
-    MSG_ID_HD_DIAL_IN_FLOW_PUBLISHED_DATA = 0x0008
-    MSG_ID_HD_DIAL_IN_FLOW_SET_RATE_OVERRIDE = 0x8010
-    MSG_ID_HD_DIAL_IN_FLOW_MEAS_RATE_OVERRIDE = 0x8011
-    MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE = 0x8012
-    MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_CURRENT_OVERRIDE = 0x8013
-    MSG_ID_HD_DIAL_IN_FLOW_PUBLISH_INTERVAL_OVERRIDE = 0x8014
-    MSG_ID_HD_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE = 0x8015
-    MSG_ID_HD_DIAL_IN_PUMP_ROTOR_MEAS_SPEED_OVERRIDE = 0x8016
-    MSG_ID_HD_DIAL_IN_FLOW_SET_CALIBRATION = 0x802C
-
-    # bloodflow broadcast message field positions
-    START_POS_SET_PT = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_SET_PT = START_POS_SET_PT + 4
-    START_POS_MEAS_FLOW = END_POS_SET_PT
-    END_POS_MEAS_FLOW = START_POS_MEAS_FLOW + 4
-    START_POS_MEAS_ROT_SPEED = END_POS_MEAS_FLOW
-    END_POS_MEAS_ROT_SPEED = START_POS_MEAS_ROT_SPEED + 4
-    START_POS_MEAS_SPEED = END_POS_MEAS_ROT_SPEED
-    END_POS_MEAS_SPEED = START_POS_MEAS_SPEED + 4
-    START_POS_MEAS_MC_SPEED = END_POS_MEAS_SPEED
-    END_POS_MEAS_MC_SPEED = START_POS_MEAS_MC_SPEED + 4
-    START_POS_MEAS_MC_CURR = END_POS_MEAS_MC_SPEED
-    END_POS_MEAS_MC_CURR = START_POS_MEAS_MC_CURR + 4
-    START_POS_PWM_DC = END_POS_MEAS_MC_CURR
-    END_POS_PWM_DC = START_POS_PWM_DC + 4
-
     def __init__(self, can_interface, logger: Logger):
         """
-        HD_DialysateFlow constructor
-
+        HDDialysateFlow constructor
         """
         super().__init__()
         self.can_interface = can_interface
         self.logger = logger
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = self.MSG_ID_HD_DIAL_IN_FLOW_PUBLISHED_DATA
+            msg_id = MsgIds.MSG_ID_DIALYSATE_FLOW_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_dialysate_inlet_flow_sync)
 
@@ -79,6 +51,7 @@
         self.measured_dialysate_inlet_pump_mc_speed = 0.0
         self.measured_dialysate_inlet_pump_mc_current = 0.0
         self.pwm_duty_cycle_pct = 0.0
+        self.flow_signal_strength = 0.0
 
     def get_target_dialysate_inlet_flow_rate(self):
         """
@@ -112,37 +85,47 @@
         """
         return self.measured_dialysate_inlet_pump_speed
 
-    def get_measured_dialysate_inlet_pump_mc_speed(self):
+    def get_measured_dialysate_inlet_pump_motor_controller_speed(self):
         """
-        Gets the measured dialysate inlet pump mc speed
+        Gets the measured dialysate inlet pump motor controller speed
 
-        @return: the measured dialysate inlet pump mc speed
+        @return: the measured dialysate inlet pump motor controller speed
         """
         return self.measured_dialysate_inlet_pump_mc_speed
 
-    def get_measured_dialysate_inlet_pump_mc_current(self):
+    def get_measured_dialysate_inlet_pump_motor_controller_current(self):
         """
-        Gets the measured dialysate inlet pump mc current
+        Gets the measured dialysate inlet pump motor controller current
 
-        @return: the measured dialysate inlet pump mc current
+        @return: the measured dialysate inlet pump motor controller current
         """
         return self.measured_dialysate_inlet_pump_mc_current
 
     def get_pwm_duty_cycle_pct(self):
         """
         Gets the pwm duty cycle pct
 
-        @return: the pwm dutcy cycle pct
+        @return: the pwm dutcy cycle pct (0..100)
         """
         return self.pwm_duty_cycle_pct
 
+    def get_flow_signal_strength(self):
+        """
+        Gets the dialysate flow signal strength pct
+
+        @return: the dialysate flow signal strength pct (0..100)
+        """
+        return self.flow_signal_strength
+
     @_publish([
         "target_dialysate_inlet_flow_rate",
+        "measured_dialysate_inlet_flow_rate",
         "measured_dialysate_inlet_pump_rotor_speed",
         "measured_dialysate_inlet_pump_speed",
         "measured_dialysate_inlet_pump_mc_speed",
         "measured_dialysate_inlet_pump_mc_current",
-        "pwm_duty_cycle_pct"
+        "pwm_duty_cycle_pct",
+        "flow_signal_strength"
            ])
     def _handler_dialysate_inlet_flow_sync(self, message):
         """
@@ -153,28 +136,31 @@
             @return: none
         """
 
-        self.target_dialysate_inlet_flow_rate = int.from_bytes(bytearray(
-            message['message'][self.START_POS_SET_PT:self.END_POS_SET_PT]),
-            byteorder=DenaliMessage.BYTE_ORDER)
+        tgt = struct.unpack('i', bytearray(
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         flow = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_FLOW:self.END_POS_MEAS_FLOW]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         rotor = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_ROT_SPEED:self.END_POS_MEAS_ROT_SPEED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
         speed = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_SPEED:self.END_POS_MEAS_SPEED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
         mcspeed = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_MC_SPEED:self.END_POS_MEAS_MC_SPEED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5]))
         mccurr = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_MC_CURR:self.END_POS_MEAS_MC_CURR]))
+            message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6]))
         pwm = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_PWM_DC:self.END_POS_PWM_DC]))
+            message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7]))
+        sig = struct.unpack('f', bytearray(
+            message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8]))
 
+        self.target_dialysate_inlet_flow_rate = tgt[0]
         self.measured_dialysate_inlet_flow_rate = flow[0]
         self.measured_dialysate_inlet_pump_rotor_speed = rotor[0]
         self.measured_dialysate_inlet_pump_speed = speed[0]
         self.measured_dialysate_inlet_pump_mc_speed = mcspeed[0]
         self.measured_dialysate_inlet_pump_mc_current = mccurr[0]
         self.pwm_duty_cycle_pct = pwm[0]
+        self.flow_signal_strength = sig[0]
 
     def cmd_dialysate_inlet_flow_set_point_override(self, flow, mode=PUMP_CONTROL_MODE_CLOSED_LOOP, reset=NO_RESET):
         """
@@ -195,7 +181,7 @@
         payload = rst + flo + mod
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_IN_FLOW_SET_RATE_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override dialysate flow set point")
@@ -239,7 +225,7 @@
         payload = rst + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_IN_FLOW_MEAS_RATE_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_FLOW_MEAS_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate flow")
@@ -262,7 +248,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_dialysate_inlet_pump_mc_measured_speed_override(self, speed, reset=NO_RESET):
+    def cmd_dialysate_inlet_pump_measured_motor_controller_speed_override(self, speed, reset=NO_RESET):
         """
         Constructs and sends the measured dialysate inlet pump motor controller speed \n
         override command.
@@ -279,7 +265,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate inlet pump motor controller speed")
@@ -302,7 +288,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_dialysate_inlet_pump_measured_current_override(self, curr, reset=NO_RESET):
+    def cmd_dialysate_inlet_pump_measured_motor_controller_current_override(self, curr, reset=NO_RESET):
         """
         Constructs and sends the measured dialysate inlet pump motor current override command
         Constraints:
@@ -318,7 +304,7 @@
         payload = rst + cur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MC_MEAS_CURRENT_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_PUMP_MC_MEAS_CURR_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate inlet pump motor controller current")
@@ -341,7 +327,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_dialysate_inlet_pump_measured_speed_override(self, speed, reset=NO_RESET):
+    def cmd_dialysate_inlet_pump_measured_motor_speed_override(self, speed, reset=NO_RESET):
         """
         Constructs and sends the measured dialysate inlet pump motor speed override \n
         command.
@@ -358,7 +344,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate inlet pump speed")
@@ -381,7 +367,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_dialysate_inlet_pump_rotor_measured_speed_override(self, speed, reset=NO_RESET):
+    def cmd_dialysate_inlet_pump_measured_rotor_speed_override(self, speed, reset=NO_RESET):
         """
         Constructs and sends the measured dialysate inlet pump rotor speed override \n
         command.
@@ -398,7 +384,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_IN_PUMP_ROTOR_MEAS_SPEED_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_PUMP_MEAS_ROTOR_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate inlet pump rotor speed")
@@ -421,6 +407,46 @@
             self.logger.debug("Timeout!!!!")
             return False
 
+    def cmd_dialysate_flow_signal_strength_override(self, signal_strength, reset=NO_RESET):
+        """
+        Constructs and sends the measured dialysate flow signal strength % override \n
+        command.
+        Constraints:
+            Must be logged into HD.
+
+        @param signal_strength:  float - pct (0..100) to override with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
+        """
+
+        rst = integer_to_bytearray(reset)
+        sig = float_to_bytearray(signal_strength)
+        payload = rst + sig
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE.value,
+                                              payload=payload)
+
+        self.logger.debug("override measured dialysate flow signal strength")
+
+        # Send message
+        received_message = self.can_interface.send(message)
+
+        # If there is content...
+        if received_message is not None:
+            # self.logger.debug(received_message)
+            if reset == RESET:
+                str_sig = "reset back to normal"
+            else:
+                str_sig = str(signal_strength)
+            self.logger.debug("Dialysate pump flow signal strength overridden to " + str_sig + " %: " +
+                  str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
+            # response payload is OK or not OK
+            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+        else:
+            self.logger.debug("Timeout!!!!")
+            return False
+
     def cmd_dialysate_inlet_flow_broadcast_interval_override(self, ms, reset=NO_RESET):
         """
         Constructs and sends the measured dialysate inlet flow broadcast interval override command
@@ -438,7 +464,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_IN_FLOW_PUBLISH_INTERVAL_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override dialysate inlet flow broadcast interval")
@@ -471,22 +497,48 @@
         payload = gan + off
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_IN_FLOW_SET_CALIBRATION,
+                                              message_id=MsgIds.MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION.value,
                                               payload=payload)
 
-        print("Setting dialysate flow calibration factors")
+        self.logger.debug("Setting dialysate flow calibration factors")
 
         # Send message
         received_message = self.can_interface.send(message)
 
         # If there is content...
         if received_message is not None:
-            print(received_message)
             # str_res = str(flow)
-            print("Dialysate flow calibration factors set to : " + str(gain) + ", " + str(offset) + ".  " +
+            self.logger.debug("Dialysate flow calibration factors set to : " + str(gain) + ", " + str(offset) + ".  " +
                   str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
-            print("Timeout!!!!")
+            self.logger.debug("Timeout!!!!")
             return False
+
+    def cmd_home_dialysate_inlet_pump(self):
+        """
+            Constructs and sends a dialysate inlet pump home request message to the HD.
+            Constraints:
+                Must be logged into HD.
+                Dialysate inlet pump must be stopped (off) prior to requesting home position.
+
+            @return: 1 if successful, zero otherwise
+        """
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_PUMP_HOME_CMD.value)
+
+        self.logger.debug("Homing dialysate inlet pump")
+
+        # Send message
+        received_message = self.can_interface.send(message)
+
+        # If there is content...
+        if received_message is not None:
+            self.logger.debug("Dialysate inlet pump homed : " +
+                  str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
+            # response payload is OK or not OK
+            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+        else:
+            self.logger.debug("Timeout!!!!")
+            return False
Index: dialin/hd/dialysate_outlet_flow.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -20,6 +20,8 @@
 from .constants import RESET, NO_RESET
 from .constants import PUMP_CONTROL_MODE_CLOSED_LOOP, PUMP_CONTROL_MODE_OPEN_LOOP
 from ..utils.base import _AbstractSubSystem, _publish
+from ..common.msg_defs import MsgIds, MsgFldPositions
+
 from logging import Logger
 
 
@@ -28,35 +30,6 @@
     Hemodialysis Device (HD) Dialin API sub-class for dialysate outlet pump related commands.
     """
 
-    # DialysateFlow message IDs
-    MSG_ID_HD_DIAL_OUT_FLOW_PUBLISHED_DATA = 0x000B
-    MSG_ID_HD_LOAD_CELL_READINGS = 0x000C
-    MSG_ID_HD_DIAL_OUT_FLOW_SET_RATE_OVERRIDE = 0x8001
-    MSG_ID_HD_DIAL_OUT_FLOW_PUBLISH_INTERVAL_OVERRIDE = 0x801E
-    MSG_ID_HD_DIAL_OUT_UF_REF_VOLUME_OVERRIDE = 0x801F
-    MSG_ID_HD_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE = 0x8020
-    MSG_ID_HD_DIAL_OUT_PUMP_MC_MEAS_SPEED_OVERRIDE = 0x8021
-    MSG_ID_HD_DIAL_OUT_PUMP_MC_MEAS_CURRENT_OVERRIDE = 0x8022
-    MSG_ID_HD_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE = 0x8023
-    MSG_ID_HD_DIAL_OUT_PUMP_ROTOR_MEAS_SPEED_OVERRIDE = 0x8024
-    MSG_ID_HD_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE = 0x8025
-
-    # bloodflow broadcast message field positions
-    START_POS_REF_VOL = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_REF_VOL = START_POS_REF_VOL + 4
-    START_POS_MEAS_VOL = END_POS_REF_VOL
-    END_POS_MEAS_VOL = START_POS_MEAS_VOL + 4
-    START_POS_MEAS_ROT_SPEED = END_POS_MEAS_VOL
-    END_POS_MEAS_ROT_SPEED = START_POS_MEAS_ROT_SPEED + 4
-    START_POS_MEAS_SPEED = END_POS_MEAS_ROT_SPEED
-    END_POS_MEAS_SPEED = START_POS_MEAS_SPEED + 4
-    START_POS_MEAS_MC_SPEED = END_POS_MEAS_SPEED
-    END_POS_MEAS_MC_SPEED = START_POS_MEAS_MC_SPEED + 4
-    START_POS_MEAS_MC_CURR = END_POS_MEAS_MC_SPEED
-    END_POS_MEAS_MC_CURR = START_POS_MEAS_MC_CURR + 4
-    START_POS_PWM_DC = END_POS_MEAS_MC_CURR
-    END_POS_PWM_DC = START_POS_PWM_DC + 4
-
     def __init__(self, can_interface, logger: Logger):
         """
         HDDialysateFlow constructor
@@ -67,7 +40,7 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = self.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISHED_DATA
+            msg_id = MsgIds.MSG_ID_DIALYSATE_OUT_FLOW_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_dialysate_outlet_flow_sync)
 
@@ -109,27 +82,27 @@
         """
         return self.measured_dialysate_outlet_pump_speed
 
-    def get_measured_dialysate_outlet_pump_mc_speed(self):
+    def get_measured_dialysate_outlet_pump_motor_controller_speed(self):
         """
-        Gets the measured dialysate outlet pump mc speed
+        Gets the measured dialysate outlet pump motor controller speed
 
-        @return: the measured dialysate outlet pump mc speed
+        @return: the measured dialysate outlet pump motor controller speed
         """
         return self.measured_dialysate_outlet_pump_mc_speed
 
-    def get_measured_dialysate_outlet_pump_mc_current(self):
+    def get_measured_dialysate_outlet_pump_motor_controller_current(self):
         """
-        Gets the measured dialysate outlet pump mc current
+        Gets the measured dialysate outlet pump motor controller current
 
-        @return: Gets the measured dialysate outlet pump mc current
+        @return: Gets the measured dialysate outlet pump motor controller current
         """
         return self.measured_dialysate_outlet_pump_mc_current
 
     def get_pwm_duty_cycle_pct(self):
         """
-        Gets the pwm duty cycle pct
+        Gets the pwm duty cycle percent
 
-        @return: the pwm duty cycle pct
+        @return: the pwm duty cycle percent
         """
         return self.pwm_duty_cycle_pct
 
@@ -152,19 +125,19 @@
         """
 
         refvol = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_REF_VOL:self.END_POS_REF_VOL]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         measvol = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_VOL:self.END_POS_MEAS_VOL]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         rotor = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_ROT_SPEED:self.END_POS_MEAS_ROT_SPEED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
         speed = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_SPEED:self.END_POS_MEAS_SPEED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
         mcspeed = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_MC_SPEED:self.END_POS_MEAS_MC_SPEED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5]))
         mccurr = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MEAS_MC_CURR:self.END_POS_MEAS_MC_CURR]))
+            message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6]))
         pwm = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_PWM_DC:self.END_POS_PWM_DC]))
+            message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7]))
 
         self.reference_dialysate_outlet_uf_volume = refvol[0]
         self.measured_dialysate_outlet_uf_volume = measvol[0]
@@ -193,7 +166,7 @@
         payload = rst + flo + mod
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_OUT_FLOW_SET_RATE_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE.value,
                                               payload=payload)
 
         print("override dialysate outlet pump set point")
@@ -237,7 +210,7 @@
         payload = rst + vol
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_OUT_UF_REF_VOLUME_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_UF_REF_VOLUME_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override UF reference volume with " + str(refvol) + "mL.")
@@ -277,7 +250,7 @@
         payload = rst + vol
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_UF_MEAS_VOLUME_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured UF volume with " + str(measvol) + " mL.")
@@ -300,9 +273,9 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_dialysate_outlet_pump_mc_measured_speed_override(self, speed, reset=NO_RESET):
+    def cmd_dialysate_outlet_pump_measured_motor_controller_speed_override(self, speed, reset=NO_RESET):
         """
-        Constructs and sends the measured dialysate outlet pump motor controller speed \n
+        Constructs and sends the measured dialysate outlet pump motor controller measured speed \n
         override command.
         Constraints:
             Must be logged into HD.
@@ -317,7 +290,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.measured_dialysate_outlet_pump_mc_speed,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_PUMP_MC_MEAS_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate outlet pump motor controller speed to " + str(spd) + " RPM.")
@@ -356,7 +329,7 @@
         payload = rst + cur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_MC_MEAS_CURRENT_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_PUMP_MC_MEAS_CURR_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate outlet pump motor controller current")
@@ -396,7 +369,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_PUMP_MEAS_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate outlet pump speed to " + str(speed) + " RPM.")
@@ -419,7 +392,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_dialysate_outlet_pump_rotor_measured_speed_override(self, speed, reset=NO_RESET):
+    def cmd_dialysate_outlet_pump_measured_rotor_speed_override(self, speed, reset=NO_RESET):
         """
         Constructs and sends the measured dialysate outlet pump rotor speed override \n
         command.
@@ -436,7 +409,7 @@
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_OUT_PUMP_ROTOR_MEAS_SPEED_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_PUMP_MEAS_ROTOR_SPEED_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured dialysate outlet pump rotor speed to " + str(speed) + " RPM.")
@@ -476,7 +449,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISH_INTERVAL_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_IN_FLOW_SEND_INTERVAL_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override dialysate outlet flow broadcast interval to " + str(ms) + " ms.")
@@ -524,7 +497,7 @@
         payload = rst + spd + sen
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override measured load cell weight to " + str(weight) + " grams for load cell # " + str(sensor))
@@ -565,7 +538,7 @@
         payload = r1pb + r1bb + r2pb + r2bb
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_LOAD_CELL_READINGS,
+                                              message_id=MsgIds.MSG_ID_LOAD_CELL_READINGS.value,
                                               payload=payload)
 
         self.logger.debug("measured load cell weights set.")
@@ -574,3 +547,30 @@
         self.can_interface.send(message, 0)
 
         return 0
+
+    def cmd_home_dialysate_outlet_pump(self):
+        """
+            Constructs and sends a dialysate outlet pump home request message to the HD.
+            Constraints:
+                Must be logged into HD.
+                Dialysate outlet pump must be stopped (off) prior to requesting home position.
+
+            @return: 1 if successful, zero otherwise
+        """
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_DIAL_OUT_PUMP_HOME_CMD.value)
+
+        self.logger.debug("Homing dialysate outlet pump")
+
+        # Send message
+        received_message = self.can_interface.send(message)
+
+        # If there is content...
+        if received_message is not None:
+            self.logger.debug("Dialysate outlet pump homed : " +
+                  str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
+            # response payload is OK or not OK
+            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+        else:
+            self.logger.debug("Timeout!!!!")
+            return False
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -33,7 +33,7 @@
 from ..utils.conversions import integer_to_bytearray
 from ..utils.base import _AbstractSubSystem, _publish, _LogManager
 from .constants import NO_RESET
-from ..common.msg_defs import MsgIds
+from ..common.msg_defs import MsgIds, MsgFldPositions
 
 
 class HD(_AbstractSubSystem):
@@ -42,12 +42,6 @@
     It provides the basic interface to communicate with the HD firmware.
     """
 
-    # broadcast message field positions
-    START_POS_HD_OP_MODE = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_HD_OP_MODE = START_POS_HD_OP_MODE + 4
-    START_POS_HD_SUB_MODE = END_POS_HD_OP_MODE
-    END_POS_HD_SUB_MODE = START_POS_HD_SUB_MODE + 4
-
     # HD login password
     HD_LOGIN_PASSWORD = '123'
 
@@ -131,9 +125,9 @@
         @return: None
         """
         mode = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_HD_OP_MODE:self.END_POS_HD_OP_MODE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         smode = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_HD_SUB_MODE:self.END_POS_HD_SUB_MODE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
 
         self.hd_operation_mode = mode[0]
         self.hd_operation_sub_mode = smode[0]
@@ -224,14 +218,5 @@
         self.logger.debug("requesting HD software reset")
 
         # 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 is resetting...")
-            else:
-                self.logger.debug("HD reset request failed.")
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.debug("Timeout!!!!")
-            return False
+        self.can_interface.send(message, 0)
+        self.logger.debug("Sent request to HD to reset...")
Index: dialin/hd/treatment.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/hd/treatment.py	(.../treatment.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/hd/treatment.py	(.../treatment.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -18,6 +18,7 @@
                              DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
 from ..utils.conversions import integer_to_bytearray, float_to_bytearray
+from ..common.msg_defs import MsgIds, MsgFldPositions
 from logging import Logger
 
 
@@ -28,11 +29,6 @@
 
     """
 
-    # treatment message IDs
-    MSG_ID_HD_TREATMENT_TIME_PUBLISHED_DATA = 0x000D
-    MSG_ID_HD_TREATMENT_STATE_PUBLISHED_DATA = 0x000F
-    MSG_ID_HD_SET_TREATMENT_PARAMETER = 0x802D
-
     # Treatment Parameter IDs
     HD_TREATMENT_PARAMETER_BLOOD_FLOW = 0
     HD_TREATMENT_PARAMETER_DIALYSATE_FLOW = 1
@@ -67,21 +63,18 @@
     # Bicarbonate Concentrate IDs
     BICARB_CONC_TYPE_FRESENIUS_CENTRISOL = 0
 
-    # treatment time broadcast message field positions
-    START_POS_TIME_PRES = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_TIME_PRES = START_POS_TIME_PRES + 4
-    START_POS_TIME_ELAPSED = END_POS_TIME_PRES
-    END_POS_TIME_ELAPSED = START_POS_TIME_ELAPSED + 4
-    START_POS_TIME_REMAINING = END_POS_TIME_ELAPSED
-    END_POS_TIME_REMAINING = START_POS_TIME_REMAINING + 4
+    # UF states
+    UF_START_STATE = 0                                  # Start state of the ultrafiltration state machine
+    UF_PAUSED_STATE = 1                                 # Paused state of the ultrafiltration state machine
+    UF_RUNNING_STATE = 2                                # Running state of the ultrafiltration state machine
+    UF_OFF_STATE = 3                                    # Completed/off state of the ultrafiltration state machine
+    UF_COMPLETED_STATE = 4                              # Completed state of ultrafiltration state machine
 
-    # treatment state broadcast message field positions
-    START_POS_TREATMENT_STATE = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_TREATMENT_STATE = START_POS_TREATMENT_STATE + 4
-    START_POS_UF_STATE = END_POS_TREATMENT_STATE
-    END_POS_UF_STATE = START_POS_UF_STATE + 4
-    START_POS_SALINE_BOLUS_IN_PROGRESS = END_POS_UF_STATE
-    END_POS_SALINE_BOLUS_IN_PROGRESS = START_POS_SALINE_BOLUS_IN_PROGRESS + 4
+    # Saline bolus states
+    SALINE_BOLUS_STATE_IDLE = 0                         # No saline bolus delivery is in progress
+    SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP = 1          # Wait for pumps to stop before starting bolus
+    SALINE_BOLUS_STATE_IN_PROGRESS = 2                  # A saline bolus delivery is in progress
+    SALINE_BOLUS_STATE_MAX_DELIVERED = 3                # Maximum saline bolus volume reached
 
     def __init__(self, can_interface, logger: Logger):
         """
@@ -94,19 +87,25 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = self.MSG_ID_HD_TREATMENT_TIME_PUBLISHED_DATA
+            msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_treatment_time_sync)
-            msg_id = self.MSG_ID_HD_TREATMENT_STATE_PUBLISHED_DATA
+            msg_id = MsgIds.MSG_ID_TREATMENT_STATE.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_treatment_state_sync)
+            msg_id = MsgIds.MSG_ID_SALINE_BOLUS_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+                                                                       self._handler_saline_bolus_data_sync)
 
         self.treatment_time_prescribed = 0
         self.treatment_time_elapsed = 0
         self.treatment_time_remaining = 0
         self.treatment_state = 0
         self.treatment_uf_state = 0
-        self.saline_bolus_in_progress = False
+        self.saline_bolus_state = 0
+        self.saline_bolus_max_vol = 0
+        self.saline_bolus_cum_vol = 0.0
+        self.saline_bolus_bol_vol = 0.0
 
     def get_treatment_time_prescribed(self):
         """
@@ -148,14 +147,39 @@
         """
         return self.treatment_uf_state
 
-    def get_saline_bolus_in_progress(self):
+    def get_saline_bolus_state(self):
         """
-        Returns whether saline bolus is in progress
+        Returns whether saline bolus state
 
-        @return: True if saline bolus is in progress, False otherwise
+        @return: The saline bolus state
         """
-        return self.saline_bolus_in_progress
+        return self.saline_bolus_state
 
+    def get_saline_bolus_max_volume(self):
+        """
+        Returns maximum volume (in mL) saline that can be delivered to a patient
+
+        @return: The maximum saline bolus volume
+        """
+        return self.saline_bolus_max_vol
+
+    def get_saline_bolus_cumulative_volume_delivered(self):
+        """
+        Returns cumulative volume (in mL) of saline delivered
+
+        @return: The cumulative saline volume delivered
+        """
+        return self.saline_bolus_cum_vol
+
+    def get_saline_bolus_volume_delivered(self):
+        """
+        Returns bolus volume (in mL) of saline delivered
+
+        @return: The bolus saline volume delivered
+        """
+        return self.saline_bolus_bol_vol
+
+
     @_publish([
         "treatment_time_prescribed",
         "treatment_time_elapsed",
@@ -171,11 +195,11 @@
         """
 
         tot = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_TIME_PRES:self.END_POS_TIME_PRES]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         ela = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_TIME_ELAPSED:self.END_POS_TIME_ELAPSED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         rem = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_TIME_REMAINING:self.END_POS_TIME_REMAINING]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
 
         self.treatment_time_prescribed = tot[0]
         self.treatment_time_elapsed = ela[0]
@@ -196,19 +220,41 @@
         """
 
         tst = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_TREATMENT_STATE:self.END_POS_TREATMENT_STATE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         ufs = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_UF_STATE:self.END_POS_UF_STATE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         bol = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_SALINE_BOLUS_IN_PROGRESS:self.END_POS_SALINE_BOLUS_IN_PROGRESS]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
 
         self.treatment_state = tst[0]
         self.treatment_uf_state = ufs[0]
-        if bol[0] == 1:
-            self.saline_bolus_in_progress = True
-        else:
-            self.saline_bolus_in_progress = False
+        self.saline_bolus_state = bol[0]
 
+    @_publish([
+        "saline_bolus_max_vol",
+        "saline_bolus_cum_vol",
+        "saline_bolus_bol_vol"
+    ])
+    def _handler_saline_bolus_data_sync(self, message):
+        """
+        Handles published saline bolus data messages.  Saline bolus data are captured
+        for reference.
+
+        @param message: published saline bolus data message
+        @return: none
+        """
+
+        mxm = struct.unpack('i', bytearray(
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
+        cum = struct.unpack('f', bytearray(
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
+        bol = struct.unpack('f', bytearray(
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
+
+        self.saline_bolus_max_vol = mxm[0]
+        self.saline_bolus_cum_vol = cum[0]
+        self.saline_bolus_bol_vol = bol[0]
+
     def cmd_set_treatment_param_blood_flow_rate(self, flow):
         """
         Constructs and sends the set blood flow rate treatment parameter command.
@@ -227,7 +273,7 @@
         payload = par + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting blood flow rate")
@@ -265,7 +311,7 @@
         payload = par + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting dialysate flow rate")
@@ -301,7 +347,7 @@
         payload = par + dur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting treatment duration")
@@ -337,7 +383,7 @@
         payload = par + sto
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting Heparin pre-stop time")
@@ -373,7 +419,7 @@
         payload = par + vol
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting saline bolus volume")
@@ -412,7 +458,7 @@
         payload = par + acd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting acid concentrate parameter")
@@ -449,7 +495,7 @@
         payload = par + bic
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting bicarbonate concentrate parameter")
@@ -489,7 +535,7 @@
         payload = par + dia
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting dialyzer type parameter")
@@ -525,7 +571,7 @@
         payload = par + bpi
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting BP measurement interval parameter")
@@ -561,7 +607,7 @@
         payload = par + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting rinseback flow rate parameter")
@@ -597,7 +643,7 @@
         payload = par + pre
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting arterial pressure lower alarm limit parameter")
@@ -633,7 +679,7 @@
         payload = par + pre
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting arterial pressure upper alarm limit parameter")
@@ -669,7 +715,7 @@
         payload = par + pre
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting venous pressure lower alarm limit parameter")
@@ -705,7 +751,7 @@
         payload = par + pre
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting venous pressure upper alarm limit parameter")
@@ -741,7 +787,7 @@
         payload = par + rat
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting Heparin dispense rate parameter")
@@ -777,7 +823,7 @@
         payload = par + vol
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting Heparin bolus volume parameter")
@@ -813,7 +859,7 @@
         payload = par + tmp
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting dialysate temperature parameter")
@@ -849,7 +895,7 @@
         payload = par + vol
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SET_TREATMENT_PARAMETER,
+                                              message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
                                               payload=payload)
 
         print("setting ultrafiltration volume parameter")
Index: dialin/hd/ui_proxy.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -17,7 +17,9 @@
                              DenaliChannels)
 from ..utils.conversions import integer_to_bytearray, float_to_bytearray
 import struct
+import enum
 from ..utils.base import _AbstractSubSystem, _publish
+from ..common.msg_defs import MsgIds, RequestRejectReasons, MsgFldPositions
 from collections import OrderedDict
 from logging import Logger
 
@@ -27,25 +29,6 @@
     Hemodialysis Delivery (HD) Dialin API sub-class for ui commands.
     """
 
-    # ui message IDs
-    MSG_ID_UI_CHECKIN_WITH_HD = 0x0007
-    MSG_ID_HD_UF_PAUSE_RESUME_REQUEST = 0x0010
-    MSG_ID_HD_TREATMENT_PARAMS_RANGES = 0x001A
-    MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER = 0x0011
-    MSG_ID_UF_SETTINGS_CHANGE_RESPONSE_FROM_HD = 0x0013
-    MSG_ID_UF_SETTINGS_CHANGE_CONFIRMED_BY_USER = 0x0015
-    MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_REQUEST = 0x0016
-    MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_RESPONSE_FROM_HD = 0x001B
-    MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_REQUEST_BY_USER = 0x0017
-    MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_RESPONSE_FROM_HD = 0x0018
-    MSG_ID_UI_REQUEST_HD_VERSION = 0x001C
-    MSG_ID_UI_HD_VERSION_RESPONSE = 0x001D
-    MSG_ID_UF_SETTINGS_CHANGE_CONFIRM_RESPONSE_FROM_HD = 0x002E
-    MSG_ID_UI_NEW_TREATMENT_PARAMS = 0x35
-    MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE = 0x36
-    MSG_ID_UI_START_TREATMENT = 0x38
-    MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3B
-
     LITER_TO_ML_CONVERSION_FACTOR = 1000.0
 
     # UF pause/resume command IDs
@@ -65,24 +48,6 @@
     START_TREATMENT_CMD_CANCEL_TREATMENT_WORKFLOW = 1
     START_TREATMENT_CMD_START_TREATMENT = 2
 
-    REQUEST_REJECT_REASON_NONE = 0
-    REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE = 1
-    REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM = 2
-    REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE = 3
-    REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE = 4
-    REQUEST_REJECT_REASON_TREATMENT_TOO_CLOSE_TO_FINISHED = 5
-    REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE = 6
-    REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_CURRENT = 7
-    REQUEST_REJECT_REASON_BLOOD_FLOW_OUT_OF_RANGE = 8
-    REQUEST_REJECT_REASON_DIAL_FLOW_OUT_OF_RANGE = 9
-    REQUEST_REJECT_REASON_DIAL_VOLUME_OUT_OF_RANGE = 10
-    REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE = 11
-    REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE = 12
-    REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM = 13
-    REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS = 14
-    REQUEST_REJECT_REASON_UF_NOT_PAUSED = 15
-    REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16
-
     # HD version message field positions
     START_POS_MAJOR = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_MAJOR = START_POS_MAJOR + 1
@@ -103,70 +68,32 @@
     START_POS_FPGA_LAB = END_POS_FPGA_MINOR
     END_POS_FPGA_LAB = START_POS_FPGA_LAB + 1
 
-    # HD update on valid treatment parameter ranges message field positions
-    START_POS_MIN_TREAT_TIME = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_MIN_TREAT_TIME = START_POS_MIN_TREAT_TIME + 4
-    START_POS_MAX_TREAT_TIME = END_POS_MIN_TREAT_TIME
-    END_POS_MAX_TREAT_TIME = START_POS_MAX_TREAT_TIME + 4
-    START_POS_MIN_UF_VOL = END_POS_MAX_TREAT_TIME
-    END_POS_MIN_UF_VOL = START_POS_MIN_UF_VOL + 4
-    START_POS_MAX_UF_VOL = END_POS_MIN_UF_VOL
-    END_POS_MAX_UF_VOL = START_POS_MAX_UF_VOL + 4
-    START_POS_MIN_DIAL_RATE = END_POS_MAX_UF_VOL
-    END_POS_MIN_DIAL_RATE = START_POS_MIN_DIAL_RATE + 4
-    START_POS_MAX_DIAL_RATE = END_POS_MIN_DIAL_RATE
-    END_POS_MAX_DIAL_RATE = START_POS_MAX_DIAL_RATE + 4
+    class TreatmentParameters(enum.Enum):
 
-    # HD response to treatment duration change request message field positions
-    START_POS_TIME_CHG_RSP_ACCEPTED = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_TIME_CHG_RSP_ACCEPTED = START_POS_TIME_CHG_RSP_ACCEPTED + 4
-    START_POS_TIME_CHG_RSP_REASON = END_POS_TIME_CHG_RSP_ACCEPTED
-    END_POS_TIME_CHG_RSP_REASON = START_POS_TIME_CHG_RSP_REASON + 4
-    START_POS_TIME_CHG_RSP_TIME = END_POS_TIME_CHG_RSP_REASON
-    END_POS_TIME_CHG_RSP_TIME = START_POS_TIME_CHG_RSP_TIME + 4
-    START_POS_TIME_CHG_RSP_UF_VOL = END_POS_TIME_CHG_RSP_TIME
-    END_POS_TIME_CHG_RSP_UF_VOL = START_POS_TIME_CHG_RSP_UF_VOL + 4
+        TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN = 0
+        TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN = 1
+        TREATMENT_PARAM_TREATMENT_DURATION_MIN = 2
+        TREATMENT_PARAM_HEPARIN_PRESTOP_MIN = 3
+        TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML = 4
+        TREATMENT_PARAM_ACID_CONCENTRATE = 5
+        TREATMENT_PARAM_BICARB_CONCENTRATE = 6
+        TREATMENT_PARAM_DIALYZER_TYPE = 7
+        TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN = 8
+        TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN = 9
+        TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG = 10
+        TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG = 11
+        TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG = 12
+        TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG = 13
+        TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR = 14
+        TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML = 15
+        TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C = 16
+        TREATMENT_PARAM_UF_VOLUME_L = 17
+        NUM_OF_TREATMENT_PARAMS = 18
 
-    # HD response to UF volume change request message field positions
-    START_POS_UF_CHG_RSP_RESP = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_UF_CHG_RSP_RESP = START_POS_UF_CHG_RSP_RESP + 4
-    START_POS_UF_CHG_RSP_REJECT_REASON = END_POS_UF_CHG_RSP_RESP
-    END_POS_UF_CHG_RSP_REJECT_REASON = START_POS_UF_CHG_RSP_REJECT_REASON + 4
-    START_POS_UF_CHG_RSP_VOL = END_POS_UF_CHG_RSP_RESP
-    END_POS_UF_CHG_RSP_VOL = START_POS_UF_CHG_RSP_VOL + 4
-    START_POS_UF_CHG_RSP_TIME = END_POS_UF_CHG_RSP_VOL
-    END_POS_UF_CHG_RSP_TIME = START_POS_UF_CHG_RSP_TIME + 4
-    START_POS_UF_CHG_RSP_TIME_DIFF = END_POS_UF_CHG_RSP_TIME
-    END_POS_UF_CHG_RSP_TIME_DIFF = START_POS_UF_CHG_RSP_TIME_DIFF + 4
-    START_POS_UF_CHG_RSP_RATE = END_POS_UF_CHG_RSP_TIME_DIFF
-    END_POS_UF_CHG_RSP_RATE = START_POS_UF_CHG_RSP_RATE + 4
-    START_POS_UF_CHG_RSP_RATE_DIFF = END_POS_UF_CHG_RSP_RATE
-    END_POS_UF_CHG_RSP_RATE_DIFF = START_POS_UF_CHG_RSP_RATE_DIFF + 4
-    START_POS_UF_CHG_RSP_OLD_RATE = END_POS_UF_CHG_RSP_RATE_DIFF
-    END_POS_UF_CHG_RSP_OLD_RATE = START_POS_UF_CHG_RSP_OLD_RATE + 4
+        @classmethod
+        def has_value(cls, value):
+            return value in cls._value2member_map_
 
-    # HD response to UF volume change confirmation message field positions
-    START_POS_UF_CNF_RSP_RESP = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_UF_CNF_RSP_RESP = START_POS_UF_CNF_RSP_RESP + 4
-    START_POS_UF_CNF_RSP_REJECT_REASON = END_POS_UF_CNF_RSP_RESP
-    END_POS_UF_CNF_RSP_REJECT_REASON = START_POS_UF_CNF_RSP_REJECT_REASON + 4
-    START_POS_UF_CNF_RSP_VOL = END_POS_UF_CNF_RSP_RESP
-    END_POS_UF_CNF_RSP_VOL = START_POS_UF_CNF_RSP_VOL + 4
-    START_POS_UF_CNF_RSP_TIME = END_POS_UF_CNF_RSP_VOL
-    END_POS_UF_CNF_RSP_TIME = START_POS_UF_CNF_RSP_TIME + 4
-    START_POS_UF_CNF_RSP_RATE = END_POS_UF_CNF_RSP_TIME
-    END_POS_UF_CNF_RSP_RATE = START_POS_UF_CNF_RSP_RATE + 4
-
-    # HD response to blood/dialysate flow change request message field positions
-    START_POS_BLD_DIAL_CHG_RSP_ACCEPTED = DenaliMessage.PAYLOAD_START_INDEX
-    END_POS_BLD_DIAL_CHG_RSP_ACCEPTED = START_POS_BLD_DIAL_CHG_RSP_ACCEPTED + 4
-    START_POS_BLD_DIAL_CHG_RSP_REASON = END_POS_BLD_DIAL_CHG_RSP_ACCEPTED
-    END_POS_BLD_DIAL_CHG_RSP_REASON = START_POS_BLD_DIAL_CHG_RSP_REASON + 4
-    START_POS_BLD_DIAL_CHG_RSP_BLD_RATE = END_POS_BLD_DIAL_CHG_RSP_REASON
-    END_POS_BLD_DIAL_CHG_RSP_BLD_RATE = START_POS_BLD_DIAL_CHG_RSP_BLD_RATE + 4
-    START_POS_BLD_DIAL_CHG_RSP_DIAL_RATE = END_POS_BLD_DIAL_CHG_RSP_BLD_RATE
-    END_POS_BLD_DIAL_CHG_RSP_DIAL_RATE = START_POS_BLD_DIAL_CHG_RSP_DIAL_RATE + 4
-
     def __init__(self, can_interface, logger: Logger):
         """
 
@@ -181,64 +108,36 @@
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_to_ui_ch_id
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       self.MSG_ID_UF_SETTINGS_CHANGE_RESPONSE_FROM_HD,
+                                                                       MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE.value,
                                                                        self._handler_uf_change_response)
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       self.MSG_ID_UF_SETTINGS_CHANGE_CONFIRM_RESPONSE_FROM_HD,
+                                                                       MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.value,
                                                                        self._handler_uf_change_confirm_response)
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       self.MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_RESPONSE_FROM_HD,
+                                                                       MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE.value,
                                                                        self._handler_treatment_duration_change_response)
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       self.MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_RESPONSE_FROM_HD,
+                                                                       MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE.value,
                                                                        self._handler_blood_and_dialysate_change_response)
-            self.can_interface.register_receiving_publication_function(channel_id, self.MSG_ID_HD_TREATMENT_PARAMS_RANGES,
+            self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES.value,
                                                                        self._handler_treatment_param_ranges)
-            self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, self.MSG_ID_UI_HD_VERSION_RESPONSE,
+            self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_VERSION.value,
                                                                        self._handler_hd_version)
-            self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, self.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE,
+            self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value,
                                                                        self._handler_treatment_param_settings)
+            self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE.value,
+                                                                       self._handler_treatment_param_settings_response)
+            self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_USER_SALINE_BOLUS_RESPONSE.value,
+                                                                       self._handler_saline_bolus_response)
 
         # initialize variables that will be populated by HD version response
         self.hd_version = None
         self.fpga_version = None
-        # initialize treatment parameters that Dialin user sets
-        self.blood_flow_rate = 0
-        self.dialysate_flow_rate = 0
-        self.treatment_duration = 0
-        self.heparin_dispense_rate = 0.0
-        self.heparin_bolus_volume = 0.0
-        self.heparin_pre_stop_time = 0
-        self.saline_bolus_volume = 0
-        self.acid_concentrate = 0
-        self.bicarb_concentrate = 0
-        self.dialyzer_type = 0
-        self.dialysate_temperature = 0.0
-        self.arterial_pressure_low_alarm_limit = 0
-        self.arterial_pressure_high_alarm_limit = 0
-        self.venous_pressure_low_alarm_limit = 0
-        self.venous_pressure_high_alarm_limit = 0
-        self.blood_pressure_meas_interval = 0
-        self.rinseback_flow_rate = 0
+        # initialize treatment parameters that are seen from UI or that Dialin user sets
+        self.treatment_parameters = [0.0] * self.TreatmentParameters.NUM_OF_TREATMENT_PARAMS.value
         # initialize variables that will be populated by treatment parameters response message
         self.treatment_parameters_valid = False
-        self.blood_flow_rate_reject_reason = 0
-        self.dialysate_flow_rate_reject_reason = 0
-        self.treatment_duration_reject_reason = 0
-        self.heparin_dispense_rate_reject_reason = 0
-        self.heparin_bolus_volume_reject_reason = 0
-        self.heparin_pre_stop_time_reject_reason = 0
-        self.saline_bolus_volume_reject_reason = 0
-        self.acid_concentrate_reject_reason = 0
-        self.bicarb_concentrate_reject_reason = 0
-        self.dialyzer_type_reject_reason = 0
-        self.dialysate_temperature_reject_reason = 0
-        self.arterial_pressure_low_alarm_limit_reject_reason = 0
-        self.arterial_pressure_high_alarm_limit_reject_reason = 0
-        self.venous_pressure_low_alarm_limit_reject_reason = 0
-        self.venous_pressure_high_alarm_limit_reject_reason = 0
-        self.blood_pressure_meas_interval_reject_reason = 0
-        self.rinseback_flow_rate_reject_reason = 0
+        self.treatment_parameters_reject_reasons = [0] * self.TreatmentParameters.NUM_OF_TREATMENT_PARAMS.value
         # initialize variables that will be populated by treatment parameter ranges message
         self.min_treatment_duration_min = 0
         self.max_treatment_duration_min = 0
@@ -265,6 +164,10 @@
         self.blood_and_dialysate_flow_rate_change_reject_reason = 0
         self.target_blood_flow_rate = 0
         self.target_dialysate_flow_rate = 0
+        # initialize variables that will be populated by response to saline bolus request
+        self.saline_bolus_request_succeeded = False
+        self.saline_bolus_request_reject_reason = 0
+        self.saline_bolus_request_bolus_volume = 0
 
         self.reject_reasons = OrderedDict()
         for attr in dir(self):
@@ -288,6 +191,14 @@
         """
         return self.fpga_version
 
+    def get_treatment_parameters(self):
+        """
+        Gets the array of treatment parameters set by user or Dialin
+
+        @return: the array of treatment parameters
+        """
+        return self.treatment_parameters
+
     def get_min_treatment_duration_min(self):
         """
         Gets the min treatment duration
@@ -471,6 +382,15 @@
         """
         return self.treatment_parameters_valid
 
+    def get_treatment_parameters_reject_reasons(self):
+        """
+        Gets the reject reason codes for the treatment parameters
+        sent to the HD for validation.
+
+        @return: The array of reject reason codes for all treatment parameters
+        """
+        return self.treatment_parameters_reject_reasons
+
     def get_blood_flow_rate_reject_reason(self):
         """
         Gets the reject reason code for the blood flow rate
@@ -624,6 +544,22 @@
         """
         return self.dialysate_temperature_reject_reason
 
+    def get_saline_bolus_reject_reason(self):
+        """
+        Gets the reject reason code for the saline bolus request
+
+        @return: The reject reason code for saline bolus request
+        """
+        return self.saline_bolus_request_reject_reason
+
+    def get_saline_bolus_volume(self):
+        """
+        Gets the HD f/w saline bolus volume (in mL)
+
+        @return: The saline bolus volume (in mL)
+        """
+        return self.saline_bolus_request_bolus_volume
+
     @_publish([
         "hd_version"
         "fpga_version"
@@ -667,6 +603,87 @@
             self.logger.debug(f"HD FPGA VERSION: {self.fpga_version}")
 
     @_publish([
+        "treatment_parameters"
+    ])
+    def _handler_treatment_param_settings(self, message):
+        """
+        Handler for UI msg containing user set treatment parameters.
+
+        @param message:  message from UI to HD containing user selected treatment parameters.\n
+            U32  blood flow rate. \n
+            U32  dialysate flow rate. \n
+            U32  treatment duration. \n
+            U32  Heparin pre-stop time. \n
+            U32  saline bolus volume. \n
+            U32  acid concentrate. \n
+            U32  bicarb concentrate. \n
+            U32  dialyzer type. \n
+            U32  BP measurement interval. \n
+            U32  rinseback flow rate. \n
+            S32  arterial pressure low alarm limit. \n
+            S32  arterial pressure high alarm limit. \n
+            S32  venous pressure low alarm limit. \n
+            S32  venous pressure high alarm limit. \n
+            F32  Heparin dispense rate. \n
+            F32  Heparin bolus volume. \n
+            F32  dialysate temperature. \n
+
+        @return: none
+        """
+        bld = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
+        dia = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
+        dur = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
+        sto = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
+        sal = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5]))
+        acd = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6]))
+        bic = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7]))
+        dlz = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8]))
+        bpi = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_9:MsgFldPositions.END_POS_FIELD_9]))
+        rbf = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_10:MsgFldPositions.END_POS_FIELD_10]))
+        apl = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_11:MsgFldPositions.END_POS_FIELD_11]))
+        aph = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_12:MsgFldPositions.END_POS_FIELD_12]))
+        vpl = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_13:MsgFldPositions.END_POS_FIELD_13]))
+        vph = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_14:MsgFldPositions.END_POS_FIELD_14]))
+        hdr = struct.unpack('f', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_15:MsgFldPositions.END_POS_FIELD_15]))
+        hbv = struct.unpack('f', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_16:MsgFldPositions.END_POS_FIELD_16]))
+        tmp = struct.unpack('f', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_17:MsgFldPositions.END_POS_FIELD_17]))
+
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value] = bld[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value] = dia[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value] = dur[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value] = sto[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value] = sal[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value] = acd[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value] = bic[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value] = dlz[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value] = bpi[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value] = rbf[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value] = apl[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value] = aph[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value] = vpl[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value] = vph[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value] = hdr[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value] = hbv[0]
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value] = tmp[0]
+
+    @_publish([
         "treatment_parameters_valid",
         "blood_flow_rate_reject_reason",
         "dialysate_flow_rate_reject_reason",
@@ -686,7 +703,7 @@
         "heparin_bolus_volume_reject_reason",
         "dialysate_temperature_reject_reason"
     ])
-    def _handler_treatment_param_settings(self, message):
+    def _handler_treatment_param_settings_response(self, message):
         """
         Handler for response from HD regarding validation of treatment parameters.
 
@@ -712,42 +729,42 @@
 
         @return: none
         """
-        p = DenaliMessage.PAYLOAD_START_INDEX
-        val = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        bld = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        dia = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        dur = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        sto = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        sal = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        acd = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        bic = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        dlz = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        bpi = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        rbf = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        apl = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        aph = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        vpl = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        vph = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        hdr = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        hbv = struct.unpack('i', bytearray(message['message'][p:p+4]))
-        p += 4
-        tmp = struct.unpack('i', bytearray(message['message'][p:p+4]))
+        val = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
+        bld = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
+        dia = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
+        dur = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
+        sto = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5]))
+        sal = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6]))
+        acd = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7]))
+        bic = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8]))
+        dlz = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_9:MsgFldPositions.END_POS_FIELD_9]))
+        bpi = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_10:MsgFldPositions.END_POS_FIELD_10]))
+        rbf = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_11:MsgFldPositions.END_POS_FIELD_11]))
+        apl = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_12:MsgFldPositions.END_POS_FIELD_12]))
+        aph = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_13:MsgFldPositions.END_POS_FIELD_13]))
+        vpl = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_14:MsgFldPositions.END_POS_FIELD_14]))
+        vph = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_15:MsgFldPositions.END_POS_FIELD_15]))
+        hdr = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_16:MsgFldPositions.END_POS_FIELD_16]))
+        hbv = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_17:MsgFldPositions.END_POS_FIELD_17]))
+        tmp = struct.unpack('i', bytearray(
+              message['message'][MsgFldPositions.START_POS_FIELD_18:MsgFldPositions.END_POS_FIELD_18]))
 
         if val[0] == 1:
             self.treatment_parameters_valid = True
@@ -794,17 +811,17 @@
         @return: none
         """
         mintime = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_MIN_TREAT_TIME:self.END_POS_MIN_TREAT_TIME]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         maxtime = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_MAX_TREAT_TIME:self.END_POS_MAX_TREAT_TIME]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         minufvol = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MIN_UF_VOL:self.END_POS_MIN_UF_VOL]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
         maxufvol = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_MAX_UF_VOL:self.END_POS_MAX_UF_VOL]))
+            message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
         mindialrt = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_MIN_DIAL_RATE:self.END_POS_MIN_DIAL_RATE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5]))
         maxdialrt = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_MAX_DIAL_RATE:self.END_POS_MAX_DIAL_RATE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6]))
 
         self.min_treatment_duration_min = mintime[0]
         self.max_treatment_duration_min = maxtime[0]
@@ -814,6 +831,37 @@
         self.max_dialysate_flow_rate_ml_min = maxdialrt[0]
 
     @_publish([
+        "saline_bolus_request_succeeded",
+        "saline_bolus_request_reject_reason",
+        "saline_bolus_request_bolus_volume"
+    ])
+    def _handler_saline_bolus_response(self, message):
+        """
+        Handler for response from HD regarding saline bolus request.
+
+        @param message:  response message from HD regarding saline bolus request.\n
+            BOOL Accepted \n
+            U32  Reject reason (if not accepted) \n
+            U32  Saline bolus volume (mL)
+
+        @return: none
+        """
+        rsp = struct.unpack('i', bytearray(
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
+        rea = struct.unpack('i', bytearray(
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
+        vol = struct.unpack('i', bytearray(
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
+
+        if rsp[0] == 1:
+            self.saline_bolus_request_succeeded = True
+        else:
+            self.saline_bolus_request_succeeded = False
+        if RequestRejectReasons.has_value(rea[0]):
+            self.saline_bolus_request_reject_reason = RequestRejectReasons(rea[0])
+        self.saline_bolus_request_bolus_volume = vol[0]
+
+    @_publish([
         "duration_change_succeeded",
         "duration_change_reject_reason",
         "duration_change_time_min",
@@ -832,16 +880,17 @@
         @return: none
         """
         rsp = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_TIME_CHG_RSP_ACCEPTED:self.END_POS_TIME_CHG_RSP_ACCEPTED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         rea = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_TIME_CHG_RSP_REASON:self.END_POS_TIME_CHG_RSP_REASON]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         tim = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_TIME_CHG_RSP_TIME:self.END_POS_TIME_CHG_RSP_TIME]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
         vol = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_TIME_CHG_RSP_UF_VOL:self.END_POS_TIME_CHG_RSP_UF_VOL]))
+            message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
 
         self.duration_change_succeeded = rsp[0]
-        self.duration_change_reject_reason = rea[0]
+        if RequestRejectReasons.has_value(rea[0]):
+            self.duration_change_reject_reason = RequestRejectReasons(rea[0])
         self.duration_change_time_min = tim[0]
         self.duration_change_uf_vol_ml = vol[0]
 
@@ -864,20 +913,21 @@
         @return: none
         """
         rsp = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_BLD_DIAL_CHG_RSP_ACCEPTED:self.END_POS_BLD_DIAL_CHG_RSP_ACCEPTED]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         rea = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_BLD_DIAL_CHG_RSP_REASON:self.END_POS_BLD_DIAL_CHG_RSP_REASON]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         bld = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_BLD_DIAL_CHG_RSP_BLD_RATE:self.END_POS_BLD_DIAL_CHG_RSP_BLD_RATE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
         dil = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_BLD_DIAL_CHG_RSP_DIAL_RATE:self.END_POS_BLD_DIAL_CHG_RSP_DIAL_RATE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
 
         if rsp[0] == self.RESPONSE_REJECTED:
             resp = False
         else:
             resp = True
         self.blood_and_dialysate_flow_rate_change_succeeded = resp
-        self.blood_and_dialysate_flow_rate_change_reject_reason = rea[0]
+        if RequestRejectReasons.has_value(rea[0]):
+            self.blood_and_dialysate_flow_rate_change_reject_reason = RequestRejectReasons(rea[0])
         self.target_blood_flow_rate = bld[0]
         self.target_dialysate_flow_rate = dil[0]
 
@@ -906,28 +956,29 @@
         @return: none
         """
         rsp = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_UF_CHG_RSP_RESP:self.END_POS_UF_CHG_RSP_RESP]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         rea = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_UF_CHG_RSP_REJECT_REASON:self.END_POS_UF_CHG_RSP_REJECT_REASON]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         vol = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_UF_CHG_RSP_VOL:self.END_POS_UF_CHG_RSP_VOL]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
         tim = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_UF_CHG_RSP_TIME:self.END_POS_UF_CHG_RSP_TIME]))
+            message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
         tmd = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_UF_CHG_RSP_TIME_DIFF:self.END_POS_UF_CHG_RSP_TIME_DIFF]))
+            message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5]))
         rat = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_UF_CHG_RSP_RATE:self.END_POS_UF_CHG_RSP_RATE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_6:MsgFldPositions.END_POS_FIELD_6]))
         rtd = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_UF_CHG_RSP_RATE_DIFF:self.END_POS_UF_CHG_RSP_RATE_DIFF]))
+            message['message'][MsgFldPositions.START_POS_FIELD_7:MsgFldPositions.END_POS_FIELD_7]))
         ort = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_UF_CHG_RSP_OLD_RATE:self.END_POS_UF_CHG_RSP_OLD_RATE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_8:MsgFldPositions.END_POS_FIELD_8]))
 
         if rsp[0] == self.RESPONSE_REJECTED:
             resp = False
         else:
             resp = True
         self.uf_change_succeeded = resp
-        self.uf_change_reject_reason = rea[0]
+        if RequestRejectReasons.has_value(rea[0]):
+            self.uf_change_reject_reason = RequestRejectReasons(rea[0])
 
         self.uf_change_volume_ml = vol[0] #/ self.LITER_TO_ML_CONVERSION_FACTOR
 
@@ -957,22 +1008,23 @@
         @return: None
         """
         rsp = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_UF_CNF_RSP_RESP:self.END_POS_UF_CNF_RSP_RESP]))
+            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
         rea = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_UF_CNF_RSP_REJECT_REASON:self.END_POS_UF_CNF_RSP_REJECT_REASON]))
+            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
         vol = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_UF_CNF_RSP_VOL:self.END_POS_UF_CNF_RSP_VOL]))
+            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
         tim = struct.unpack('i', bytearray(
-            message['message'][self.START_POS_UF_CNF_RSP_TIME:self.END_POS_UF_CNF_RSP_TIME]))
+            message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
         rat = struct.unpack('f', bytearray(
-            message['message'][self.START_POS_UF_CNF_RSP_RATE:self.END_POS_UF_CNF_RSP_RATE]))
+            message['message'][MsgFldPositions.START_POS_FIELD_5:MsgFldPositions.END_POS_FIELD_5]))
 
         if rsp[0] == self.RESPONSE_REJECTED:
             resp = False
         else:
             resp = True
         self.uf_change_succeeded = resp
-        self.uf_change_reject_reason = rea[0]
+        if RequestRejectReasons.has_value(rea[0]):
+            self.uf_change_reject_reason = RequestRejectReasons(rea[0])
         self.uf_change_volume_ml = vol[0] / self.LITER_TO_ML_CONVERSION_FACTOR
         self.uf_change_time_min = tim[0]
         self.uf_change_rate_ml_min = rat[0]
@@ -985,7 +1037,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_UI_CHECKIN_WITH_HD)
+                                              message_id=MsgIds.MSG_ID_UI_CHECK_IN.value)
 
         self.logger.debug("Sending ui checkin w/ HD")
 
@@ -1000,7 +1052,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_UI_REQUEST_HD_VERSION)
+                                              message_id=MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value)
 
         self.logger.debug("Sending ui request for version to HD")
 
@@ -1017,7 +1069,7 @@
 
         payload = integer_to_bytearray(cmd)
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_UF_PAUSE_RESUME_REQUEST,
+                                              message_id=MsgIds.MSG_ID_USER_UF_PAUSE_RESUME_REQUEST.value,
                                               payload=payload)
 
         if cmd == self.UF_CMD_PAUSE:
@@ -1044,7 +1096,7 @@
         # build command message
         volume = float_to_bytearray(vol * self.LITER_TO_ML_CONVERSION_FACTOR)
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER,
+                                              message_id=MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST.value,
                                               payload=volume)
 
         self.logger.debug("Sending UF settings change request.")
@@ -1071,7 +1123,7 @@
         adjust = integer_to_bytearray(adj)
         payload = volume + adjust
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_UF_SETTINGS_CHANGE_REQUEST_BY_USER,
+                                              message_id=MsgIds.MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE.value,
                                               payload=payload)
 
         self.logger.debug("Sending UF settings change request.")
@@ -1080,32 +1132,6 @@
 
         return 0
 
-    def cmd_ui_uf_change_settings_confirmed_by_user(self, response=RESPONSE_REJECTED, vol=0.0, tm=0, rate=0.0):
-        """
-        Constructs and sends a ui UF change settings confirmed by user message
-
-        @param response: (int) 0 for rejected, 1 for confirmed
-        @param vol: (float): volume (in L) that was confirmed
-        @param tm: (int) treatment time (in min) that was confirmed
-        @param rate: (float) ultrafiltration rate (in mL/min) that was confirmed
-        @return: None
-        """
-
-        resp = integer_to_bytearray(response)
-        volume = float_to_bytearray(vol * self.LITER_TO_ML_CONVERSION_FACTOR)
-        mins = integer_to_bytearray(tm)
-        ufrate = float_to_bytearray(rate)
-        payload = resp + volume + mins + ufrate
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_UF_SETTINGS_CHANGE_CONFIRMED_BY_USER,
-                                              payload=payload)
-
-        self.logger.debug("Sending UF settings change confirmation.")
-
-        self.can_interface.send(message, 0)
-
-        return 0
-
     def cmd_ui_treatment_duration_setting_change_request(self, time_min=0):
         """
             Constructs and sends a ui UF change settings confirmed by user message
@@ -1117,7 +1143,7 @@
 
         payload = integer_to_bytearray(time_min)
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_TREATMENT_DURATION_SETTING_CHANGE_REQUEST,
+                                              message_id=MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("Sending treatment duration setting change request.")
@@ -1141,7 +1167,7 @@
         dial = integer_to_bytearray(dial_flow)
         payload = bld + dial
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_BLOOD_DIALYSATE_FLOW_SETTING_CHANGE_REQUEST_BY_USER,
+                                              message_id=MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("Sending blood & dialysate flow rate settings change request.")
@@ -1167,7 +1193,7 @@
         cmd = integer_to_bytearray(cmnd)
         payload = cmd
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_UI_START_TREATMENT,
+                                              message_id=MsgIds.MSG_ID_UI_START_TREATMENT.value,
                                               payload=payload)
 
         self.logger.debug("Sending start treatment command request.")
@@ -1176,6 +1202,43 @@
 
         return 0
 
+    def set_a_treatment_parameter(self, param_idx, value):
+        """
+        Constructs and sends a set treatment parameter message
+        Constraints:
+            Must be logged into HD.
+
+        @param param_idx: (int) index/enum of parameter to set (see TreatmentParameters enum)
+        @param value: (int or float - depends on param_idx) value to set for given treatment parameter
+
+        @return: none
+        """
+        if self.TreatmentParameters.has_value(param_idx):
+            self.treatment_parameters[self.TreatmentParameters(param_idx)] = value
+            idx = integer_to_bytearray(param_idx)
+            if param_idx == self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value:
+                val = float_to_bytearray(value)
+            elif param_idx == self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value:
+                val = float_to_bytearray(value)
+            elif param_idx == self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value:
+                val = float_to_bytearray(value)
+            elif param_idx == self.TreatmentParameters.TREATMENT_PARAM_UF_VOLUME_L.value:
+                val = float_to_bytearray(value)
+            else:
+                val = integer_to_bytearray(value)
+            payload = idx+val
+            message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                                  message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value,
+                                                  payload=payload)
+            self.logger.debug("Setting treatment parameter " + param_idx + " to " + value + ".")
+            self.can_interface.send(message, 0)
+        else:
+            self.logger.debug("Invalid param_idx given.")
+
+
+
+        return 0
+
     def set_treatment_parameters(self, bld_flow, dia_flow, duration, hep_rate, hep_bol, hep_stop, sal_bol,
                                  acid, bicarb, dialyzer, dia_temp, art_low, art_high, ven_low, ven_high,
                                  bp_intvl, rb_flow):
@@ -1204,23 +1267,23 @@
 
         @return: none
         """
-        self.blood_flow_rate = bld_flow
-        self.dialysate_flow_rate = dia_flow
-        self.treatment_duration = duration
-        self.heparin_pre_stop_time = hep_stop
-        self.saline_bolus_volume = sal_bol
-        self.acid_concentrate = acid
-        self.bicarb_concentrate = bicarb
-        self.dialyzer_type = dialyzer
-        self.blood_pressure_meas_interval = bp_intvl
-        self.rinseback_flow_rate = rb_flow
-        self.arterial_pressure_low_alarm_limit = art_low
-        self.arterial_pressure_high_alarm_limit = art_high
-        self.venous_pressure_low_alarm_limit = ven_low
-        self.venous_pressure_high_alarm_limit = ven_high
-        self.heparin_dispense_rate = hep_rate
-        self.heparin_bolus_volume = hep_bol
-        self.dialysate_temperature = dia_temp
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value] = bld_flow
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value] = dia_flow
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value] = duration
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value] = hep_stop
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value] = sal_bol
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value] = acid
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value] = bicarb
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value] = dialyzer
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value] = bp_intvl
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value] = rb_flow
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value] = art_low
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value] = art_high
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value] = ven_low
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value] = ven_high
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value] = hep_rate
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value] = hep_bol
+        self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value] = dia_temp
 
         bld = integer_to_bytearray(bld_flow)
         dia = integer_to_bytearray(dia_flow)
@@ -1242,7 +1305,7 @@
 
         payload = bld+dia+dur+hps+sal+acc+bic+dzr+bpi+rbf+apl+aph+vpl+vph+hdr+hbv+tmp
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_UI_NEW_TREATMENT_PARAMS,
+                                              message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value,
                                               payload=payload)
 
         self.logger.debug("Sending treatment parameters to HD.")
@@ -1259,10 +1322,43 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS)
+                                              message_id=MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS.value)
 
         self.logger.debug("Sending confirm treatment parameters messge.")
 
         self.can_interface.send(message, 0)
 
         return 0
+
+
+    def cmd_ui_request_saline_bolus(self, start=False):
+        """
+        Constructs and sends a ui request for a saline bolus message
+        Constraints:
+            HD must be in treatment mode, dialysis sub-mode.
+            Will not succeed if saline bolus already in progress.
+            Will not succeed if max. saline volume has already been reached.
+
+        @param start: (bool) True if we're requesting bolus start, False if bolus abort
+
+        @return: none
+        """
+
+        if start:
+            sta = integer_to_bytearray(1)
+            str = "start"
+        else:
+            sta = integer_to_bytearray(0)
+            str = "abort"
+
+        payload = sta
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_USER_SALINE_BOLUS_REQUEST.value,
+                                              payload=payload)
+
+
+        self.logger.debug("Sending request to " + str + " a saline bolus.")
+
+        self.can_interface.send(message, 0)
+
+        return 0
Index: dialin/hd/valves.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/hd/valves.py	(.../valves.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/hd/valves.py	(.../valves.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -22,29 +22,24 @@
 from ..utils.base import _AbstractSubSystem, _publish
 from ..common import MsgIds
 from logging import Logger
-import enum
+from ..utils.base import DialinEnum
 
-class ValvesEnum(enum.Enum):
+
+class ValvesEnum(DialinEnum):
     VDI = 0
     VDO = 1
     VBA = 2
     VBV = 3
 
-    @classmethod
-    def has_value(cls, value):
-        return value in cls._value2member_map_
 
-class ValvesPositions(enum.Enum):
+class ValvesPositions(DialinEnum):
     VALVE_POSITION_NOT_IN_POSITION = 0
     VALVE_POSITION_A_INSERT_EJECT  = 1
     VALVE_POSITION_B_OPEN          = 2
     VALVE_POSITION_C_CLOSE         = 3
 
-    @classmethod
-    def has_value(cls, value):
-        return value in cls._value2member_map_
 
-class ValvesStates(enum.Enum):
+class ValvesStates(DialinEnum):
     VALVE_STATE_WAIT_FOR_POST                = 0
     VALVE_STATE_HOMING_NOT_STARTED           = 1
     VALVE_STATE_HOMING_FIND_ENERGIZED_EDGE   = 2
@@ -53,17 +48,11 @@
     VALVE_STATE_IN_TRANSITION                = 5
     VALVE_STATE_IN_BYPASS_MODE               = 6
 
-    @classmethod
-    def has_value(cls, value):
-        return value in cls._value2member_map_
 
-class AirTrapState(enum.Enum):
+class AirTrapState(DialinEnum):
     STATE_CLOSED = 0
     STATE_OPEN   = 1
 
-    @classmethod
-    def has_value(cls, value):
-        return value in cls._value2member_map_
 
 class HDValves(_AbstractSubSystem):
     """
@@ -263,7 +252,7 @@
             payload = integer_to_bytearray(0)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_VALVES_SET_BLOOD_TRAP_VALVE.value,
+                                              message_id=MsgIds.MSG_ID_HD_VALVES_SET_AIR_TRAP_VALVE.value,
                                               payload=payload)
         # Send message
         received_message = self.can_interface.send(message)
Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -13,31 +13,75 @@
 # @date (original) 06-Aug-2020
 #
 ############################################################################
+import enum
+import struct
+from time import sleep
+from typing import List
+
+from .hd_simulator_alarms import HDProxyAlarms
+from ..common.msg_defs import RequestRejectReasons, MsgIds
+from ..hd.buttons import HDButtons
 from ..protocols.CAN import (DenaliMessage,
                              DenaliCanMessenger,
                              DenaliChannels)
-from ..utils.base import _AbstractSubSystem, _LogManager, _publish
+from ..utils.base import _AbstractSubSystem, _LogManager
 from ..utils.conversions import integer_to_bytearray
-from ..hd.buttons import HDButtons
-from .hd_simulator_alarms import HDProxyAlarms
-import enum
-from typing import List
-from ..common.msg_defs import RequestRejectReasons, MsgIds
-import struct
-from time import sleep
 
-YES=1
-NO=0
+YES = 1
+NO = 0
 
-class HDSimulator(_AbstractSubSystem):
 
+
+class TreatmentParameterRejections:
+    def __init__(self):
+        self.param_request_valid = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_blood_flow_rate = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_dialysate_flow_rate = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_duration = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_heparin_stop_time = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_saline_bolus = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_acid_concentrate = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_bicarbonate_concentrate = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_dialyzer_type = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_blood_pressure_measure_interval = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_rinseback_flow_rate = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_arterial_pressure_limit_low = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_arterial_pressure_limit_high = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_venous_pressure_limit_low = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_venous_pressure_limit_high = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_heparin_dispensing_rate = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_heparin_bolus_volume = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+        self.param_dialysate_temp = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+
+    def set_all_valid(self):
+        """
+        Sets all parameters as valid
+
+        @return: None
+        """
+        for attr in dir(self):
+            if not callable(getattr(self, attr)) and attr.startswith("param_"):
+                self.__dict__[attr] = RequestRejectReasons.REQUEST_REJECT_REASON_NONE
+
+    def set_all_invalid(self):
+        """
+        Sets all treatment parameters to be invalid
+
+        @return: None
+        """
+        for attr in dir(self):
+            if not callable(getattr(self, attr)) and attr.startswith("param_"):
+                self.__dict__[attr] = RequestRejectReasons.REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE
+
+
+class HDSimulator(_AbstractSubSystem):
     NUM_TREATMENT_PARAMETERS = 18
 
     def __init__(self, can_interface="can0", log_level=None):
 
         super().__init__()
 
-        self._log_manager = _LogManager(log_level=log_level, log_filepath=self.__class__.__name__+".log")
+        self._log_manager = _LogManager(log_level=log_level, log_filepath=self.__class__.__name__ + ".log")
         self.logger = self._log_manager.logger
         self.can_interface = DenaliCanMessenger(can_interface=can_interface,
                                                 logger=self.logger,
@@ -60,6 +104,8 @@
                                                                        self._handler_ui_end_treatment)
         self.alarms_simulator = HDProxyAlarms(self.can_interface, self.logger)
 
+        self.treatment_parameter_rejections = TreatmentParameterRejections()
+
     def cmd_send_treatment_parameter_validation_response(self, rejections: List[RequestRejectReasons]):
         """
         Sends a treatment parameter validation response
@@ -128,7 +174,7 @@
         payload = bytearray(0x01)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
-                                              message_id=HDButtons.MSG_ID_HD_POWEROFF_OPEN,
+                                              message_id=MsgIds.MSG_ID_OFF_BUTTON_PRESS.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
@@ -143,7 +189,7 @@
         payload = integer_to_bytearray(1)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id,
-                                              message_id=HDButtons.MSG_ID_HD_POWEROFF_BROADCAST,
+                                              message_id=MsgIds.MSG_ID_POWER_OFF_WARNING.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
@@ -158,7 +204,7 @@
         payload = integer_to_bytearray(1)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
-                                              message_id=HDButtons.MSG_ID_HD_POWEROFF_TIMEOUT,
+                                              message_id=MsgIds.MSG_ID_OFF_BUTTON_PRESS.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
@@ -176,7 +222,7 @@
         payload += integer_to_bytearray(seconds_total)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id,
-                                              message_id=MsgIds.MSG_ID_PRIMING_STATUS.value,
+                                              message_id=MsgIds.MSG_ID_DG_PRIMING_STATUS_DATA.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
@@ -188,6 +234,16 @@
         @param message: the confirm treatment message
         @return: None
         """
+        START_POS = DenaliMessage.PAYLOAD_START_INDEX
+        END_POS = START_POS + 4
+
+        request = struct.unpack('i', bytearray(
+            message['message'][START_POS:END_POS]))[0]
+
+        if request == 0:
+            self.logger.debug("Received UI cancel confirmation of Treatment Parameters. ")
+            return
+
         self.logger.debug("Received UI confirmation of Treatment Parameters. ")
 
         state = 0
@@ -237,13 +293,27 @@
 
         self.can_interface.send(message, 0)
 
+    def cmd_send_end_treatment_response(self):
+        """
+        Sends an end treatment response
+        @return: None
+        """
+
+        payload = integer_to_bytearray(YES)
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
+                                              message_id=MsgIds.MSG_ID_HD_TREATMENT_END_RESPONSE.value,
+                                              payload=payload)
+
+        self.can_interface.send(message, 0)
     def _handler_ui_end_treatment(self, message):
         """
 
         @param message:
         @return:
         """
         self.logger.debug("Ending Treatment")
+        self.cmd_send_end_treatment_response()
 
     def _handler_ui_validate_parameters(self, message):
         """
@@ -252,23 +322,42 @@
         @return:
         """
         rejections = [
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # requestValid
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # bloodFlowRate
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # dialysateFlowRate
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # duration
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # heparinStopTime
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # salineBolus
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # acidConcentrate
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # bicarbonateConcentrate
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # dialyzerType
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # bloodPressureMeasureInterval
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # rinsebackFlowRate
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # arterialPressureLimitLow
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # arterialPressureLimitHigh
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # venousPressureLimitLow
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # venousPressureLimitHigh
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # heparinDispensingRate
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # heparinBolusVolume
-            RequestRejectReasons.REQUEST_REJECT_REASON_NONE,  # dialysateTemp
+            self.treatment_parameter_rejections.param_request_valid,
+            self.treatment_parameter_rejections.param_blood_flow_rate,
+            self.treatment_parameter_rejections.param_dialysate_flow_rate,
+            self.treatment_parameter_rejections.param_duration,
+            self.treatment_parameter_rejections.param_heparin_stop_time,
+            self.treatment_parameter_rejections.param_saline_bolus,
+            self.treatment_parameter_rejections.param_acid_concentrate,
+            self.treatment_parameter_rejections.param_bicarbonate_concentrate,
+            self.treatment_parameter_rejections.param_dialyzer_type,
+            self.treatment_parameter_rejections.param_blood_pressure_measure_interval,
+            self.treatment_parameter_rejections.param_rinseback_flow_rate,
+            self.treatment_parameter_rejections.param_arterial_pressure_limit_low,
+            self.treatment_parameter_rejections.param_arterial_pressure_limit_high,
+            self.treatment_parameter_rejections.param_venous_pressure_limit_low,
+            self.treatment_parameter_rejections.param_venous_pressure_limit_high,
+            self.treatment_parameter_rejections.param_heparin_dispensing_rate,
+            self.treatment_parameter_rejections.param_heparin_bolus_volume,
+            self.treatment_parameter_rejections.param_dialysate_temp
         ]
+
         self.cmd_send_treatment_parameter_validation_response(rejections)
+
+    def test_started(self, test_name: str):
+        """
+        Logs that a test was started
+
+        @param test_name: The name of the test
+        @return: None
+        """
+        self.logger.info("Test Started: {0}".format(test_name))
+
+    def test_completed(self):
+        """
+        Logs that a test was completed
+
+        @return: None
+        """
+        self.logger.info("Test Completed")
+
Index: dialin/ui/hd_simulator_alarms.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- dialin/ui/hd_simulator_alarms.py	(.../hd_simulator_alarms.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ dialin/ui/hd_simulator_alarms.py	(.../hd_simulator_alarms.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -20,7 +20,7 @@
 from ..utils.base import _AbstractSubSystem
 from ..utils.conversions import integer_to_bytearray
 from ..common.msg_defs import MsgIds
-from ..common.alarm_defs import AlarmList, AlarmPriorities
+from ..common.alarm_defs import AlarmList
 from time import sleep, time
 
 HIGH = 3
@@ -108,7 +108,7 @@
         if self.can_interface is not None:
             channel_id = DenaliChannels.ui_to_hd_ch_id
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_UI_ALARM_ACKNOWLEDGE.value,
+                                                                       MsgIds.MSG_ID_UI_ALARM_USER_ACKNOWLEDGE.value,
                                                                        self._handler_alarm_acknowledge)
             self.can_interface.register_receiving_publication_function(channel_id,
                                                                        MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value,
Index: tests/test_gen_requirements.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -re833e6523af30bc1f644385df10bca91f0e81b13
--- tests/test_gen_requirements.py	(.../test_gen_requirements.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ tests/test_gen_requirements.py	(.../test_gen_requirements.py)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -103,7 +103,9 @@
         hd.dialysate_outlet_flow,
         hd.treatment,
         hd.pressure_occlusion,
-        hd.buttons
+        hd.valves,
+        hd.air_trap,
+        hd.accel
     ]
     gen_publish_requirements(modules)
     gen_cmd_requirements(modules)
@@ -128,7 +130,9 @@
         dg.drain_pump,
         dg.heaters,
         dg.temperature_sensors,
-        dg.conductivity_sensors
+        dg.conductivity_sensors,
+        dg.accel,
+        dg.alarms
     ]
 
     gen_publish_requirements(modules)
Index: tools/run_static_code_analysis.sh
===================================================================
diff -u -r26bfa9223c2f3b4048a4d7415559889a1026cc85 -re833e6523af30bc1f644385df10bca91f0e81b13
--- tools/run_static_code_analysis.sh	(.../run_static_code_analysis.sh)	(revision 26bfa9223c2f3b4048a4d7415559889a1026cc85)
+++ tools/run_static_code_analysis.sh	(.../run_static_code_analysis.sh)	(revision e833e6523af30bc1f644385df10bca91f0e81b13)
@@ -15,6 +15,6 @@
 #
 ############################################################################
 
-
 cd ../
-flake8 dialin/
\ No newline at end of file
+source venv/bin/activate
+flake8 --ignore=E501,W293,E266,E241,E202 dialin/