Index: dialin/common/msg_defs.py
===================================================================
diff -u -r287af45040e35882e001fb3ea835f304007870c4 -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 287af45040e35882e001fb3ea835f304007870c4)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -194,12 +194,17 @@
     MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE = 0xA021    # Heat disinfection data publish interval override request
     MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022                   # DG reset request
     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_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024
     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_START_STOP_INLET_UV_REACTOR = 0xA028              # DG start/stop inlet UV reactor
     MSG_ID_DG_REQUEST_CALIBRATION_DATA = 0xA029                 # Requests calibration data from DG
+    MSG_ID_DG_FANS_DATA_PUBLISH_OVERRIDE = 0xA02A               # Fans data publish interval override request
+    MSG_ID_DG_START_STOP_OUTLET_UV_REACTOR = 0xA02B             # DG start/stop outlet UV reactor
+    MSG_ID_DG_UV_REACTORS_HEALTH_OVERRIDE = 0xA02C              # DG UV reactors health override request
+    MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA02D # DG thermistors data publish interval override
+    MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE = 0xA02E               # DG thermistors value override
 
     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
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -r287af45040e35882e001fb3ea835f304007870c4 -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 287af45040e35882e001fb3ea835f304007870c4)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -26,6 +26,10 @@
 from .heaters import Heaters
 from .temperature_sensors import TemperatureSensors
 from .conductivity_sensors import ConductivitySensors
+from .heat_disinfection import HeatDisinfection
+from .thermistors import Thermistors
+from .fans import Fans
+from .uv_reactors import UVReactors
 from .concentrate_pumps import ConcentratePumps
 from ..utils.conversions import integer_to_bytearray
 from ..protocols.CAN import (DenaliCanMessenger, DenaliMessage, DenaliChannels)
@@ -140,6 +144,10 @@
         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)
+        self.heat_disinfect = HeatDisinfection(self.can_interface, self.logger)
+        self.thermistors = Thermistors(self.can_interface, self.logger)
+        self.fans = Fans(self.can_interface, self.logger)
+        self.uv_reactors = UVReactors(self.can_interface, self.logger)
 
     def get_version(self):
         """
Index: dialin/dg/drain_pump.py
===================================================================
diff -u -r287af45040e35882e001fb3ea835f304007870c4 -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision 287af45040e35882e001fb3ea835f304007870c4)
+++ dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -17,17 +17,41 @@
 from ..utils.conversions import integer_to_bytearray
 from ..common.msg_defs import MsgIds, MsgFldPositions
 from .constants import RESET, NO_RESET
-from ..protocols.CAN import (DenaliMessage,
-                             DenaliChannels)
+from ..protocols.CAN import (DenaliMessage, DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
 from logging import Logger
+import enum
 
+class DrainPumpStates(enum.Enum):
 
+    DRAIN_PUMP_OFF_STATE = 0
+    DRAIN_PUMP_CONTROL_TO_TARGET_STATE = 1
+    DRAIN_PUMP_OPEN_LOOP_STATE = 2
+
+    @classmethod
+    def has_value(cls, value):
+        return value in cls._value2member_map_
+
 class DGDrainPump(_AbstractSubSystem):
     """
     Dialysate Generator (DG) Dialin API sub-class for drain pump related commands.
     """
 
+    # Drain pump message IDs
+    MSG_ID_DG_DRAIN_PUMP_PUBLISHED_DATA = 0x0024
+    MSG_ID_DG_DRAIN_PUMP_SET_SPEED_OVERRIDE = 0xA00B
+    MSG_ID_DG_DRAIN_PUMP_BROADAST_INTERVAL_OVERRIDE = 0xA00C
+
+    # Drain pump broadcast message field positions
+    START_POS_SET_SPD = DenaliMessage.PAYLOAD_START_INDEX
+    END_POS_SET_SPD = START_POS_SET_SPD + 4
+    START_POS_DAC = END_POS_SET_SPD
+    END_POS_DAC = START_POS_DAC + 4
+    START_POS_PRESS_DIFF = END_POS_DAC
+    END_POS_PRESS_DIFF = START_POS_PRESS_DIFF + 4
+    START_POS_PUMP_STATE = END_POS_PRESS_DIFF
+    END_POS_PUMP_STATE = START_POS_PUMP_STATE + 4
+
     def __init__(self, can_interface, logger: Logger):
         """
         DGDrainPump constructor
@@ -43,16 +67,18 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_drain_pump_sync)
 
-        self.target_drain_pump_speed_RPM = 0
+        self.target_drain_pump_RPM = 0
         self.dac_value = 0
+        self.pressure_difference = 0
+        self.drain_pump_state = 0
 
     def get_target_drain_pump_speed(self):
         """
         Gets the target drain pump speed
 
         @return: The target drain pump speed (RPM)
         """
-        return self.target_drain_pump_speed_RPM
+        return self.target_drain_pump_RPM
 
     def get_dac_value(self):
         """
@@ -61,7 +87,7 @@
         """
         return self.dac_value
 
-    @_publish(["target_drain_pump_speed_RPM", "dac_value"])
+    @_publish(["target_drain_pump_RPM", "dac_value", "pressure_difference", "drain_pump_state"])
     def _handler_drain_pump_sync(self, message):
         """
         Handles published drain pump data messages.  Drain pump data are captured
@@ -72,12 +98,18 @@
         """
 
         tgt = struct.unpack('i', bytearray(
-            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
+            message['message'][self.START_POS_SET_SPD:self.END_POS_SET_SPD]))[0]
         dac = struct.unpack('i', bytearray(
-            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
+            message['message'][self.START_POS_DAC:self.END_POS_DAC]))[0]
+        diff = struct.unpack('f', bytearray(
+            message['message'][self.START_POS_PRESS_DIFF:self.END_POS_PRESS_DIFF]))[0]
+        state = struct.unpack('i', bytearray(
+            message['message'][self.START_POS_PUMP_STATE:self.END_POS_PUMP_STATE]))[0]
 
-        self.target_drain_pump_speed_RPM = tgt[0]
-        self.dac_value = dac[0]
+        self.target_drain_pump_RPM = tgt
+        self.dac_value = dac
+        self.pressure_difference = diff
+        self.drain_pump_state = state
 
     def cmd_drain_pump_speed_set_point_override(self, speed, reset=NO_RESET):
         """
Index: dialin/dg/hd_proxy.py
===================================================================
diff -u -r287af45040e35882e001fb3ea835f304007870c4 -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/dg/hd_proxy.py	(.../hd_proxy.py)	(revision 287af45040e35882e001fb3ea835f304007870c4)
+++ dialin/dg/hd_proxy.py	(.../hd_proxy.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -27,6 +27,12 @@
 
     \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
 
     # Reservoir IDs
     RESERVOIR1 = 0
Index: dialin/dg/ro_pump.py
===================================================================
diff -u -r287af45040e35882e001fb3ea835f304007870c4 -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision 287af45040e35882e001fb3ea835f304007870c4)
+++ dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -17,22 +17,47 @@
 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)
+from ..protocols.CAN import (DenaliMessage, DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
 from logging import Logger
+import enum
 
 
+class ROPumpStates(enum.Enum):
+    RO_PUMP_OFF_STATE = 0
+    RO_PUMP_RAMP_UP_STATE = 1
+    RO_PUMP_VERIFY_FLOW_STATE = 2
+    RO_PUMP_CONTROL_TO_TARGET_STATE = 3
+    RO_PUMP_OPEN_LOOP_STATE = 4
+
+    @classmethod
+    def has_value(cls, value):
+        return value in cls._value2member_map_
+
+
 class DGROPump(_AbstractSubSystem):
     """
     DGROPump
     Dialysate Generator (DG) Dialin API sub-class for RO pump related commands.
 
     """
 
-    #Enums
-    RAMP_UP_STATE = 0
+    # RO pump message IDs
+    MSG_ID_DG_RO_PUMP_PUBLISHED_DATA = 0x1F
+    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
 
     def __init__(self, can_interface, logger: Logger):
         """
@@ -45,11 +70,11 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.dg_sync_broadcast_ch_id
+
             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)
+            self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_ro_pump_sync)
 
-        self.target_pressure_psi = 0
+        self.target_pressure_psi = 0.0
         self.measured_flow_rate_lpm = 0.0
         self.pwm_duty_cycle_pct = 0.0
         self.ro_pump_state = 0.0
@@ -75,48 +100,26 @@
         """
         return self.pwm_duty_cycle_pct
 
-    @_publish([
-        "target_pressure_psi",
-        "measured_flow_rate_lpm",
-        "pwm_duty_cycle_pct",
-        "ro_pump_state"
-        ])
+    @_publish(["target_pressure_psi", "measured_flow_rate_lpm", "pwm_duty_cycle_pct", "ro_pump_state"])
     def _handler_ro_pump_sync(self, message):
         """
         Handles published ro pump data messages.  RO pump data are captured
         for reference.
 
         @param message:  published RO pump data message
+
         @return: None
         """
+        tgt = struct.unpack('f', bytearray(message['message'][self.START_POS_PRES_SET_PT:self.END_POS_PRES_SET_PT]))[0]
+        flow = struct.unpack('f', bytearray(message['message'][self.START_POS_MEAS_FLOW:self.END_POS_MEAS_FLOW]))[0]
+        pwm = struct.unpack('f', bytearray(message['message'][self.START_POS_PWM:self.END_POS_PWM]))[0]
+        ro_state = struct.unpack('i', bytearray(message['message'][self.START_POS_STATE:self.END_POS_STATE]))[0]
 
-        tgt = struct.unpack('f', bytearray(
-            message['message'][MsgFldPositions.START_POS_FIELD_1:MsgFldPositions.END_POS_FIELD_1]))
-        flow = struct.unpack('f', bytearray(
-            message['message'][MsgFldPositions.START_POS_FIELD_2:MsgFldPositions.END_POS_FIELD_2]))
-        pwm = struct.unpack('f', bytearray(
-            message['message'][MsgFldPositions.START_POS_FIELD_3:MsgFldPositions.END_POS_FIELD_3]))
-        ro_state = struct.unpack('i', bytearray(
-            message['message'][MsgFldPositions.START_POS_FIELD_4:MsgFldPositions.END_POS_FIELD_4]))
+        self.target_pressure_psi = tgt
+        self.measured_flow_rate_lpm = flow
+        self.pwm_duty_cycle_pct = pwm
+        self.ro_pump_state = ROPumpStates(ro_state).name if ROPumpStates.has_value(ro_state) else 'State Unknown'
 
-        self.target_pressure_psi = tgt[0]
-        self.measured_flow_rate_lpm = flow[0]
-        self.pwm_duty_cycle_pct = pwm[0]
-        raw_ro_pump_state = ro_state[0]
-
-        #self.ro_pump_state = self.ro_pump_states.get("RO_PUMP_OFF_STATE", -1)
-
-        if raw_ro_pump_state == 0:
-            self.ro_pump_state = "RO_PUMP_OFF_STATE"
-        elif raw_ro_pump_state == 1:
-            self.ro_pump_state = "RO_PUMP_RAMP_UP_STATE"
-        elif raw_ro_pump_state == 2:
-            self.ro_pump_state = "RO_PUMP_VERIFY_FLOW_STATE"
-        elif raw_ro_pump_state == 3:
-            self.ro_pump_state = "RO_PUMP_CONTROL_TO_TARGET_STATE"
-        elif raw_ro_pump_state == 4:
-            self.ro_pump_state = "RO_PUMP_OPEN_LOOP_STATE"
-
     def cmd_ro_pump_set_point_override(self, pressure, reset=NO_RESET):
         """
         Constructs and sends the RO pump set point override command.
Index: dialin/dg/valves.py
===================================================================
diff -u -r287af45040e35882e001fb3ea835f304007870c4 -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/dg/valves.py	(.../valves.py)	(revision 287af45040e35882e001fb3ea835f304007870c4)
+++ dialin/dg/valves.py	(.../valves.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -21,12 +21,66 @@
 from ..protocols.CAN import (DenaliMessage, DenaliChannels)
 from ..utils.base import _AbstractSubSystem, _publish
 from logging import Logger
+import enum
 
 # Valve states
 ENERGIZED = True
 DEENERGIZED = False
 
+class VPiVSPVBfStates(enum.Enum):
 
+    VALVE_STATE_CLOSED = 0
+    VALVE_STATE_OPEN = 1
+
+    @classmethod
+    def has_value(cls, value):
+        return value in cls._value2member_map_
+
+class VPdStates(enum.Enum):
+
+    VALVE_STATE_OPEN_C_TO_NO = 0
+    VALVE_STATE_DRAIN_C_TO_NC = 1
+
+    @classmethod
+    def has_value(cls, value):
+        return value in cls._value2member_map_
+
+class VPoStates(enum.Enum):
+
+    VALVE_STATE_NOFILL_C_TO_NO = 0
+    VALVE_STATE_FILL_C_TO_NC = 1
+
+    @classmethod
+    def has_value(cls, value):
+        return value in cls._value2member_map_
+
+class VDrVRcStates(enum.Enum):
+
+    VALVE_STATE_DRAIN_C_TO_NO = 0
+    VALVE_STATE_RECIRC_C_TO_NC = 1
+
+    @classmethod
+    def has_value(cls, value):
+        return value in cls._value2member_map_
+
+class VRoVRiStates(enum.Enum):
+
+    VALVE_STATE_R1_C_TO_NO = 0
+    VALVE_STATE_R2_C_TO_NC = 1
+
+    @classmethod
+    def has_value(cls, value):
+        return value in cls._value2member_map_
+
+class VRdVRfStates(enum.Enum):
+
+    VALVE_STATE_R2_C_TO_NO = 0
+    VALVE_STATE_R1_C_TO_NC = 1
+
+    @classmethod
+    def has_value(cls, value):
+        return value in cls._value2member_map_
+
 class DGValves(_AbstractSubSystem):
     """
     Dialysate Generation (DG) interface for valve related commands.
@@ -50,6 +104,7 @@
     VALVE_RESERVOIR_1 = 10       # VR1
     VALVE_RESERVOIR_2 = 11       # VR2
     VALVE_PRODUCTION_DRAIN = 12  # VPD
+    NUM_OF_VALVES = 13           # Number of valves
 
     def __init__(self, can_interface, logger: Logger):
         """
@@ -81,6 +136,8 @@
         self.valve_state_VR2 = {"id": self.VALVE_RESERVOIR_2, "state": DEENERGIZED}
         self.valve_state_VPD = {"id": self.VALVE_PRODUCTION_DRAIN, "state": DEENERGIZED}
 
+        self.valve_states_enum = [0 for i in range(self.NUM_OF_VALVES)]
+
     def get_valve_states(self):
         """
         Gets the valve states
@@ -127,6 +184,7 @@
         For example:
             >>> dg = DG()
             >>> observation = {'datetime': datetime.datetime(2020, 7, 13, 10, 43, 27, 433357),
+
              'valve_state_VBF': {'id': 5, 'state': True},
              'valve_state_VDR': {'id': 7, 'state': True},
              'valve_state_VPD': {'id': 12, 'state': True},
@@ -142,6 +200,7 @@
              'valve_state_VSP': {'id': 9, 'state': True},
              'valve_states_all': 8191}
             >>> self.logger.debug(dg.valves.sort_by_id(observation))
+
             ('valve_state_VRF', 0, True)
             ('valve_state_VRI', 1, True)
             ('valve_state_VRD', 2, True)
@@ -193,7 +252,8 @@
         "valve_state_VSP",
         "valve_state_VR1",
         "valve_state_VR2",
-        "valve_state_VPD"
+        "valve_state_VPD",
+        "valve_states_enum"
         ])
     def _handler_valves_sync(self, message):
         """
@@ -220,6 +280,20 @@
         self.valve_state_VR2["state"] = self._binary_to_valve_state(vst[0] & 2048)
         self.valve_state_VPD["state"] = self._binary_to_valve_state(vst[0] & 4096)
 
+        self.valve_states_enum[self.VALVE_RESERVOIR_FILL] = VRdVRfStates(self._binary_to_valve_state(vst[0] & 1)).name    # VRF
+        self.valve_states_enum[self.VALVE_RESERVOIR_INLET] = VRoVRiStates(self._binary_to_valve_state(vst[0] & 2)).name    # VRI
+        self.valve_states_enum[self.VALVE_RESERVOIR_DRAIN] = VRdVRfStates(self._binary_to_valve_state(vst[0] & 4)).name    # VRD
+        self.valve_states_enum[self.VALVE_RESERVOIR_OUTLET] = VRoVRiStates(self._binary_to_valve_state(vst[0] & 8)).name   # VRO
+        self.valve_states_enum[self.VALVE_PRESSURE_OUTLET] = VPoStates(self._binary_to_valve_state(vst[0] & 16)).name   # VPO
+        self.valve_states_enum[self.VALVE_BYPASS_FILTER] = VPiVSPVBfStates(self._binary_to_valve_state(vst[0] & 32)).name     # VBF
+        self.valve_states_enum[self.VALVE_RECIRCULATE] = VDrVRcStates(self._binary_to_valve_state(vst[0] & 64)).name       # VRC
+        self.valve_states_enum[self.VALVE_DRAIN] = VDrVRcStates(self._binary_to_valve_state(vst[0] & 128)).name            # VDR
+        self.valve_states_enum[self.VALVE_PRESSURE_INLET] = VPiVSPVBfStates(self._binary_to_valve_state(vst[0] & 256)).name    # VPI
+        self.valve_states_enum[self.VALVE_SAMPLING_PORT] = VPiVSPVBfStates(self._binary_to_valve_state(vst[0] & 512)).name    # VSP
+        self.valve_states_enum[self.VALVE_RESERVOIR_1] = self._binary_to_valve_state(vst[0] & 1024)     # VR1
+        self.valve_states_enum[self.VALVE_RESERVOIR_2] = self._binary_to_valve_state(vst[0] & 2048)     # VR2
+        self.valve_states_enum[self.VALVE_PRODUCTION_DRAIN] = VPdStates(self._binary_to_valve_state(vst[0] & 4096)).name    # VPD
+
     def cmd_valve_override(self, state, valve, reset=NO_RESET):
         """
         Constructs and sends the valve state override command.
Index: dialin/hd/alarms.py
===================================================================
diff -u -ra2add7d5c768ab21eba0c61e5ec5c7e84b75eeab -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/hd/alarms.py	(.../alarms.py)	(revision a2add7d5c768ab21eba0c61e5ec5c7e84b75eeab)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -8,35 +8,27 @@
 # @file alarms.py
 #
 # @author (last) Peter Lucia
-# @date (last) 26-Aug-2020
+# @date (last) 10-Nov-2020
 # @author (original) Peter Lucia
 # @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
@@ -67,68 +59,6 @@
     START_POS_ALARM_ID = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_ALARM_ID = START_POS_ALARM_ID + 2
 
-    # See AlarmDefs.h
-    ALARM_ID_NO_ALARM = 0
-    ALARM_ID_SOFTWARE_FAULT = 1
-    ALARM_ID_STUCK_BUTTON_TEST_FAILED = 2
-    ALARM_ID_FPGA_POST_TEST_FAILED = 3
-    ALARM_ID_WATCHDOG_POST_TEST_FAILED = 4
-    ALARM_ID_UI_COMM_POST_FAILED = 5
-    ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK = 6
-    ALARM_ID_BLOOD_PUMP_OFF_CHECK = 7
-    ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK = 8
-    ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK = 9
-    ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK = 10
-    ALARM_ID_DIAL_IN_PUMP_OFF_CHECK = 11
-    ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK = 12
-    ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK = 13
-    ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK = 14
-    ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK = 15
-    ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK = 16
-    ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = 17
-    ALARM_ID_WATCHDOG_EXPIRED = 18
-    ALARM_ID_RTC_COMM_ERROR = 19
-    ALARM_ID_RTC_CONFIG_ERROR = 20
-    ALARM_ID_DG_COMM_TIMEOUT = 21
-    ALARM_ID_UI_COMM_TIMEOUT = 22
-    ALARM_ID_COMM_TOO_MANY_BAD_CRCS = 23
-    ALARM_ID_TREATMENT_STOPPED_BY_USER = 24
-    ALARM_ID_BLOOD_SITTING_WARNING = 25
-    ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME = 26
-    ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK = 27
-    ALARM_ID_CAN_MESSAGE_NOT_ACKED = 28
-    ALARM_ID_OCCLUSION_BLOOD_PUMP = 29
-    ALARM_ID_OCCLUSION_DIAL_IN_PUMP = 30
-    ALARM_ID_OCCLUSION_DIAL_OUT_PUMP = 31
-    ALARM_ID_ARTERIAL_PRESSURE_LOW = 32
-    ALARM_ID_ARTERIAL_PRESSURE_HIGH = 33
-    ALARM_ID_VENOUS_PRESSURE_LOW = 34
-    ALARM_ID_VENOUS_PRESSURE_HIGH = 35
-    ALARM_ID_UF_RATE_TOO_HIGH_ERROR = 36
-    ALARM_ID_UF_VOLUME_ACCURACY_ERROR = 37
-    ALARM_ID_RTC_BATTERY_LOW = 38
-    ALARM_ID_RTC_OR_TIMER_ACCURACY_FAILURE = 39
-    ALARM_ID_RTC_RAM_OPS_ERROR = 40
-    ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = 41
-    ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR = 42
-    ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR = 43
-    ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR = 44
-    ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 45
-    AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR = 46
-    ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE = 47
-    ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE = 48
-    ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT = 49
-    ALARM_ID_HD_COMM_TIMEOUT = 50
-    ALARM_ID_VALVE_CONTROL_FAILURE = 51
-    ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 52
-    ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 53
-    ALARM_ID_DIAL_OUT_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 54
-    ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK = 55
-    ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK = 56
-    ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK = 57
-    ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 58
-    ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE = 59
-
     def __init__(self, can_interface, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
@@ -139,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)
 
@@ -162,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):
         """
@@ -270,6 +195,7 @@
         @param message:  published HD alarm activation message
         @return: none
         """
+        self.logger.debug("Alarm activated!")
 
         alarm_id = struct.unpack('<H', bytearray(message['message'][self.START_POS_ALARM_ID:self.END_POS_ALARM_ID]))
         self.alarm_states[alarm_id[0]] = True
@@ -286,6 +212,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
@@ -306,7 +259,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
@@ -342,7 +295,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")
@@ -390,7 +343,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 -ra2add7d5c768ab21eba0c61e5ec5c7e84b75eeab -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision a2add7d5c768ab21eba0c61e5ec5c7e84b75eeab)
+++ dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -8,7 +8,7 @@
 # @file blood_flow.py
 #
 # @author (last) Peter Lucia
-# @date (last) 26-Aug-2020
+# @date (last) 10-Nov-2020
 # @author (original) Peter Lucia
 # @date (original) 02-Apr-2020
 #
@@ -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")
@@ -210,8 +192,12 @@
             else:
                 str_res = str(flow)
 
+            if mode == PUMP_CONTROL_MODE_OPEN_LOOP:
+                str_mode = " (open loop): "
+            else:
+                str_mode = " (closed loop): "
             self.logger.debug(
-                "Blood flow set point overridden to " + str_res + " mL/min: " +
+                "Blood flow set point overridden to " + str_res + " mL/min" + str_mode +
 
                 str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
             # response payload is OK or not OK
@@ -236,7 +222,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")
@@ -259,7 +245,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.
@@ -276,7 +262,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")
@@ -299,7 +285,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:
@@ -315,7 +301,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")
@@ -338,7 +324,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.
@@ -355,7 +341,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")
@@ -395,7 +381,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")
@@ -418,6 +404,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
@@ -435,7 +461,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")
@@ -469,22 +495,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 -ra2add7d5c768ab21eba0c61e5ec5c7e84b75eeab -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision a2add7d5c768ab21eba0c61e5ec5c7e84b75eeab)
+++ dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -8,7 +8,7 @@
 # @file dialysate_inlet_flow.py
 #
 # @author (last) Peter Lucia
-# @date (last) 26-Aug-2020
+# @date (last) 10-Nov-2020
 # @author (original) Peter Lucia
 # @date (original) 02-Apr-2020
 #
@@ -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")
@@ -211,8 +197,12 @@
             else:
                 str_res = str(flow)
 
+            if mode == PUMP_CONTROL_MODE_OPEN_LOOP:
+                str_mode = " (open loop): "
+            else:
+                str_mode = " (closed loop): "
             self.logger.debug(
-                "Dialysate flow set point overridden to " + str_res + " mL/min: " +
+                "Dialysate flow set point overridden to " + str_res + " mL/min" + str_mode +
 
                 str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
             # response payload is OK or not OK
@@ -237,7 +227,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")
@@ -260,7 +250,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.
@@ -277,7 +267,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")
@@ -300,7 +290,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:
@@ -316,7 +306,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")
@@ -339,7 +329,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.
@@ -356,7 +346,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")
@@ -379,7 +369,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.
@@ -396,7 +386,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")
@@ -419,6 +409,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
@@ -436,7 +466,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")
@@ -469,22 +499,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/hemodialysis_device.py
===================================================================
diff -u -ra2add7d5c768ab21eba0c61e5ec5c7e84b75eeab -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision a2add7d5c768ab21eba0c61e5ec5c7e84b75eeab)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -8,13 +8,14 @@
 # @file hemodialysis_device.py
 #
 # @author (last) Peter Lucia
-# @date (last) 26-Aug-2020
+# @date (last) 10-Nov-2020
 # @author (original) Peter Lucia
 # @date (original) 02-Apr-2020
 #
 ############################################################################
 import struct
 from .accelerometer import HDAccelerometer
+from .air_trap import HDAirTrap
 from .alarms import HDAlarms
 from .buttons import HDButtons
 from .ui_proxy import HDUIProxy
@@ -24,32 +25,24 @@
 from .dialysate_inlet_flow import HDDialysateInletFlow
 from .dialysate_outlet_flow import HDDialysateOutletFlow
 from .treatment import HDTreatment
+from .valves import HDValves
 from .pressure_occlusion import HDPressureOcclusion
 from ..protocols.CAN import (DenaliMessage,
                              DenaliCanMessenger,
                              DenaliChannels)
+
+from ..utils.conversions import integer_to_bytearray
 from ..utils.base import _AbstractSubSystem, _publish, _LogManager
 from .constants import NO_RESET
-from ..utils.conversions import integer_to_bytearray
+from ..common.msg_defs import MsgIds, MsgFldPositions
 
+
 class HD(_AbstractSubSystem):
     """
-    Hemodialysis Device (HD) Dialin object API.  It provides the basic interface to communicate with
-    the HD firmware.
+    Hemodialysis Device (HD) Dialin object API.
+    It provides the basic interface to communicate with the HD firmware.
     """
 
-    # HD message IDs
-    MSG_ID_HD_OPERATION_MODE_BROADCAST = 0x0025
-    MSG_ID_LOGIN_TO_HD = 0x8000
-    MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE = 0x8026
-    MSG_ID_POWEROFF_NOTIFY = 0x0020
-
-    # 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'
 
@@ -92,7 +85,7 @@
         # register handler for HD operation mode broadcast messages
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = self.MSG_ID_HD_OPERATION_MODE_BROADCAST
+            msg_id = MsgIds.MSG_ID_HD_OP_MODE.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_hd_op_mode_sync)
 
@@ -101,6 +94,9 @@
         self.hd_operation_sub_mode = 0
 
         # Create command groups
+
+        self.accel = HDAccelerometer(self.can_interface, self.logger)
+        self.air_trap = HDAirTrap(self.can_interface, self.logger)
         self.alarms = HDAlarms(self.can_interface, self.logger)
         self.buttons = HDButtons(self.can_interface, self.logger)
         self.ui = HDUIProxy(self.can_interface, self.logger)
@@ -111,6 +107,7 @@
         self.dialysate_outlet_flow = HDDialysateOutletFlow(self.can_interface, self.logger)
         self.treatment = HDTreatment(self.can_interface, self.logger)
         self.pressure_occlusion = HDPressureOcclusion(self.can_interface, self.logger)
+        self.valves = HDValves(self.can_interface, self.logger)
 
     def get_operation_mode(self):
         """
@@ -130,9 +127,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]
@@ -146,7 +143,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_LOGIN_TO_HD,
+                                              message_id=MsgIds.MSG_ID_TESTER_LOGIN_REQUEST.value,
                                               payload=list(map(int, map(ord, self.HD_LOGIN_PASSWORD))))
 
         self.logger.debug("Logging in...")
@@ -187,7 +184,7 @@
         payload = rst + saf
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE,
+                                              message_id=MsgIds.MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("overriding HD safety shutdown")
@@ -204,3 +201,24 @@
         else:
             self.logger.debug("Timeout!!!!")
             return False
+
+    def cmd_hd_software_reset_request(self):
+        """
+        Constructs and sends an HD software reset request via CAN bus.
+        Constraints:
+            Must be logged into HD.
+
+        \returns response message if received, False if no response received
+
+        @return: 1 if successful, zero otherwise
+
+        """
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_HD_SOFTWARE_RESET_REQUEST.value)
+
+        self.logger.debug("requesting HD software reset")
+
+        # Send message
+        self.can_interface.send(message, 0)
+        self.logger.debug("Sent request to HD to reset...")
Index: dialin/hd/rtc.py
===================================================================
diff -u -ra2add7d5c768ab21eba0c61e5ec5c7e84b75eeab -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/hd/rtc.py	(.../rtc.py)	(revision a2add7d5c768ab21eba0c61e5ec5c7e84b75eeab)
+++ dialin/hd/rtc.py	(.../rtc.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -8,7 +8,7 @@
 # @file rtc.py
 #
 # @author (last) Peter Lucia
-# @date (last) 21-Aug-2020
+# @date (last) 03-Nov-2020
 # @author (original) Peter Lucia
 # @date (original) 02-Apr-2020
 #
@@ -18,6 +18,7 @@
                              DenaliChannels)
 from ..utils.conversions import integer_to_bytearray
 from ..utils.base import _AbstractSubSystem, _publish
+from ..common.msg_defs import MsgIds
 from logging import Logger
 
 
@@ -28,9 +29,6 @@
 
     """
 
-    MSG_ID_SET_RTC_DATE_TIME = 0x801D
-    MSG_ID_RTC_EPOCH = 0x000A
-
     START_POS_SET_PT = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_SET_PT = START_POS_SET_PT + 4
 
@@ -46,7 +44,7 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = self.MSG_ID_RTC_EPOCH
+            msg_id = MsgIds.MSG_ID_RTC_EPOCH.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_rtc_epoch)
         self.rtc_epoch = 0
@@ -93,7 +91,7 @@
         payload = sec + mint + hour + day + month + year
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=self.MSG_ID_SET_RTC_DATE_TIME,
+                                              message_id=MsgIds.MSG_ID_SET_RTC_DATE_TIME.value,
                                               payload=payload)
 
         self.logger.debug("Setting time and date to rtc")
Index: dialin/hd/treatment.py
===================================================================
diff -u -rfdac759dbbec54375d4b3ebb21aebcc684ac1aed -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/hd/treatment.py	(.../treatment.py)	(revision fdac759dbbec54375d4b3ebb21aebcc684ac1aed)
+++ dialin/hd/treatment.py	(.../treatment.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -8,7 +8,7 @@
 # @file treatment.py
 #
 # @author (last) Peter Lucia
-# @date (last) 06-Aug-2020
+# @date (last) 10-Nov-2020
 # @author (original) Peter Lucia
 # @date (original) 02-Apr-2020
 #
@@ -17,6 +17,8 @@
 from ..protocols.CAN import (DenaliMessage,
                              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
 from ..utils.conversions import integer_to_bytearray, float_to_bytearray
 
@@ -27,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
@@ -66,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):
         """
@@ -93,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):
         """
@@ -147,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",
@@ -170,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]
@@ -195,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.
@@ -226,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")
@@ -264,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")
@@ -300,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")
@@ -336,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")
@@ -372,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")
@@ -411,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")
@@ -448,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")
@@ -488,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")
@@ -524,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")
@@ -560,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")
@@ -596,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")
@@ -632,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")
@@ -668,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")
@@ -704,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")
@@ -740,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")
@@ -776,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")
@@ -812,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")
@@ -848,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 -rfdac759dbbec54375d4b3ebb21aebcc684ac1aed -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision fdac759dbbec54375d4b3ebb21aebcc684ac1aed)
+++ dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -8,7 +8,7 @@
 # @file ui_proxy.py
 #
 # @author (last) Peter Lucia
-# @date (last) 28-Aug-2020
+# @date (last) 10-Nov-2020
 # @author (original) Sean
 # @date (original) 15-Apr-2020
 #
@@ -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
@@ -60,23 +43,6 @@
     RESPONSE_REJECTED = 0
     RESPONSE_ACCEPTED = 1
 
-    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
     # start treatment command IDs
     START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW = 0
     START_TREATMENT_CMD_CANCEL_TREATMENT_WORKFLOW = 1
@@ -102,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):
         """
 
@@ -180,65 +108,37 @@
         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,
-                                                                  self._handler_uf_change_response)
+                                                                       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,
-                                                                  self._handler_treatment_duration_change_response)
+                                                                       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,
-                                                                  self._handler_blood_and_dialysate_change_response)
-            self.can_interface.register_receiving_publication_function(channel_id, self.MSG_ID_HD_TREATMENT_PARAMS_RANGES,
-                                                                  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._handler_hd_version)
-            self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, self.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE,
+                                                                       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, 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, MsgIds.MSG_ID_HD_VERSION.value,
+                                                                       self._handler_hd_version)
+            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 +165,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 +192,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
@@ -462,6 +374,193 @@
         """
         return self.target_dialysate_flow_rate
 
+    def get_treatment_parameters_valid(self):
+        """
+        Gets the T/F flag for whether treatment parameters
+        are considered valid by HD.
+
+        @return: True if treatment parameters are valid, False if not
+        """
+        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
+        treatment parameter.
+
+        @return: The reject reason code for the blood flow rate
+        """
+        return self.blood_flow_rate_reject_reason
+
+    def get_dialysate_flow_rate_reject_reason(self):
+        """
+        Gets the reject reason code for the dialysate flow rate
+        treatment parameter.
+
+        @return: The reject reason code for the dialysate flow rate
+        """
+        return self.dialysate_flow_rate_reject_reason
+
+    def get_treatment_duration_reject_reason(self):
+        """
+        Gets the reject reason code for the treatment duration
+        treatment parameter.
+
+        @return: The reject reason code for the treatment duration
+        """
+        return self.treatment_duration_reject_reason
+
+    def get_heparin_pre_stop_time_reject_reason(self):
+        """
+        Gets the reject reason code for the Heparin pre-stop
+        time treatment parameter.
+
+        @return: The reject reason code for the Heparin pre-stop time
+        """
+        return self.heparin_pre_stop_time_reject_reason
+
+    def get_saline_bolus_volume_reject_reason(self):
+        """
+        Gets the reject reason code for the saline bolus volume
+        treatment parameter.
+
+        @return: The reject reason code for the saline bolus volume
+        """
+        return self.saline_bolus_volume_reject_reason
+
+    def get_acid_concentrate_reject_reason(self):
+        """
+        Gets the reject reason code for the acid concentrate
+        treatment parameter.
+
+        @return: The reject reason code for the acid concentrate
+        """
+        return self.acid_concentrate_reject_reason
+
+    def get_bicarb_concentrate_reject_reason(self):
+        """
+        Gets the reject reason code for the bicarbonate
+        concentrate treatment parameter.
+
+        @return: The reject reason code for the bicarbonate concentrate
+        """
+        return self.bicarb_concentrate_reject_reason
+
+    def get_dialyzer_type_reject_reason(self):
+        """
+        Gets the reject reason code for the dialyzer type treatment
+        parameter.
+
+        @return: The reject reason code for the dialyzer type
+        """
+        return self.dialyzer_type_reject_reason
+
+    def get_blood_pressure_meas_interval_reject_reason(self):
+        """
+        Gets the reject reason code for the BP measurement interval
+        treatment parameter.
+
+        @return: The reject reason code for the BP measurement interval
+        """
+        return self.blood_pressure_meas_interval_reject_reason
+
+    def get_rinseback_flow_rate_reject_reason(self):
+        """
+        Gets the reject reason code for the rinseback flow rate
+        treatment parameter.
+
+        @return: The reject reason code for the rinseback flow rate
+        """
+        return self.rinseback_flow_rate_reject_reason
+
+    def get_arterial_pressure_low_alarm_limit_reject_reason(self):
+        """
+        Gets the reject reason code for the arterial pressure low alarm
+        limit treatment parameter.
+
+        @return: The reject reason code for the arterial pressure low alarm limit
+        """
+        return self.arterial_pressure_low_alarm_limit_reject_reason
+
+    def get_arterial_pressure_high_alarm_limit_reject_reason(self):
+        """
+        Gets the reject reason code for the arterial pressure high alarm
+        limit treatment parameter.
+
+        @return: The reject reason code for the arterial pressure high alarm limit
+        """
+        return self.arterial_pressure_high_alarm_limit_reject_reason
+
+    def get_venous_pressure_low_alarm_limit_reject_reason(self):
+        """
+        Gets the reject reason code for the venous pressure low alarm
+        limit treatment parameter.
+
+        @return: The reject reason code for the venous pressure low alarm limit
+        """
+        return self.venous_pressure_low_alarm_limit_reject_reason
+
+    def get_venous_pressure_high_alarm_limit_reject_reason(self):
+        """
+        Gets the reject reason code for the venous pressure high alarm
+        limit treatment parameter.
+
+        @return: The reject reason code for the venous pressure high alarm limit
+        """
+        return self.venous_pressure_high_alarm_limit_reject_reason
+
+    def get_heparin_dispense_rate_reject_reason(self):
+        """
+        Gets the reject reason code for the Heparin dispense rate
+        treatment parameter.
+
+        @return: The reject reason code for the Heparin dispense rate
+        """
+        return self.heparin_dispense_rate_reject_reason
+
+    def get_heparin_bolus_volume_reject_reason(self):
+        """
+        Gets the reject reason code for the Heparin bolus volume
+        treatment parameter.
+
+        @return: The reject reason code for the Heparin bolus volume
+        """
+        return self.heparin_bolus_volume_reject_reason
+
+    def get_dialysate_temperature_reject_reason(self):
+        """
+        Gets the reject reason code for the dialysate temperature
+        treatment parameter.
+
+        @return: The reject reason code for dialysate temperature
+        """
+        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"
@@ -505,6 +604,192 @@
             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",
+        "treatment_duration_reject_reason",
+        "heparin_pre_stop_time_reject_reason",
+        "saline_bolus_volume_reject_reason",
+        "acid_concentrate_reject_reason",
+        "bicarb_concentrate_reject_reason",
+        "dialyzer_type_reject_reason",
+        "blood_pressure_meas_interval_reject_reason",
+        "rinseback_flow_rate_reject_reason",
+        "arterial_pressure_low_alarm_limit_reject_reason",
+        "arterial_pressure_high_alarm_limit_reject_reason",
+        "venous_pressure_low_alarm_limit_reject_reason",
+        "venous_pressure_high_alarm_limit_reject_reason",
+        "heparin_dispense_rate_reject_reason",
+        "heparin_bolus_volume_reject_reason",
+        "dialysate_temperature_reject_reason"
+    ])
+    def _handler_treatment_param_settings_response(self, message):
+        """
+        Handler for response from HD regarding validation of treatment parameters.
+
+        @param message:  response message from HD regarding validity of provided treatment parameters.\n
+            U32  0=Treatment parameters are valid, 1=Treatment parameters are invalid. \n
+            U32  Reject reason code for blood flow rate (0=valid). \n
+            U32  Reject reason code for dialysate flow rate (0=valid). \n
+            U32  Reject reason code for treatment duration (0=valid). \n
+            U32  Reject reason code for Heparin pre-stop time (0=valid). \n
+            U32  Reject reason code for saline bolus volume (0=valid). \n
+            U32  Reject reason code for acid concentrate (0=valid). \n
+            U32  Reject reason code for bicarb concentrate (0=valid). \n
+            U32  Reject reason code for dialyzer type (0=valid). \n
+            U32  Reject reason code for BP measurement interval (0=valid). \n
+            U32  Reject reason code for rinseback flow rate (0=valid). \n
+            U32  Reject reason code for arterial pressure low alarm limit (0=valid). \n
+            U32  Reject reason code for arterial pressure high alarm limit (0=valid). \n
+            U32  Reject reason code for venous pressure low alarm limit (0=valid). \n
+            U32  Reject reason code for venous pressure high alarm limit (0=valid). \n
+            U32  Reject reason code for Heparin dispense rate (0=valid). \n
+            U32  Reject reason code for Heparin bolus volume (0=valid). \n
+            U32  Reject reason code for dialysate temperature (0=valid). \n
+
+        @return: none
+        """
+        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
+        else:
+            self.treatment_parameters_valid = False
+        self.blood_flow_rate_reject_reason = bld[0]
+        self.dialysate_flow_rate_reject_reason = dia[0]
+        self.treatment_duration_reject_reason = dur[0]
+        self.heparin_pre_stop_time_reject_reason = sto[0]
+        self.saline_bolus_volume_reject_reason = sal[0]
+        self.acid_concentrate_reject_reason = acd[0]
+        self.bicarb_concentrate_reject_reason = bic[0]
+        self.dialyzer_type_reject_reason = dlz[0]
+        self.blood_pressure_meas_interval_reject_reason = bpi[0]
+        self.rinseback_flow_rate_reject_reason = rbf[0]
+        self.arterial_pressure_low_alarm_limit_reject_reason = apl[0]
+        self.arterial_pressure_high_alarm_limit_reject_reason = aph[0]
+        self.venous_pressure_low_alarm_limit_reject_reason = vpl[0]
+        self.venous_pressure_high_alarm_limit_reject_reason = vph[0]
+        self.heparin_dispense_rate_reject_reason = hdr[0]
+        self.heparin_bolus_volume_reject_reason = hbv[0]
+        self.dialysate_temperature_reject_reason = tmp[0]
+
+    @_publish([
         "min_treatment_duration_min",
         "max_treatment_duration_min",
         "min_uf_volume_ml",
@@ -527,17 +812,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]
@@ -569,17 +854,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]
@@ -589,6 +874,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",
@@ -607,16 +923,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]
 
@@ -639,20 +956,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]
 
@@ -681,33 +999,32 @@
         @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
+        self.uf_change_volume_ml = vol[0] #/ self.LITER_TO_ML_CONVERSION_FACTOR
 
-        #self.uf_change_volume_ml = vol[0] In the staging branch commented out
-
         self.uf_change_time_min = tim[0]
         self.uf_change_time_diff = tmd[0]
         self.uf_change_rate_ml_min = rat[0]
@@ -734,22 +1051,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]
@@ -762,7 +1080,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")
 
@@ -777,7 +1095,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")
 
@@ -794,7 +1112,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:
@@ -817,11 +1135,11 @@
         """
 
         # reset response to this command so we can tell when response is received
-        self.UFChangeResponse = None
+        #self.UFChangeResponse = None
         # 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.")
@@ -841,14 +1159,14 @@
         """
 
         # reset response to this command so we can tell when response is received
-        self.UFChangeResponse = None
+        #self.UFChangeResponse = None
 
         # build command message
         volume = float_to_bytearray(vol * self.LITER_TO_ML_CONVERSION_FACTOR)
         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.")
@@ -857,33 +1175,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
@@ -895,7 +1186,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.")
@@ -906,6 +1197,7 @@
         return 0
 
     def cmd_ui_blood_and_dialysate_flow_settings_change_request(self, blood_flow, dial_flow):
+
         """
         Constructs and sends a ui blood & dialysate flow settings change request by user message
 
@@ -918,8 +1210,9 @@
         bld = integer_to_bytearray(blood_flow)
         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.")
@@ -929,6 +1222,7 @@
         return 0
 
     def cmd_ui_start_treatment_request(self, cmnd=START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW):
+
         """
         Constructs and sends a ui start treatment command message
         Constraints:
@@ -945,6 +1239,193 @@
         cmd = integer_to_bytearray(cmnd)
         payload = cmd
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_UI_START_TREATMENT.value,
+                                              payload=payload)
+
+        self.logger.debug("Sending start treatment command request.")
+
+        self.can_interface.send(message, 0)
+
+        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):
+        """
+        Constructs and sends a ui set treatment parameters message
+        Constraints:
+            HD must be in treatment parameters mode
+
+        @param bld_flow: (int) blood flow rate (in mL/min)
+        @param dia_flow: (int) dialysate flow rate (in mL/min)
+        @param duration: (int) treatment duration (in min)
+        @param hep_rate: (float) Heparin dispense rate (in mL/hr)
+        @param hep_bol: (float) Heparin bolus volume (in mL)
+        @param hep_stop: (int) Heparin pre-stop time (in min)
+        @param sal_bol: (int) Saline bolus volume (in mL)
+        @param acid: (int) acid concentrate type
+        @param bicarb: (int) bicarbonate concentrate type
+        @param dialyzer: (int) dialyzer type
+        @param dia_temp: (float) dialysate temperature (in deg C)
+        @param art_low: (int) arterial pressure low alarm limit (in mmHg)
+        @param art_high: (int) arterial pressure high alarm limit (in mmHg)
+        @param ven_low: (int) venous pressure low alarm limit (in mmHg)
+        @param ven_high: (int) venous pressure high alarm limit (in mmHg)
+        @param bp_intvl: (int) blood pressure measurement interval (in min)
+        @param rb_flow: (int) rinseback flow rate (in mL/min)
+
+        @return: none
+        """
+        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)
+        dur = integer_to_bytearray(duration)
+        hps = integer_to_bytearray(hep_stop)
+        sal = integer_to_bytearray(sal_bol)
+        acc = integer_to_bytearray(acid)
+        bic = integer_to_bytearray(bicarb)
+        dzr = integer_to_bytearray(dialyzer)
+        bpi = integer_to_bytearray(bp_intvl)
+        rbf = integer_to_bytearray(rb_flow)
+        apl = integer_to_bytearray(art_low)
+        aph = integer_to_bytearray(art_high)
+        vpl = integer_to_bytearray(ven_low)
+        vph = integer_to_bytearray(ven_high)
+        hdr = float_to_bytearray(hep_rate)
+        hbv = float_to_bytearray(hep_bol)
+        tmp = float_to_bytearray(dia_temp)
+
+        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=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value,
+                                              payload=payload)
+
+        self.logger.debug("Sending treatment parameters to HD.")
+
+        self.can_interface.send(message, 0)
+
+        return 0
+
+    def cmd_ui_confirm_treatment_parameters(self):
+        """
+        Constructs and sends a ui confirm treatment parameters message
+
+        @return: none
+        """
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              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
+
+    def cmd_ui_start_treatment_request(self, cmnd=START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW):
+        """
+        Constructs and sends a ui start treatment command message
+        Constraints:
+            Command must be one of the following:
+                START_TREATMENT_CMD_INITIATE_TREATMENT_WORKFLOW = 0
+                START_TREATMENT_CMD_CANCEL_TREATMENT_WORKFLOW = 1
+                START_TREATMENT_CMD_START_TREATMENT = 2
+
+        @param cmnd:  (int) start treatment command code
+
+        @return: none
+        """
+
+        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,
                                               payload=payload)
 
Index: dialin/squish/denaliMessages.py
===================================================================
diff -u -r27357f8b363431d4bbb9f15960b24c7036fdc76c -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- dialin/squish/denaliMessages.py	(.../denaliMessages.py)	(revision 27357f8b363431d4bbb9f15960b24c7036fdc76c)
+++ dialin/squish/denaliMessages.py	(.../denaliMessages.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -8,32 +8,41 @@
 #
 # @file denaliMessages.py
 #
-# @author (last) Peter Lucia
-# @date (last) 09-Jul-2020
+# @author (last) Behrouz NematiPour
+# @date (last) 30-Oct-2020
 # @author (original) Peter Lucia
 # @date (original) 09-Jul-2020
 #
 ############################################################################
-##
-# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
-# copyright
-#          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    denaliMessages.py
-# date    2020/04/08
-# author  Behrouz NematiPour
-#
 
+
 import time
 import subprocess
 
 from dialin.squish import utils
 from dialin.squish import messageBuilder
 
 
+class txStates:
+    # Saline 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 - no more saline bolus deliveries allowed
+    
+    # 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
+    
+    # Sub Mode
+    # UI only cares about the actual state and _NOT could be any other state
+    TREATMENT_DIALYSIS_STATE_NOT = 0
+    TREATMENT_DIALYSIS_STATE     = 1 
 
+
 class EResponse:
     Rejected = 0
     Accepted = 1
@@ -71,86 +80,150 @@
     AdjustDurationReq       =    22
     AdjustDurationRsp       =    27
 
-    AdjustUltrafiltrationStateReq   = 16 # Req and Rsp are the same in this specific message
-
+    AdjustUltrafiltrationStateReq   = 16 
+    AdjustUltrafiltrationStateRsp   = 65 
     AdjustUltrafiltrationEditReq    = 17
     AdjustUltrafiltrationEditRsp    = 19
-
     AdjustUltrafiltrationConfirmReq = 21
     AdjustUltrafiltrationConfirmRsp = 46
 
-    
     TreatmentRanges         =    26
 
     String                  = 65279
-
     Acknow                  = 65535
-
     AcknowGeneric           =     0 # Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder
 
 
 def send_acknowledge_HD():
+    """
+    the acknowledge from HD
+    :return: none
+    """
     subprocess.call(['cansend', 'can0', '020#A5.01.00.FF.FF.00.19.00'])
 
+
 def send_acknowledge_UI():
+    """
+    the acknowledge from UI
+    :return: none
+    """
     subprocess.call(['cansend', 'can0', '100#A5.01.00.FF.FF.00.19.00'])
 
+
 def send_CheckIn_DG():
+    """
+    check-in (keep alive) message from DG
+    :return: none
+    """
     subprocess.call(['cansend', 'can0', '010#A5.01.00.06.00.00.76.00'])
-    
+
+
 def show_PowerOffDialog():
+    """
+    the message from HD to UI to show the power off dialog
+    :return: none
+    """
     subprocess.call(['cansend', 'can0', '020#A5.01.00.01.00.01.00.38'])
 
+
 def hide_PowerOffDialog():
+    """
+    the message from HD to UI to hide the power off dialog
+    :return: none
+    """
     subprocess.call(['cansend', 'can0', '020#A5.01.00.01.00.01.01.09'])
 
+
 def show_PowerOffNotificationDialog():
+    """
+    the message from HD to UI to shew the shutting down notipication box
+    :return: none
+    """
     subprocess.call(['cansend', 'can0', '040#A5.01.00.0E.00.00.24.00'])
 
+
 def show_PowerOffRejectionDialog():
+    """
+    the message from HD to UI to show the power off dialog
+    :return: none
+    """
     subprocess.call(['cansend', 'can0', '020#A5.01.00.01.00.01.02.5A'])
 
-##################################################################################################
-# After each multi-frame message put a 100ms sleep, time.sleep(0.1)                              # 
-# it seems it's needed otherwise the test will check a value which has not been received yet.    #
-##################################################################################################
+
 def waitForMessageToBeSent():
+    """
+    After each multi-frame message put a 100ms sleep, time.sleep(0.1)                              #
+    it seems it's needed otherwise the test will check a value which has not been received yet.    #
+    :return: none
+    """
     time.sleep(0.050) # 50ms
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 def buildHDDebugText(vText):
+    """
+    the debug text message from HD builder method
+    :param vText: (str) the debug text
+    :return: none
+    """
     len = 40
     txt = messageBuilder.textToByte(vText, len) # + 1 null term
     msg = messageBuilder.buildMessage( GuiActionType.HDDebugText, 1 * (len + 1), False, txt)
     return messageBuilder.toFrames(msg)
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
 def setHDDebugText  (vText):
+    """
+    the debug text message from HD setter/sender method
+    :param vText: (str) the debug text
+    :return: none
+    """
     frames = buildHDDebugText(vText)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '020#{}'.format(frame)])
     waitForMessageToBeSent()
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 def buildDGDebugText(vText):
+    """
+    the debug text message from DG builder method
+    :param vText: (str) the debug text
+    :return: none
+    """
     len = 40
     txt = messageBuilder.textToByte(vText, len) # + 1 null term
     msg = messageBuilder.buildMessage( GuiActionType.DGDebugText, 1 * (len + 1), False, txt)
 
     return messageBuilder.toFrames(msg)
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
 def setDGDebugText  (vText):
+    """
+    the debug text message from DG setter/sender method
+    :param vText: (str) the debug text
+    :return: none
+    """
     frames = buildDGDebugText(vText)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '070#{}'.format(frame)])
     waitForMessageToBeSent()
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 def buildSetTreatmentParamRanges(vMinTreatmentDuration, vMaxTreatmentDuration, vMinUFVolume, vMaxUFVolume, vMinDialysateFlowRate, vMaxDialysateFlowRate):
+    """
+    the Treatment adjustment param ranges data message builder method
+     | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description                            | #1:(U32)                 | #2:(U32)                 | #3:(F32)                               | #4:(F32)                               | #5:(U32)                       | #6:(U32)                       |
+     |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:                           |:--:                      |:--:                      |:--:                                    |:--:                                    |:--:                            |:--:                            |
+     |0x1A00| 0x020  | 6   | 1/60 Hz| Y   | HD  | UI  | Treatment adjustment param ranges Data | \ref Data::mDuration_Min | \ref Data::mDuration_Max | \ref Data::mUltrafiltration_Volume_Min | \ref Data::mUltrafiltration_Volume_Max | \ref Data::mDialysate_Flow_Min | \ref Data::mDialysate_Flow_Max |
+    :param vMinTreatmentDuration: (int) Min Treatment Duration
+    :param vMaxTreatmentDuration: (int) Max Treatment Duration
+    :param vMinUFVolume: (float) Min UF Volume
+    :param vMaxUFVolume: (float) Max UF Volume
+    :param vMinDialysateFlowRate: (int) Min Dialysate Flow Rate
+    :param vMaxDialysateFlowRate: (int) Max Dialysate Flow Rate
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage(GuiActionType.TreatmentRanges, 4 * 6, True,
         utils.toI32(vMinTreatmentDuration),
         utils.toI32(vMaxTreatmentDuration),
@@ -163,6 +236,16 @@
 
 
 def setTreatmentParamRanges(vMinTreatmentDuration, vMaxTreatmentDuration, vMinUFVolume, vMaxUFVolume, vMinDialysateFlowRate, vMaxDialysateFlowRate):
+    """
+    the Treatment adjustment param ranges data message setter/sender method
+    :param vMinTreatmentDuration: (int) Min Treatment Duration
+    :param vMaxTreatmentDuration: (int) Max Treatment Duration
+    :param vMinUFVolume: (float) Min UF Volume
+    :param vMaxUFVolume: (float) Max UF Volume
+    :param vMinDialysateFlowRate: (int) Min Dialysate Flow Rate
+    :param vMaxDialysateFlowRate: (int) Max Dialysate Flow Rate
+    :return: none
+    """
     frames = buildSetTreatmentParamRanges(vMinTreatmentDuration, vMaxTreatmentDuration, vMinUFVolume, vMaxUFVolume, vMinDialysateFlowRate, vMaxDialysateFlowRate)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
@@ -171,6 +254,20 @@
 
 
 def buildSetTreatmentBloodFlowRate(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM):
+    """
+    the Blood Flow Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description     | #1:(S32)                 | #2:(F32)                 | #3:(F32)               | #4:(F32)               | #5:(F32)                  | #6:(F32)                    | #7:(F32)                 |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:    |:--:                      |:--:                      |:--:                    |:--:                    |:--:                       |:--:                         |:--:                      |
+    |0x0500| 0x040  | 7   | 1 Hz   | N   | HD  | All | Blood Flow Data | \ref Data::mFlowSetPoint | \ref Data::mMeasuredFlow | \ref Data::mRotorSpeed | \ref Data::mMotorSpeed | \ref Data::mMotorCtlSpeed | \ref Data::mMotorCtlCurrent | \ref Data::mPWMDutyCycle |
+    :param vFlowSetPt: (signed int) Flow Set Point
+    :param vMeasFlow: (float) Measured Flow
+    :param vRotSpd: (float) Rot Speed
+    :param vMotSpd: (float) Motor Speed
+    :param vMCSpd: (float) MC Speed
+    :param vMCCurr: (float) MC Current
+    :param vPWM: (float) PWM
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage(GuiActionType.BloodFlow, 4 * 7, False,
         utils.toI32(vFlowSetPt  ),
         utils.toF32(vMeasFlow   ),
@@ -184,6 +281,17 @@
 
 
 def setTreatmentBloodFlowRate(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM):
+    """
+    the Blood Flow Data message setter/sender method
+    :param vFlowSetPt: (signed int) Flow Set Point
+    :param vMeasFlow: (float) Measured Flow
+    :param vRotSpd: (float) Rot Speed
+    :param vMotSpd: (float) Motor Speed
+    :param vMCSpd: (float) MC Speed
+    :param vMCCurr: (float) MC Current
+    :param vPWM: (float) PWM
+    :return: none
+    """
     frames = buildSetTreatmentBloodFlowRate(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
@@ -192,6 +300,20 @@
     
 
 def buildSetTreatmentDialysateFlowRate(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM):
+    """
+    the Dialysate Flow Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description         | #1:(S32)      | #2:(F32)      | #3:(F32)    | #4:(F32)    | #5:(F32)       | #6:(F32)         | #7:(F32)      |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:        |:--:           |:--:           |:--:         |:--:         |:--:            |:--:              |:--:           |
+    |0x0800| 0x040  | 7   | 1 Hz   | N   | HD  | All | Dialysate Flow Data | mFlowSetPoint | mMeasuredFlow | mRotorSpeed | mMotorSpeed | mMotorCtlSpeed | mMotorCtlCurrent | mPWMDutyCycle |
+    :param vFlowSetPt: (signed int) Flow Set Point
+    :param vMeasFlow: (float) Measured Flow
+    :param vRotSpd: (float) Rot Speed
+    :param vMotSpd: (float) Motor Speed
+    :param vMCSpd: (float) MC Speed
+    :param vMCCurr: (float) MC Current
+    :param vPWM: (float) PWM
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage(GuiActionType.DialysateInletFlow, 4 * 7, False,
         utils.toI32(vFlowSetPt),
         utils.toF32(vMeasFlow),
@@ -205,6 +327,17 @@
 
 
 def setTreatmentDialysateFlowRate(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM):
+    """
+    the Dialysate Flow Data message setter/sender method
+    :param vFlowSetPt: (signed int) Flow Set Point
+    :param vMeasFlow: (float) Measured Flow
+    :param vRotSpd: (float) Rot Speed
+    :param vMotSpd: (float) Motor Speed
+    :param vMCSpd: (float) MC Speed
+    :param vMCCurr: (float) MC Current
+    :param vPWM: (float) PWM
+    :return: none
+    """
     frames = buildSetTreatmentDialysateFlowRate(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
@@ -213,6 +346,17 @@
 
     
 def buildTreatmentAdjustBloodDialysateResponse(vAccepted, vReason, vBloodRate, vDialysate):
+    """
+    the Blood/dialysate rate change Response message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description                          | #1:(U32)             | #2:(U32)           | #3:(U32)              | #4:(U32)                  |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:                         |:--:                  |:--:                |:--:                   |:--:                       |
+    |0x1800| 0x020  | 6   | Rsp    | Y   | HD  | UI  | Blood/dialysate rate change Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mBloodRate | \ref Data::mDialysateRate |
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vBloodRate: (int) Blood Flow Rate
+    :param vDialysate: (int) Dialysate Flow Rate
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage(GuiActionType.AdjustBloodDialysateRsp, 4 * 4, True,
         utils.toI32(vAccepted),
         utils.toI32(vReason),
@@ -223,6 +367,14 @@
 
 
 def sendTreatmentAdjustBloodDialysateResponse(vAccepted, vReason, vBloodRate, vDialysate):
+    """
+    the Blood/dialysate rate change Response message setter/sender method
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vBloodRate: (int) Blood Flow Rate
+    :param vDialysate: (int) Dialysate Flow Rate
+    :return: none
+    """
     frames = buildTreatmentAdjustBloodDialysateResponse(vAccepted, vReason, vBloodRate, vDialysate)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
@@ -231,6 +383,17 @@
 
 
 def buildTreatmentAdjustDurationResponse(vAccepted, vReason, vDuration, vUltrafiltration):
+    """
+    the Treatment Duration change Response message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description                        | #1:(U32)             | #2:(U32)           | #3:(U32)             | #5:(F32)             |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:                       |:--:                  |:--:                |:--:                  |:--:                  |
+    |0x1B00| 0x020  | 6   | Rsp    | Y   | HD  | UI  | Treatment Duration change Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mDuration | \ref Data::mUFVolume |
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vDuration: (int) Treatment Duration
+    :param vUltrafiltration: (float) Ultrafiltration Volume
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage(GuiActionType.AdjustDurationRsp, 4 * 4, True,
         utils.toI32(vAccepted),
         utils.toI32(vReason),
@@ -241,37 +404,93 @@
 
 
 def sendTreatmentAdjustDurationResponse(vAccepted, vReason, vDuration, vUltrafiltration):
+    """
+    the Treatment Duration change Response message setter/sender method
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vDuration: (int) Treatment Duration
+    :param vUltrafiltration: (float) Ultrafiltration Volume
+    :return: none
+    """
     frames = buildTreatmentAdjustDurationResponse(vAccepted, vReason, vDuration, vUltrafiltration)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '020#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-def buildTreatmentAdjustUltrafiltrationStateResponse(vState):
-    msg = messageBuilder.buildMessage(GuiActionType.AdjustUltrafiltrationStateReq, 1 * 4 , False,
+def buildTreatmentAdjustUltrafiltrationStateResponse(vAccepted, vReason, vState):
+    """
+    the Treatment ultrafiltration adjustment response message builder method
+    | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description              |
+    |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:------------------------:|
+    | 65  | 0x020  | 6     | Rsp  | Y   | HD  | UI   | UF Pause/Resume Response |
+    
+    | Payload  ||
+    |          ||
+    | #1:(U32) | \ref Data::mAccepted |
+    | #2:(U32) | \ref Data::mReason   |
+    | #3:(U32) | \ref Data::mState    |
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vState: (int) Ultrafiltration State
+    :return: (str) built message frame(s)
+    """
+    msg = messageBuilder.buildMessage(GuiActionType.AdjustUltrafiltrationStateRsp, 3 * 4 , False,
+        utils.toI32(vAccepted),
+        utils.toI32(vReason),
         utils.toI32(vState)
     )
     return messageBuilder.toFrames(msg)
 
 
-def setTreatmentAdjustUltrafiltrationStateResponse(vState):
-    frames = buildTreatmentAdjustUltrafiltrationStateResponse(vState)
+def setTreatmentAdjustUltrafiltrationStateResponse(vAccepted, vReason, vState):
+    """
+    the Treatment ultrafiltration adjustment response message setter/sender method
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vState: (int) Ultrafiltration State
+    :return: none
+    """
+    frames = buildTreatmentAdjustUltrafiltrationStateResponse(vAccepted, vReason, vState)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '020#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-def setTreatmentAdjustUltrafiltrationAccepted():
-    setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Accepted )
+def setTreatmentAdjustUltrafiltrationAccepted(vState):
+    """
+    a convenient method for setTreatmentAdjustUltrafiltrationStateResponse which sends accept true
+    :return: none
+    """
+    setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Accepted, 0, vState )
 
 
-def setTreatmentAdjustUltrafiltrationRejected():
-    setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Rejected )
+def setTreatmentAdjustUltrafiltrationRejected(vReason, vState):
+    """
+    a convenient method for setTreatmentAdjustUltrafiltrationStateResponse which sends accept false
+    :return: none
+    """
+    setTreatmentAdjustUltrafiltrationStateResponse( EResponse.Rejected, vReason, vState )
 
 
 def buildTreatmentAdjustUltrafiltrationEditResponse(vAccepted, vReason, vVolume, vDuration, vDurationDiff, vRate, vRateDiff, vRateOld):
+    """
+    the ultrafiltration volume change response message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description             | #1:(U32)             | #2:(U32)           | #1:(U32)             | #2:(U32)           | #3:(F32)           | #4:(U32)             | #5:(F32)         | #6:(U32)                 | #7:(U32)             | #8:(F32)            |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:            |:--:                  |:--:                |:--:                  |:--:                |:--:                |:--:                  |:--:              |:--:                      |:--:                  |:--:                 |
+    |0x1300| 0x020  | 6   | Rsp    | Y   | HD  | UI  | UF Vol. Change Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mVolume | \ref Data::mDuration | \ref Data::mRate | \ref Data::mDurationDiff | \ref Data::mRateDiff | \ref Data::mRateOld |
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vVolume: (float) Ultrafiltration Volume
+    :param vDuration: (int) Treatment Duration
+    :param vDurationDiff: (int) Duration Difference
+    :param vRate: (float) Ultrafiltration Rate
+    :param vRateDiff: (float) Ultrafiltration Rate Difference
+    :param vRateOld: (float) Ultrafiltration Rate Old
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage(GuiActionType.AdjustUltrafiltrationEditRsp, 8 * 4 , True,
         utils.toI32(vAccepted),
         utils.toI32(vReason),
@@ -286,6 +505,18 @@
 
 
 def setTreatmentAdjustUltrafiltrationEditResponse(vAccepted, vReason, vVolume, vDuration, vDurationDiff, vRate, vRateDiff, vRateOld):
+    """
+    the ultrafiltration volume change response message setter/sender method
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vVolume: (float) Ultrafiltration Volume
+    :param vDuration: (int) Treatment Duration
+    :param vDurationDiff: (int) Duration Difference
+    :param vRate: (float) Ultrafiltration Rate
+    :param vRateDiff: (float) Ultrafiltration Rate Difference
+    :param vRateOld: (float) Ultrafiltration Rate Old
+    :return: none
+    """
     frames = buildTreatmentAdjustUltrafiltrationEditResponse(vAccepted, vReason, vVolume, vDuration, vDurationDiff, vRate, vRateDiff, vRateOld)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
@@ -294,6 +525,12 @@
 
 
 def setTreatmentAdjustUltrafiltrationEditRejected(vReason):
+    """
+    a convenient method for setTreatmentAdjustUltrafiltrationEditResponse which only sends a rejection reason
+    and sends other values all as zero
+    :param vReason: (int) rejection reason
+    :return: none
+    """
     frames = buildTreatmentAdjustUltrafiltrationEditResponse(0, vReason, 0, 0, 0, 0, 0, 0)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
@@ -302,6 +539,18 @@
 
 
 def buildTreatmentAdjustUltrafiltrationConfirmResponse(vAccepted, vReason, vVolume, vDuration, vRate):
+    """
+    the ultrafiltratin volume Change Confirmation Response message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description                          | #1:(U32)             | #2:(U32)           | #3:(F32)           | #4:(U32)             | #5:(F32)         |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:                         |:--:                  |:--:                |:--:                |:--:                  |:--:              |
+    |0x2E00| 0x020  | 6   | Rsp    | Y   | HD  | UI  | UF Vol. Change Confirmation Response | \ref Data::mAccepted | \ref Data::mReason | \ref Data::mVolume | \ref Data::mDuration | \ref Data::mRate |
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vVolume: (float) Ultrafiltration Volume
+    :param vDuration: (int) Treatment Duration
+    :param vRate: (float) Ultrafiltration Rate
+    :return:  built message frame(s)
+    """
     msg = messageBuilder.buildMessage(GuiActionType.AdjustUltrafiltrationConfirmRsp, 5 * 4 , True,
         utils.toI32(vAccepted),
         utils.toI32(vReason),
@@ -313,6 +562,15 @@
 
 
 def setTreatmentAdjustUltrafiltrationConfirmResponse         (vAccepted, vReason, vVolume, vDuration, vRate):
+    """
+    the ultrafiltration volume Change Confirmation Response message setter/sender method
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vVolume: (float) Ultrafiltration Volume
+    :param vDuration: (int) Treatment Duration
+    :param vRate: (float) Ultrafiltration Rate
+    :return: none
+    """
     frames = buildTreatmentAdjustUltrafiltrationConfirmResponse(vAccepted, vReason, vVolume, vDuration, vRate)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
@@ -321,6 +579,12 @@
 
 
 def setTreatmentAdjustUltrafiltrationConfirmRejected         (   vReason         ):
+    """
+    a convenient method for setTreatmentAdjustUltrafiltrationConfirmResponse which only sends a rejection reason
+    and sends other values all as zero
+    :param vReason: (int) rejection reason
+    :return: none
+    """
     frames = buildTreatmentAdjustUltrafiltrationConfirmResponse(0, vReason, 0, 0, 0)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
@@ -329,6 +593,16 @@
 
 
 def buildTreatmentTime(vSecsTotal, vSecsElap, vSecsRem):
+    """
+    the Treatment Time Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description         | #1:(U32)            | #2:(U32)            | #3:(U32)              |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:        |:--:                 |:--:                 |:--:                   |
+    |0x0D00| 0x040  | 7   | 1 Hz   | N   | HD  | All | Treatment Time Data | \ref Data::mTotal   | \ref Data::mElapsed | \ref Data::mRemaining |
+    :param vSecsTotal: (int) Treatment Total Duration in Seconds
+    :param vSecsElap: (int) Treatment Total Elapsed Time in Seconds
+    :param vSecsRem: (int) Treatment Remaining Time in Seconds
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage(GuiActionType.TreatmentTime, 3 * 4, False,
         utils.toI32(vSecsTotal),
         utils.toI32(vSecsElap),
@@ -338,7 +612,14 @@
 
 
 def setTreatmentTime(vSecsTotal, vSecsElap, vSecsRem = None):
-    if vSecsRem == None:
+    """
+    the Treatment Time Data message setter/sender method
+    :param vSecsTotal: (int) Treatment Total Duration in Seconds
+    :param vSecsElap: (int) Treatment Total Elapsed Time in Seconds
+    :param vSecsRem: (int) Treatment Remaining Time in Seconds
+    :return: none
+    """
+    if vSecsRem is None:
         vSecsRem = vSecsTotal - vSecsElap
     frames = buildTreatmentTime(vSecsTotal, vSecsElap, vSecsRem)
     frames = messageBuilder.toCandumpFormat(frames)
@@ -348,6 +629,20 @@
 
     
 def buildSetTreatmentUltrafiltration(vRefUFVol, vMeasUFVol, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM):
+    """
+    the Outlet Flow Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description      | #1:(F32)             | #2:(F32)              | #3:(F32)               | #4:(F32)               | #5:(F32)                  | #6:(F32)                    | #7:(F32)               |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:     |:--:                  |:--:                   |:--:                    |:--:                    |:--:                       |:--:                         |:--:                    |
+    |0x0B00| 0x040  | 7   | 1 Hz   | N   | HD  | All | Outlet Flow Data | \ref Data::mRefUFVol | \ref Data::mMeasUFVol | \ref Data::mRotorSpeed | \ref Data::mMotorSpeed | \ref Data::mMotorCtlSpeed | \ref Data::mMotorCtlCurrent | \ref Data::mPWMDtCycle |
+    :param vRefUFVol: (float) Ref UF Volume
+    :param vMeasUFVol: (float) Measured UF Volume
+    :param vRotSpd: (float) Rot Speed
+    :param vMotSpd: (float) Motor Speed
+    :param vMCSpd: (float) MC Speed
+    :param vMCCurr: (float) MC Current
+    :param vPWM: (float) PWM
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage(GuiActionType.DialysateOutletFlow, 4 * 7, False,
         utils.toF32(vRefUFVol),
         utils.toF32(vMeasUFVol),
@@ -361,59 +656,108 @@
 
 
 def setTreatmentUltrafiltration(vRefUFVol, vMeasUFVol, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM):
+    """
+    the Outlet Flow Data message setter/sender method
+    :param vRefUFVol: (float) Ref UF Volume
+    :param vMeasUFVol: (float) Measured UF Volume
+    :param vRotSpd: (float) Rot Speed
+    :param vMotSpd: (float) Motor Speed
+    :param vMCSpd: (float) MC Speed
+    :param vMCCurr: (float) MC Current
+    :param vPWM: (float) PWM
+    :return: none
+    """
     frames = buildSetTreatmentUltrafiltration(vRefUFVol, vMeasUFVol, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM    )
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '040#{}'.format(frame)])
     waitForMessageToBeSent()
 
     
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x0009,040,N,HD,All,PressureOcclusionData,(F32)^ArterialPressure,(F32)^VenousPressure,(F32)^BloodPumpOcclusion,(F32)^DialysateInletPumpOcclusion,(F32)^DialysateOutletPumpOcclusion 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildPressureOcclusionData(vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion):
+    """
+    the Pressure/Occlusion Data messages builder mehtod
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description            | #1:(F32)                     | #2:(F32)                   | #3:(U32)                       | #4:(U32)                                | #5:(U32)                                 |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:           |:--:                          |:--:                        |:--:                            |:--:                                     |:--:                                      |
+    |0x0900| 0x040  | 7   | 1 Hz   | N   | HD  | All | PressureOcclusion Data | \ref Data::mArterialPressure | \ref Data::mVenousPressure | \ref Data::mBloodPumpOcclusion | \ref Data::mDialysateInletPumpOcclusion | \ref Data::mDialysateOutletPumpOcclusion |
+    :param vArterialPressure: (float) Arterial Pressure
+    :param vVenousPressure: (float) Venous Pressure
+    :param vBloodPumpOcclusion: (uint) Blood Pump Occlusion
+    :param vDialysateInletPumpOcclusion: (uint) Dialysate Inlet Pump Occlusion
+    :param vDialysateOutletPumpOcclusion: (uint) Dialysate Outlet Pump Occlusion
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x0009, 4+4+4+4+4, False,
         utils.toF32(vArterialPressure            ),
         utils.toF32(vVenousPressure              ),
-        utils.toF32(vBloodPumpOcclusion          ),
-        utils.toF32(vDialysateInletPumpOcclusion ),
-        utils.toF32(vDialysateOutletPumpOcclusion))
+        utils.toI32(vBloodPumpOcclusion          ),
+        utils.toI32(vDialysateInletPumpOcclusion ),
+        utils.toI32(vDialysateOutletPumpOcclusion))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-def setPressureOcclusionData           (vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion):
+def setPressureOcclusionData(vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion):
+    """
+    the Pressure/Occlusion Data messages setter/sender mehtod
+    :param vArterialPressure: (float) Arterial Pressure
+    :param vVenousPressure: (float) Venous Pressure
+    :param vBloodPumpOcclusion: (uint) Blood Pump Occlusion
+    :param vDialysateInletPumpOcclusion: (uint) Dialysate Inlet Pump Occlusion
+    :param vDialysateOutletPumpOcclusion: (uint) Dialysate Outlet Pump Occlusion
+    :return: none
+    """
     frames = buildPressureOcclusionData(vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '040#{}'.format(frame)])
     waitForMessageToBeSent()
 
     
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x001F,080,N,DG,All,DGROPumpData,(U32)^SetPtPressure,(F32)^FlowRate,(F32)^PWM 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildDGROPumpData(vSetPtPressure, vFlowRate, vPWM):
+    """
+    the DG RO Pump Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description     | #1:(U32)             | #2:(F32)             | #3:(F32)        |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:    |:--:                  |:--:                  |:--:             |
+    |0x1F00| 0x080  | 8   | 1 Hz   | N   | DG  | All | DG RO Pump Data | \ref Data::mPressure | \ref Data::mFlowRate | \ref Data::mPWM |    :param vSetPtPressure:
+    :param vSetPtPressure: (int) set Point Pressure
+    :param vFlowRate: (float) Flow Rate
+    :param vPWM: (float) PWM
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x001F, 4+4+4, False,
         utils.toI32(vSetPtPressure),
         utils.toF32(vFlowRate     ),
         utils.toF32(vPWM          ))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setDGROPumpData(vSetPtPressure, vFlowRate, vPWM):
+    """
+    the DG RO Pump Data message setter/sender method
+    :param vSetPtPressure: (int) set Point Pressure
+    :param vFlowRate: (float) Flow Rate
+    :param vPWM: (float) PWM
+    :return: none
+    """
     frames = buildDGROPumpData(vSetPtPressure, vFlowRate, vPWM)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '080#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x0020,080,N,DG,All,DGPressuresData,(F32)^ROInletPSI,(F32)^ROOutletPSI,(F32)^DrainInletPSI,(F32)^DrainOutletPSI 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildDGPressuresData(vROInletPSI, vROOutletPSI, vDrainInletPSI, vDrainOutletPSI):
+    """
+    the DG Pressures Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description       | #1:(F32)               | #2:(F32)                | #3:(F32)                  | #4:(F32)                   |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:      |:--:                    |:--:                     |:--:                       |:--:                        |
+    |0x2000| 0x080  | 8   | 1 Hz   | N   | DG  | All | DG Pressures Data | \ref Data::mROInletPSI | \ref Data::mROOutletPSI | \ref Data::mDrainInletPSI | \ref Data::mDrainOutletPSI |
+    :param vROInletPSI: (float) RO Inlet PSI
+    :param vROOutletPSI: (float) RO Outlet PSI
+    :param vDrainInletPSI: (float) Drain Inlet PSI
+    :param vDrainOutletPSI: (float) Drain Outlet PSI
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x0020, 4+4+4+4, False,
         utils.toF32(vROInletPSI    ),
         utils.toF32(vROOutletPSI   ),
@@ -422,114 +766,184 @@
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setDGPressuresData(vROInletPSI, vROOutletPSI, vDrainInletPSI, vDrainOutletPSI):
+    """
+    the DG Pressures Data message setter/sender method
+    :param vROInletPSI: (float) RO Inlet PSI
+    :param vROOutletPSI: (float) RO Outlet PSI
+    :param vDrainInletPSI: (float) Drain Inlet PSI
+    :param vDrainOutletPSI: (float) Drain Outlet PSI
+    :return: none
+    """
     frames = buildDGPressuresData(vROInletPSI, vROOutletPSI, vDrainInletPSI, vDrainOutletPSI)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '080#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x0024,080,N,DG,All,DGDrainPumpData,(U32)^SetPtRPM,(U32)^DACValue 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildDGDrainPumpData(vSetPtRPM, vDACValue):
+    """
+    the DG Drain Pump Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description        | #1:(U32)        | #2:(U32)        |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:       |:--:             |:--:             |
+    |0x2400| 0x080  | 8   | 1 Hz   | N   | DG  | All | DG Drain Pump Data | \ref Data::mRPM | \ref Data::mDAC |
+    :param vSetPtRPM: (int) Set Point RPM
+    :param vDACValue: (int) DAC Value
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x0024, 4+4, False,
         utils.toI32(vSetPtRPM),
         utils.toI32(vDACValue))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setDGDrainPumpData(vSetPtRPM, vDACValue):
+    """
+    the DG Drain Pump Data message setter/sender method
+    :param vSetPtRPM: (int) Set Point RPM
+    :param vDACValue: (int) DAC Value
+    :return: none
+    """
     frames = buildDGDrainPumpData(vSetPtRPM, vDACValue)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '080#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x0027,080,N,DG,All,DGOperationMode,(U32)^DGOpMode 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildDGOperationMode(vDGOpMode):
+    """
+    the DG Operation Mode Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description            | #1:(U32)           |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:           |:--:                |
+    |0x2700| 0x080  | 8   | 1 Hz   | N   | DG  | All | DG Operation Mode Data | \ref Data::mOpMode |
+    :param vDGOpMode: (int) DG Operation Mode
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x0027, 4, False,
         utils.toI32(vDGOpMode))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setDGOperationMode(vDGOpMode):
+    """
+    the DG Operation Mode Data message setter/sender method
+    :param vDGOpMode: (int) DG Operation Mode
+    :return: none
+    """
     frames = buildDGOperationMode(vDGOpMode)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '080#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x0028,080,N,DG,All,DGReservoirData,(U32)^ActiveReservoir,(U32)^FillToVolML,(U32)^DrainToVolML 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildDGReservoirData(vActiveReservoir, vFillToVolML, vDrainToVolML):
+    """
+    the DG Reservoir Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description       | #1:(U32)                    | #2:(U32)              | #3:(U32)               |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:      |:--:                         |:--:                   |:--:                    |
+    |0x2800| 0x080  | 8   | 1 Hz   | N   | DG  | All | DG Reservoir Data | \ref Data::mActiveReservoir | \ref Data::mFillToVol | \ref Data::mDrainToVol |
+    :param vActiveReservoir: (int) Active Reservoir
+    :param vFillToVolML: (int) Fill To Volume ML
+    :param vDrainToVolML: (int) Drain To Vol ML
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x0028, 4+4+4, False,
         utils.toI32(vActiveReservoir),
         utils.toI32(vFillToVolML    ),
         utils.toI32(vDrainToVolML   ))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setDGReservoirData(vActiveReservoir, vFillToVolML, vDrainToVolML):
+    """
+    the DG Reservoir Data message setter/sender method
+    :param vActiveReservoir: (int) Active Reservoir
+    :param vFillToVolML: (int) Fill To Volume ML
+    :param vDrainToVolML: (int) Drain To Vol ML
+    :return: none
+    """
     frames = buildDGReservoirData(vActiveReservoir, vFillToVolML, vDrainToVolML)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '080#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x002A,080,N,DG,All,DGValvesStates,(U16)^ValvesStates 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildDGValvesStates(vValvesStates):
+    """
+    the DG Valves States Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description           | #1:(U16)            |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:          |:--:                 |
+    |0x2A00| 0x080  | 8   | 2 Hz   | N   | DG  | All | DG Valves States Data | \ref Data::mStates  |
+    :param vValvesStates: (int)Valves states
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x002A, 2, False,
         utils.toI16(vValvesStates))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setDGValvesStates(vValvesStates):
+    """
+    the DG Valves States Data message setter/sender method
+    :param vValvesStates: (int)Valves states
+    :return: none
+    """
     frames = buildDGValvesStates(vValvesStates)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '080#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x002C,080,N,DG,All,DGHeatersData,(U32)^MainPriMaryDC,(U32)^SmallPrimaryDC,(U32)^TrimmerDC 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildDGHeatersData(vMainPriMaryDC, vSmallPrimaryDC, vTrimmerDC):
+    """
+    the DG Heaters Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description     | #1:(U32)                  | #2:(U32)                   | #3:(U32)              |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:    |:--:                       |:--:                        |:--:                   |
+    |0x2C00| 0x080  | 8   | 2 Hz   | N   | DG  | All | DG Heaters Data | \ref Data::mMainPrimaryDC | \ref Data::mSmallPrimaryDC | \ref Data::mTrimmerDC |
+    :param vMainPriMaryDC: (int) Main PriMary DC
+    :param vSmallPrimaryDC: (int) Small Primary DC
+    :param vTrimmerDC: (int) Trimmer DC
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x002C, 4+4+4, False,
         utils.toI32(vMainPriMaryDC ),
         utils.toI32(vSmallPrimaryDC),
         utils.toI32(vTrimmerDC     ))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setDGHeatersData(vMainPriMaryDC, vSmallPrimaryDC, vTrimmerDC):
+    """
+    the DG Heaters Data message setter/sender method
+    :param vMainPriMaryDC: (int) Main PriMary DC
+    :param vSmallPrimaryDC: (int) Small Primary DC
+    :param vTrimmerDC: (int) Trimmer DC
+    :return: none
+    """
     frames = buildDGHeatersData(vMainPriMaryDC, vSmallPrimaryDC, vTrimmerDC)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '080#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x000C,080,N,DG,All,DGLoadCellReadingsData,(F32)^Rs1Prim,(F32)^Rs1Bkup,(F32)^Rs2Prim,(F32)^Rs2Bkup 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildDGLoadCellReadingsData(vRs1Prim, vRs1Bkup, vRs2Prim, vRs2Bkup):
+    """
+    the DG Load Cell Readings Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description                | #1:(F32)                   | #2:(F32)                   | #3:(F32)                   | #4:(F32)                   |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:               |:--:                        |:--:                        |:--:                        |:--:                        |
+    |0x0C00| 0x080  | 8   | 10 Hz  | N   | DG  | All | DG Load Cell Readings Data | \ref Data::mReservoir1Prim | \ref Data::mReservoir1Bkup | \ref Data::mReservoir2Prim | \ref Data::mReservoir2Bkup |
+    :param vRs1Prim: (float) Reservoir 1 Primary
+    :param vRs1Bkup: (float) Reservoir 1 Backup
+    :param vRs2Prim: (float) Reservoir 2 Primary
+    :param vRs2Bkup: (float) Reservoir 2 Backup
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x000C, 4+4+4+4, False,
         utils.toF32(vRs1Prim),
         utils.toF32(vRs1Bkup),
@@ -538,19 +952,50 @@
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setDGLoadCellReadingsData(vRs1Prim, vRs1Bkup, vRs2Prim, vRs2Bkup):
+    """
+    the DG Load Cell Readings Data message setter/sender method
+    :param vRs1Prim: (float) Reservoir 1 Primary
+    :param vRs1Bkup: (float) Reservoir 1 Backup
+    :param vRs2Prim: (float) Reservoir 2 Primary
+    :param vRs2Bkup: (float) Reservoir 2 Backup
+    :return: none
+    """
     frames = buildDGLoadCellReadingsData(vRs1Prim, vRs1Bkup, vRs2Prim, vRs2Bkup)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '080#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x002D,080,N,DG,All,DGTemperaturesData,(F32)^InletPrimaryHeater,(F32)^OutletPrimaryHeater,(F32)^ConductivitySensor1,(F32)^ConductivitySensor2,(F32)^OutletRedundancy,(F32)^InletDialysate,(F32)^PrimaryHeaterThermocouple,(F32)^TrimmerHeaterThermocouple,(F32)^PrimaryHeaterColdJunction,(F32)^TrimmerHeaterColdJunction,(F32)^PrimaryHeaterInternalTemperature,(F32)^TrimmerHeaterInternalTemperature 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildDGTemperaturesData(vInletPrimaryHeater, vOutletPrimaryHeater, vConductivitySensor1, vConductivitySensor2, vOutletRedundancy, vInletDialysate, vPrimaryHeaterThermocouple, vTrimmerHeaterThermocouple, vPrimaryHeaterColdJunction, vTrimmerHeaterColdJunction, vPrimaryHeaterInternalTemperature, vTrimmerHeaterInternalTemperature):
+    """
+    the DG Temperatures Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description          | #1:(F32)                       | #2:(F32)                        | #3:(F32)                        |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:         |:--:                            |:--:                             |:--:                             |
+    |0x2D00| 0x080  | 8   | 2 Hz   | N   | DG  | All | DG Temperatures Data | \ref Data::mInletPrimaryHeater | \ref Data::mOutletPrimaryHeater | \ref Data::mConductivitySensor1 |
+
+    | #4:(F32)                        | #5:(F32)                     | #6:(F32)                   | #7:(F32)                              | #8:(F32)                              |
+    |:--:                             |:--:                          |:--:                        |:--:                                   |:--:                                   |
+    | \ref Data::mConductivitySensor2 | \ref Data::mOutletRedundancy | \ref Data::mInletDialysate | \ref Data::mPrimaryHeaterThermoCouple | \ref Data::mTrimmerHeaterThermoCouple |
+
+    |  #9:(F32)                              | #10:(F32)                             | #11:(F32)                         | #12:(F32)                         |
+    | :--:                                   |:--:                                   |:--:                               |:--:                               |
+    |  \ref Data::mPrimaryHeaterColdJunction | \ref Data::mTrimmerHeaterColdJunction | \ref Data::mPrimaryHeaterInternal | \ref Data::mTrimmerHeaterInternal |
+    :param vInletPrimaryHeater: (float) Inlet Primary Heater
+    :param vOutletPrimaryHeater: (float) Outlet Primary Heater
+    :param vConductivitySensor1: (float) Conductivity Sensor 1
+    :param vConductivitySensor2: (float) Conductivity Sensor 2
+    :param vOutletRedundancy: (float) Outlet Redundancy
+    :param vInletDialysate: (float) Inlet Dialysate
+    :param vPrimaryHeaterThermocouple: (float) Primary Heater Thermocouple
+    :param vTrimmerHeaterThermocouple: (float) Trimmer Heater Thermocouple
+    :param vPrimaryHeaterColdJunction: (float) Primary Heater ColdJunction
+    :param vTrimmerHeaterColdJunction: (float) Trimmer Heater ColdJunction
+    :param vPrimaryHeaterInternalTemperature: (float) Primary Heater Internal Temperature
+    :param vTrimmerHeaterInternalTemperature: (float) Trimmer HeaterInternal Temperature
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x002D, 4+4+4+4+4+4+4+4+4+4+4+4, False,
         utils.toF32(vInletPrimaryHeater              ),
         utils.toF32(vOutletPrimaryHeater             ),
@@ -567,101 +1012,184 @@
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setDGTemperaturesData(vInletPrimaryHeater, vOutletPrimaryHeater, vConductivitySensor1, vConductivitySensor2, vOutletRedundancy, vInletDialysate, vPrimaryHeaterThermocouple, vTrimmerHeaterThermocouple, vPrimaryHeaterColdJunction, vTrimmerHeaterColdJunction, vPrimaryHeaterInternalTemperature, vTrimmerHeaterInternalTemperature):
+    """
+    the DG Temperatures Data message setter/sender method
+    :param vInletPrimaryHeater: (float) Inlet Primary Heater
+    :param vOutletPrimaryHeater: (float) Outlet Primary Heater
+    :param vConductivitySensor1: (float) Conductivity Sensor 1
+    :param vConductivitySensor2: (float) Conductivity Sensor 2
+    :param vOutletRedundancy: (float) Outlet Redundancy
+    :param vInletDialysate: (float) Inlet Dialysate
+    :param vPrimaryHeaterThermocouple: (float) Primary Heater Thermocouple
+    :param vTrimmerHeaterThermocouple: (float) Trimmer Heater Thermocouple
+    :param vPrimaryHeaterColdJunction: (float) Primary Heater ColdJunction
+    :param vTrimmerHeaterColdJunction: (float) Trimmer Heater ColdJunction
+    :param vPrimaryHeaterInternalTemperature: (float) Primary Heater Internal Temperature
+    :param vTrimmerHeaterInternalTemperature: (float) Trimmer HeaterInternal Temperature
+    :return: none
+    """
     frames = buildDGTemperaturesData(vInletPrimaryHeater, vOutletPrimaryHeater, vConductivitySensor1, vConductivitySensor2, vOutletRedundancy, vInletDialysate, vPrimaryHeaterThermocouple, vTrimmerHeaterThermocouple, vPrimaryHeaterColdJunction, vTrimmerHeaterColdJunction, vPrimaryHeaterInternalTemperature, vTrimmerHeaterInternalTemperature)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '080#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x000F,040,N,HD,All,TreatmentStatesData,(U32)^SubMode,(U32)^UFState,(U32)^SalineState 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildTreatmentStatesData(vSubMode, vUFState, vSalineState):
+    """
+    the Treatment States Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description           | #1:(U32)            | #2:(U32)            | #3:(U32)                |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:          |:--:                 |:--:                 |:--:                     |
+    |0x0F00| 0x040  | 7   | 1 Hz   | N   | HD  | All | Treatment States Data | \ref Data::mSubMode | \ref Data::mUFState | \ref Data::mSalineState |
+    :param vSubMode: (int) Sub-Mode
+    :param vUFState: (int) UF State
+    :param vSalineState: (int) Saline Bolus State
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x000F, 4+4+4, False,
         utils.toI32(vSubMode    ),
         utils.toI32(vUFState    ),
         utils.toI32(vSalineState))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setTreatmentStatesData(vSubMode, vUFState, vSalineState):
+    """
+    the Treatment States Data message setter/sender method
+    :param vSubMode: (int) Sub-Mode
+    :param vUFState: (int) UF State
+    :param vSalineState: (int) Saline Bolus State
+    :return: none
+    """
     frames = buildTreatmentStatesData(vSubMode, vUFState, vSalineState)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '040#{}'.format(frame)])
     waitForMessageToBeSent()
 
+def setTreatmentStartState():
+    """
+    starting the treatment for user convenience since Tx is not by default running
+    :return: none
+    """
+    setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE, txStates.UF_OFF_STATE, txStates.SALINE_BOLUS_STATE_IDLE)
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x0025,040,N,HD,All,HDOperationModeData,(U32)^OpMode 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
+
 def buildHDOperationModeData(vOpMode):
+    """
+    the HD Operation Mode Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description            | #1:(U32)            |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:           |:--:                 |
+    |0x2500| 0x040  | 7   | 1 Hz   | N   | HD  | All | HD Operation Mode Data | \ref Data::mOpMode  |
+    :param vOpMode: (int) Operation Mode
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x0025, 4, False,
         utils.toI32(vOpMode))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setHDOperationModeData(vOpMode):
+    """
+    the HD Operation Mode Data message setter/sender method
+    :param vOpMode: (int) Operation Mode
+    :return: none
+    """
     frames = buildHDOperationModeData(vOpMode)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '040#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x002F,040,N,HD,All,TreatmentSalineBolusData,(U32)^Target,(F32)^Cumulitive,(F32)^Delivered 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-def buildTreatmentSalineBolusData(vTarget, vCumulitive, vDelivered):
+def buildTreatmentSalineBolusData(vTarget, vCumulative, vDelivered):
+    """
+    the Treatment Saline Bolus Data message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description                 | #1:(U32)            | #2:(F32)               | #3:(F32)              |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:                |:--:                 |:--:                    |:--:                   |
+    |0x2F00| 0x040  | 7   | 1 Hz   | N   | HD  | All | Treatment Saline Bolus Data | \ref Data::mTarget  | \ref Data::mCumulative | \ref Data::mDelivered |
+    :param vTarget: (int) Saline Bolus Target Volume
+    :param vCumulative: (float) Saline Bolus Cumulative Volume
+    :param vDelivered: (float) Saline Bolus Delivered Volume
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x002F, 4+4+4, False,
         utils.toI32(vTarget    ),
-        utils.toF32(vCumulitive),
+        utils.toF32(vCumulative),
         utils.toF32(vDelivered ))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-def setTreatmentSalineBolusData(vTarget, vCumulitive, vDelivered):
-    frames = buildTreatmentSalineBolusData(vTarget, vCumulitive, vDelivered)
+def setTreatmentSalineBolusData(vTarget, vCumulative, vDelivered):
+    """
+    the Treatment Saline Bolus Data message setter/sender method
+    :param vTarget: (int) Saline Bolus Target Volume
+    :param vCumulative: (float) Saline Bolus Cumulative Volume
+    :param vDelivered: (float) Saline Bolus Delivered Volume
+    :return: none
+    """
+    frames = buildTreatmentSalineBolusData(vTarget, vCumulative, vDelivered)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '040#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x0014,020,Y,HD,UI,SalineBolusResponse,(U32)^Accepted,(U32)^Reason,(U32)^Target 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-def buildSalineBolusResponse(vAccepted, vReason, vTarget):
-    msg = messageBuilder.buildMessage( 0x0014, 4+4+4, True,
+def buildSalineBolusResponse(vAccepted, vReason, vTarget, vState):
+    """
+    the Saline Bolus Response message builder method
+    | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description           | #1:(U32)             | #2:(U32)            | #3:(U32)            | #3:(U32)            |
+    |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:|:--------------------:|:-------------------:|:-------------------:|:-------------------:|
+    | 20  | 0x020  | 6     | Rsp  | Y   | HD  | UI   | Saline Bolus Response | \ref Data::mAccepted | \ref Data::mReason  | \ref Data::mTarget  | \ref Data::mState   |
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vTarget: (int) Saline Bolus Target Volume
+    :param vState: (int) Saline Bolus current State
+    :return: (str) built message frame(s)
+    """
+    msg = messageBuilder.buildMessage( 0x0014, 4+4+4+4, True,
         utils.toI32(vAccepted),
         utils.toI32(vReason  ),
-        utils.toI32(vTarget  ))
+        utils.toI32(vTarget  ),
+        utils.toI32(vState   ))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-def setSalineBolusResponse(vAccepted, vReason, vTarget):
-    frames = buildSalineBolusResponse(vAccepted, vReason, vTarget)
+def setSalineBolusResponse(vAccepted, vReason, vTarget, vState):
+    """
+    the Saline Bolus Response message setter/sender method
+    :param vAccepted: (int) boolean accept/reject response
+    :param vReason: (int) rejection reason
+    :param vTarget: (int) Saline Bolus Target Volume
+    :param vState: (int) Saline Bolus current State
+    :return: none
+    """
+    frames = buildSalineBolusResponse(vAccepted, vReason, vTarget, vState)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '020#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
 def buildCanBUSFaultCount(vCount):
+    """
+    the CANBus fault count message builder method
+    :param vCount: (int) Fault Count
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage(GuiActionType.CanBUSFaultCount, 4 * 1, False,
         utils.toI32(vCount)
     )
     return messageBuilder.toFrames(msg)
 
 
 def setCanBUSFaultCount(vCount):
+    """
+    the CANBus fault count message setter/sender method
+    :param vCount: (int) Fault Count
+    :return: none
+    """
     frames = buildCanBUSFaultCount(vCount)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
@@ -670,11 +1198,19 @@
 
 
 def buildUnknown():
+    """
+    the unknown message builder method
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage(GuiActionType.Unknown, 0, False)
     return messageBuilder.toFrames(msg)
 
 
 def sendUnknown_HD():
+    """
+    the unknown message from HD setter/sender method
+    :return: none
+    """
     frames = buildUnknown()
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
@@ -683,6 +1219,10 @@
 
 
 def sendUnknown_DG():
+    """
+    the unknown message from DG setter/sender method
+    :return: none
+    """
     frames = buildUnknown()
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
@@ -691,12 +1231,26 @@
 
 
 def clear_all_alarms():
+    """
+    a convenient method for setAlarmStatus to clear all alarms
+    :return: none
+    """
     setAlarmStatus(0, 0, 0, 0, 0)
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x0002,001,N,HD,All,AlarmStatus,(U32)^State,(U32)^Top,(U32)^EscalatesIn,(U32)^MuteTimeout,(U16)^Flags 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
+
 def buildAlarmStatus(vState, vTop, vEscalatesIn, vMuteTimeout, vFlags):
+    """
+    the Alarm Status message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description  | #1:(U32)          | #2:(U32)        | #3:(U32)                | #4:(U32)                | #5:(U16)          |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: |:--:               |:--:             |:--:                     |:--:                     |:--:               |
+    |0x0200| 0x001  | 1   | 1 Hz   | N   | HD  | All | Alarm Status | \ref Data::mState | \ref Data::mTop | \ref Data::mEscalatesIn | \ref Data::mMuteTimeout | \ref Data::mFlags |
+    :param vState: (int) Alarm State
+    :param vTop: (int) Top priority Alaram ID
+    :param vEscalatesIn: (int) Alarm Escalation
+    :param vMuteTimeout: (int) Mute Timeout
+    :param vFlags: (int16) Alarm Flags
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x0002, 4+4+4+4+2, False,
         utils.toI32(vState      ),
         utils.toI32(vTop        ),
@@ -706,47 +1260,72 @@
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-def setAlarmStatus           (vState, vTop, vEscalatesIn, vMuteTimeout, vFlags):
+def setAlarmStatus(vState, vTop, vEscalatesIn, vMuteTimeout, vFlags):
+    """
+    the Alarm Status message setter/sender method
+    :param vState: (int) Alarm State
+    :param vTop: (int) Top priority Alaram ID
+    :param vEscalatesIn: (int) Alarm Escalation
+    :param vMuteTimeout: (int) Mute Timeout
+    :param vFlags: (int16) Alarm Flags
+    :return: none
+    """
     frames = buildAlarmStatus(vState, vTop, vEscalatesIn, vMuteTimeout, vFlags)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '001#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x0003,001,Y,HD,All,AlarmTriggered,(U32)^AlarmID 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildAlarmTriggered(vAlarmID):
+    """
+    the Alarm Triggered message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description     | #1:(U32)            |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:    |:--:                 |
+    |0x0300| 0x001  | 1   | Event  | Y   | HD  | All | Alarm Triggered | \ref Data::mAlarmID |
+    :param vAlarmID: (int) Alarm ID
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x0003, 4, True,
         utils.toI32(vAlarmID))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setAlarmTriggered(vAlarmID):
+    """
+    the Alarm Triggered message setter/sender method
+    :param vAlarmID: (int) Alarm ID
+    :return: none
+    """
     frames = buildAlarmTriggered(vAlarmID)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '001#{}'.format(frame)])
     waitForMessageToBeSent()
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
-## 0x0004,001,Y,HD,All,AlarmCleared,(U32)^AlarmID 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def buildAlarmCleared(vAlarmID):
+    """
+    the Alarm Cleared message builder method
+    | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description   | #1:(U32)            |
+    |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:  |:--:                 |
+    |0x0400| 0x001  | 1   | Event  | Y   | HD  | All | Alarm Cleared | \ref Data::mAlarmID |
+    :param vAlarmID: (int) Alarm ID
+    :return: (str) built message frame(s)
+    """
     msg = messageBuilder.buildMessage( 0x0004, 4, True,
         utils.toI32(vAlarmID))
     return messageBuilder.toFrames(msg)
 
 
-## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 def setAlarmCleared(vAlarmID):
+    """
+    the Alarm Cleared message setter/sender method
+    :param vAlarmID: (int) Alarm ID
+    :return: none
+    """
     frames = buildAlarmCleared(vAlarmID)
     frames = messageBuilder.toCandumpFormat(frames)
     for frame in frames:
         subprocess.call(['cansend', 'can0', '001#{}'.format(frame)])
-    waitForMessageToBeSent()
-
+    waitForMessageToBeSent()
\ No newline at end of file
Index: tests/set_accels_cal.py
===================================================================
diff -u -r13a03d199a7b202d61423587ca7c72e00c0df439 -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- tests/set_accels_cal.py	(.../set_accels_cal.py)	(revision 13a03d199a7b202d61423587ca7c72e00c0df439)
+++ tests/set_accels_cal.py	(.../set_accels_cal.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -1,18 +1,17 @@
 ###########################################################################
 #
-#  Copyright (c) 2019-2019 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 set_accels_cal.py
+# @file set_accels_cal.py
 #
-#  @date 05-Aug-2020
-#  @author S. Nash
+# @author (last) Sean Nash
+# @date (last) 14-Aug-2020
+# @author (original) Sean Nash
+# @date (original) 05-Aug-2020
 #
-#  @brief This script calibrates the HD and DG accelerometers.  The HD and DG
-#  sub-systems should be leveled prior to running this script.
-#
 ############################################################################
 
 import sys
Index: tests/set_flow_sensors_cal.py
===================================================================
diff -u -r13a03d199a7b202d61423587ca7c72e00c0df439 -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- tests/set_flow_sensors_cal.py	(.../set_flow_sensors_cal.py)	(revision 13a03d199a7b202d61423587ca7c72e00c0df439)
+++ tests/set_flow_sensors_cal.py	(.../set_flow_sensors_cal.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -1,19 +1,17 @@
 ###########################################################################
 #
-#  Copyright (c) 2019-2019 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 set_flow_sensors_cal.py
+# @file set_flow_sensors_cal.py
 #
-#  @date 05-Aug-2020
-#  @author S. Nash
+# @author (last) Sean Nash
+# @date (last) 05-Aug-2020
+# @author (original) Sean Nash
+# @date (original) 05-Aug-2020
 #
-#  @brief This script sets the HD blood and dialysate flow sensor calibration
-#  factors (gain and offset).  These calibration factors must be determined
-#  beforehand and typed in below prior to running this script.
-#
 ############################################################################
 
 import sys
Index: tests/test_uf.py
===================================================================
diff -u -r91dc90bd009bdbf5621dcaa1bc12ab3d691673f7 -rfbe3580dfcda2338d9fa33d09bee85099ea7b801
--- tests/test_uf.py	(.../test_uf.py)	(revision 91dc90bd009bdbf5621dcaa1bc12ab3d691673f7)
+++ tests/test_uf.py	(.../test_uf.py)	(revision fbe3580dfcda2338d9fa33d09bee85099ea7b801)
@@ -27,6 +27,9 @@
     dg = DG()
     sleep(2)
 
+#    hd.ui.cmd_ui_start_treatment_request()
+#    exit(0)
+
     # log in to HD and DG as tester
 #    if hd.cmd_log_in_to_hd() == 0:
 #        exit(1)
@@ -54,7 +57,7 @@
             pumpSetPts = ", B.s, " + '{:4d}'.format(hd.bloodflow.target_blood_flow_rate) + \
                 ", DI.s, " + '{:4d}'.format(hd.dialysate_inlet_flow.target_dialysate_inlet_flow_rate) + \
                 ", RO.s, " + '{:4d}'.format(dg.ro_pump.target_pressure_psi) + \
-                ", DR.s, " + '{:5d}'.format(dg.drain_pump.target_drain_pump_speed_RPM)
+                ", DR.s, " + '{:5d}'.format(dg.drain_pump.target_drain_pump_RPM)
             pumpMeasSpds = ", B.m, " + '{:7.1f}'.format(hd.bloodflow.measured_blood_pump_speed) + \
                 ", B.r, " + '{:6.1f}'.format(hd.bloodflow.measured_blood_pump_rotor_speed) + \
                 ", B.f, " + '{:7.1f}'.format(hd.bloodflow.measured_blood_flow_rate) + \