Index: dialin/common/msg_defs.py
===================================================================
diff -u -r211f04b9e9ff6558bc34f99ee805e18ad9c30579 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 211f04b9e9ff6558bc34f99ee805e18ad9c30579)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -131,6 +131,17 @@
     MSG_ID_HD_UI_SET_RTC_RESPONSE = 0x6E                        # DG to UI set RTC Response
     MSG_ID_UI_DG_SET_RTC_REQUEST = 0x6F                         # UI to HD request to set RTC Request
     MSG_ID_DG_UI_SET_RTC_RESPONSE = 0x70                        # HD to UI Set RTC Response
+    MSG_ID_UI_START_TREATMENT_REQUEST = 0x71                    # UI user has requested to start treatment
+    MSG_ID_HD_START_TREATMENT_RESPONSE = 0x72                   # HD response to user request to start treatment
+    MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM = 0x73                 # UI user has confirmed disposable removal
+    MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE = 0x74        # HD response to user confirmation of disposable removal
+    MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST = 0x75                 # UI request treatment log data message
+    MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0x76                # HD response to UI treatment log data request
+    MSG_ID_HD_POST_TREATMENT_STATE = 0x77                       # HD broadcast of post-treatment state
+    MSG_ID_HD_BLOOD_LEAK_STATE = 0x78                           # HD broadcast of blood leak state
+    MSG_ID_DG_START_STOP_FLUSH = 0x79                           # DG start/stop flush mode
+    MSG_ID_DG_FLUSH_DATA = 0x7A                                 # DG flush data publish
+    MSG_ID_HD_VOLTAGES_DATA = 0x7B                              # HD voltages data publish
 
     MSG_ID_CAN_ERROR_COUNT = 0x999                              # test code in support of EMC testing
 
@@ -211,6 +222,12 @@
     MSG_ID_HD_SYRINGE_PUMP_MEASURED_HOME_OVERRIDE = 0x8049      # HD syringe pump measured home override request
     MSG_ID_HD_SYRINGE_PUMP_MEASURED_POSITION_OVERRIDE = 0x804A  # HD syringe pump measured position override request
     MSG_ID_HD_SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE = 0x804B    # HD syringe pump measured volume delivered override request
+    MSG_ID_HD_BLOOD_LEAK_STATUS_SEND_INTERVAL_OVERRIDE = 0x804C # HD blood leak status broadcast interval override request
+    MSG_ID_HD_BLOOD_LEAK_STATUS_DETECTOR_OVERRIDE = 0x804D      # HD blood leak status detector override request
+    MSG_ID_HD_BLOOD_LEAK_STATE_SEND_INTERVAL_OVERRIDE = 0x804E  # HD blood leak state broadcast interval override request
+    MSG_ID_HD_BLOOD_LEAK_STATE_DETECTOR_OVERRIDE = 0x804F       # HD blood leak state detector override request
+    MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE = 0x8050 # HD monitored voltages publish interval override request
+    MSG_ID_HD_MONITORED_VOLTAGES_OVERRIDE = 0x8051              # HD monitored voltage override request
 
     MSG_ID_DG_TESTER_LOGIN_REQUEST = 0XA000                     # DG tester log-in
     MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001                     # DG alarm state override message ID
Index: dialin/dg/accelerometer.py
===================================================================
diff -u -r3a5030c08d57bddc2c22dca05d1070375e3cb5f7 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/accelerometer.py	(.../accelerometer.py)	(revision 3a5030c08d57bddc2c22dca05d1070375e3cb5f7)
+++ dialin/dg/accelerometer.py	(.../accelerometer.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -209,7 +209,7 @@
         Constructs and sends the accelerometer broadcast interval override command
         Constraints:
             Must be logged into DG.
-            Given interval must be non-zero and a multiple of the HD priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/dg/concentrate_pumps.py
===================================================================
diff -u -r1c9a9880efbed5a1ba31eb231c274aaae78d30eb -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/concentrate_pumps.py	(.../concentrate_pumps.py)	(revision 1c9a9880efbed5a1ba31eb231c274aaae78d30eb)
+++ dialin/dg/concentrate_pumps.py	(.../concentrate_pumps.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -203,6 +203,9 @@
     def cmd_concentrate_pump_broadcast_interval_override(self, ms, reset=NO_RESET):
         """
         Constructs and sends the concentrate pump data broadcast interval override command
+        Constraints:
+            Must be logged into DG.
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/dg/conductivity_sensors.py
===================================================================
diff -u -r5d36fab08811664f85c4de033dc34c51cc9bb9a4 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 5d36fab08811664f85c4de033dc34c51cc9bb9a4)
+++ dialin/dg/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -139,6 +139,9 @@
     def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms, reset=NO_RESET):
         """
         Constructs and sends the conductivity sensor data broadcast interval override command
+        Constraints:
+            Must be logged into DG.
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/dg/drain_pump.py
===================================================================
diff -u -r4820f43868c7de63a8c5777b10f47152ce76103f -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision 4820f43868c7de63a8c5777b10f47152ce76103f)
+++ dialin/dg/drain_pump.py	(.../drain_pump.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -150,7 +150,7 @@
         Constructs and sends the drain pump speed set point override command.
         Constraints:
             Must be logged into DG.
-            Given interval must be non-zero and a multiple of the DG priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms: (int) interval (in ms) to override with
         @param reset: (int) 1 to reset a previous override, 0 to override
Index: dialin/dg/fans.py
===================================================================
diff -u -re851e75aa1d8f801324442b0cb034ba3e82325c9 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/fans.py	(.../fans.py)	(revision e851e75aa1d8f801324442b0cb034ba3e82325c9)
+++ dialin/dg/fans.py	(.../fans.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -142,7 +142,7 @@
         Constructs and sends the fans data publish interval.
         Constraints:
             Must be logged into DG.
-            Given interval must be non-zero and a multiple of the DG priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms: (int) interval (in ms) to override with
         @param reset: (int) 1 to reset a previous override, 0 to override
Index: dialin/dg/load_cells.py
===================================================================
diff -u -r680ab4c35b3902a5397513ef93c97f8b7a6daca8 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/load_cells.py	(.../load_cells.py)	(revision 680ab4c35b3902a5397513ef93c97f8b7a6daca8)
+++ dialin/dg/load_cells.py	(.../load_cells.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -133,7 +133,7 @@
         Constructs and sends the load cell data broadcast interval override command
         Constraints:
             Must be logged into DG.
-            Given interval must be non-zero and a multiple of the DG priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/dg/pressures.py
===================================================================
diff -u -r2c534eec470fca0bda0b365fc4ae5e4b3d9a8059 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/pressures.py	(.../pressures.py)	(revision 2c534eec470fca0bda0b365fc4ae5e4b3d9a8059)
+++ dialin/dg/pressures.py	(.../pressures.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -141,7 +141,7 @@
         Constructs and sends the pressure override command.
         Constraints:
             Must be logged into DG.
-            Given interval must be non-zero and a multiple of the DG priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms:  unsigned int - broadcast interval (in ms)
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/dg/ro_pump.py
===================================================================
diff -u -r65cf1d8021361e0f51aed3a60fceefb54cc784e1 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision 65cf1d8021361e0f51aed3a60fceefb54cc784e1)
+++ dialin/dg/ro_pump.py	(.../ro_pump.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -225,7 +225,7 @@
         Constructs and sends the RO pump set point override command
         Constraints:
             Must be logged into DG.
-            Given interval must be non-zero and a multiple of the DG priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms:  integer - time interval (in ms) to broadcast RO pump data
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/dg/scheduled_runs_record.py
===================================================================
diff -u -rdd42e4d9cfe821b0a755ccc86cc1a4a2a3dd2f37 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/scheduled_runs_record.py	(.../scheduled_runs_record.py)	(revision dd42e4d9cfe821b0a755ccc86cc1a4a2a3dd2f37)
+++ dialin/dg/scheduled_runs_record.py	(.../scheduled_runs_record.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -397,13 +397,13 @@
                 data += b''.join(cal[self.SCHEDULED_RECORDS_SPECS_BYTE_ARRAY:])
 
         # Calculate the 16-bit crc.
-        crc = crc_16(data)
+        #crc = crc_16(data)   # TODO - Dara to fix
         # Convert the crc into a 2-byte value
-        record_crc = struct.pack('<H', crc)
+        #record_crc = struct.pack('<H', crc)
         # Insert the CRC into the last element of the last data packet
-        scheduled_runs_record_packets[-1][-1] = record_crc
+        #scheduled_runs_record_packets[-1][-1] = record_crc
 
-        print('CRC: ', hex(crc)) #TODO remove
+        #print('CRC: ', hex(crc)) #TODO remove
 
         self.logger.debug('DG scheduled runs record update started')
 
Index: dialin/dg/temperature_sensors.py
===================================================================
diff -u -r2547391a5b9dd00230b8238dba5d0ae6caf2e4c6 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/temperature_sensors.py	(.../temperature_sensors.py)	(revision 2547391a5b9dd00230b8238dba5d0ae6caf2e4c6)
+++ dialin/dg/temperature_sensors.py	(.../temperature_sensors.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -174,7 +174,7 @@
         Constructs and sends broadcast time interval.
         Constraints:
             Must be logged into DG.
-            Given interval must be non-zero and a multiple of the DG priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms: (int) Publish time interval in ms
         @param reset: (int) 1 to reset a previous override, 0 to override
Index: dialin/dg/thermistors.py
===================================================================
diff -u -r18c04cbcd10619250868cec39470a2b29c86121b -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/thermistors.py	(.../thermistors.py)	(revision 18c04cbcd10619250868cec39470a2b29c86121b)
+++ dialin/dg/thermistors.py	(.../thermistors.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -104,7 +104,7 @@
         Constructs and sends the thermistors data publish interval command.
         Constraints:
             Must be logged into DG.
-            Given interval must be non-zero and a multiple of the DG priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms: (int) interval (in ms) to override with
         @param reset: (int) 1 to reset a previous override, 0 to override
Index: dialin/dg/uv_reactors.py
===================================================================
diff -u -re851e75aa1d8f801324442b0cb034ba3e82325c9 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/uv_reactors.py	(.../uv_reactors.py)	(revision e851e75aa1d8f801324442b0cb034ba3e82325c9)
+++ dialin/dg/uv_reactors.py	(.../uv_reactors.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -116,7 +116,7 @@
         Constructs and sends the UV reactors data publish interval.
         Constraints:
             Must be logged into DG.
-            Given interval must be non-zero and a multiple of the DG priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms: (int) interval (in ms) to override with
         @param reset: (int) 1 to reset a previous override, 0 to override
Index: dialin/dg/valves.py
===================================================================
diff -u -rdd42e4d9cfe821b0a755ccc86cc1a4a2a3dd2f37 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/dg/valves.py	(.../valves.py)	(revision dd42e4d9cfe821b0a755ccc86cc1a4a2a3dd2f37)
+++ dialin/dg/valves.py	(.../valves.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -338,7 +338,7 @@
         Constructs and sends the valve state override command.
         Constraints:
             Must be logged into DG.
-            Given interval must be non-zero and a multiple of the DG priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
 
         @param ms:  unsigned int - broadcast interval (in ms)
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/hd/accelerometer.py
===================================================================
diff -u -r3a5030c08d57bddc2c22dca05d1070375e3cb5f7 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/hd/accelerometer.py	(.../accelerometer.py)	(revision 3a5030c08d57bddc2c22dca05d1070375e3cb5f7)
+++ dialin/hd/accelerometer.py	(.../accelerometer.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -209,7 +209,7 @@
         Constructs and sends the accelerometer broadcast interval override command
         Constraints:
             Must be logged into HD.
-            Given interval must be non-zero and a multiple of the HD priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the HD general task interval (50 ms).
 
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/hd/alarms.py
===================================================================
diff -u -r62df70b019fa433c8f345d2e1699e6c8f204af2c -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 62df70b019fa433c8f345d2e1699e6c8f204af2c)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -178,7 +178,7 @@
          TBD                = result & 2048
          TBD                = result & 4096
          TBD                = result & 8192
-         TBD                = result & 16384
+         No Minimize        = result & 16384
          Condition Detected = result & 32768
 
         @return: (int) The alarms flags value
Index: dialin/hd/blood_flow.py
===================================================================
diff -u -r551e0a9620126efd158e93c45e9ed84ee6ec85fb -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision 551e0a9620126efd158e93c45e9ed84ee6ec85fb)
+++ dialin/hd/blood_flow.py	(.../blood_flow.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -449,7 +449,7 @@
         Constructs and sends the measured blood flow broadcast interval override command
         Constraints:
             Must be logged into HD.
-            Given interval must be non-zero and a multiple of the HD priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the HD general task interval (50 ms).
 
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/hd/dialysate_inlet_flow.py
===================================================================
diff -u -r551e0a9620126efd158e93c45e9ed84ee6ec85fb -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision 551e0a9620126efd158e93c45e9ed84ee6ec85fb)
+++ dialin/hd/dialysate_inlet_flow.py	(.../dialysate_inlet_flow.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -454,7 +454,7 @@
         Constructs and sends the measured dialysate inlet flow broadcast interval override command
         Constraints:
             Must be logged into HD.
-            Given interval must be non-zero and a multiple of the HD priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the HD general task interval (50 ms).
 
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/hd/dialysate_outlet_flow.py
===================================================================
diff -u -r5ce02d1768b268149d4f69fc1590c87e585f798a -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision 5ce02d1768b268149d4f69fc1590c87e585f798a)
+++ dialin/hd/dialysate_outlet_flow.py	(.../dialysate_outlet_flow.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -439,7 +439,7 @@
         Constructs and sends the measured dialysate outlet flow broadcast interval override command
         Constraints:
             Must be logged into HD.
-            Given interval must be non-zero and a multiple of the HD priority task interval (10 ms).
+            Given interval must be non-zero and a multiple of the HD general task interval (50 ms).
 
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r211f04b9e9ff6558bc34f99ee805e18ad9c30579 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 211f04b9e9ff6558bc34f99ee805e18ad9c30579)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -26,6 +26,7 @@
 from .dialysate_outlet_flow import HDDialysateOutletFlow
 from .treatment import HDTreatment
 from .valves import HDValves
+from .voltages import HDVoltages
 from .calibration_record import HDCalibrationNVRecord
 from .system_record import HDSystemNVRecords
 from .service_record import HDServiceNVRecords
@@ -105,6 +106,7 @@
         self.pressure_occlusion = HDPressureOcclusion(self.can_interface, self.logger)
         self.syringe_pump = HDSyringePump(self.can_interface, self.logger)
         self.valves = HDValves(self.can_interface, self.logger)
+        self.voltages = HDVoltages(self.can_interface, self.logger)
         self.calibration_record = HDCalibrationNVRecord(self.can_interface, self.logger)
         self.system_record = HDSystemNVRecords(self.can_interface, self.logger)
         self.service_record = HDServiceNVRecords(self.can_interface, self.logger)
Index: dialin/hd/pressure_occlusion.py
===================================================================
diff -u -r8a53de6c3b9d0ef76d2b4f648d2efc2d394cba21 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/hd/pressure_occlusion.py	(.../pressure_occlusion.py)	(revision 8a53de6c3b9d0ef76d2b4f648d2efc2d394cba21)
+++ dialin/hd/pressure_occlusion.py	(.../pressure_occlusion.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -319,7 +319,7 @@
         Constructs and sends the pressure/occlusion broadcast interval override command
         Constraints:
             Must be logged into HD.
-            Given interval must be non-zero and a multiple of the DG general task interval (50 ms).
+            Given interval must be non-zero and a multiple of the HD general task interval (50 ms).
 
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
Index: dialin/hd/valves.py
===================================================================
diff -u -r0a0b2c0cc6c48ea1a9c28d0aadced16a2110d758 -r4ff3b2874eb12aee034d1f85ae32c161d05efc00
--- dialin/hd/valves.py	(.../valves.py)	(revision 0a0b2c0cc6c48ea1a9c28d0aadced16a2110d758)
+++ dialin/hd/valves.py	(.../valves.py)	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -133,6 +133,9 @@
     def cmd_hd_valves_broadcast_interval_override(self, ms, reset=NO_RESET):
         """
         Constructs and sends broadcast time interval
+        Constraints:
+            Must be logged into HD.
+            Given interval must be non-zero and a multiple of the HD general task interval (50 ms).
 
         @param ms: Publish time interval in ms
         @param reset: integer - 1 to reset a previous override, 0 to override
Index: dialin/hd/voltages.py
===================================================================
diff -u
--- dialin/hd/voltages.py	(revision 0)
+++ dialin/hd/voltages.py	(revision 4ff3b2874eb12aee034d1f85ae32c161d05efc00)
@@ -0,0 +1,187 @@
+###########################################################################
+#
+# 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.
+#
+# @file voltages.py
+#
+# @author (last) Sean Nash
+# @date (last) 15-Apr-2021
+# @author (original) Sean Nash
+# @date (original) 15-Apr-2021
+#
+############################################################################
+import struct
+from enum import unique
+from ..utils.base import DialinEnum
+from ..protocols.CAN import (DenaliMessage,
+                             DenaliChannels)
+from ..utils.conversions import integer_to_bytearray, float_to_bytearray
+from .constants import RESET, NO_RESET
+from ..utils.base import _AbstractSubSystem, _publish
+from ..common.msg_defs import MsgIds, MsgFieldPositions
+from logging import Logger
+
+
+# Monitored voltages
+@unique
+class HDMonitoredVoltages(DialinEnum):
+    MONITORED_LINE_1_2V = 0             # Processor voltage (1.2V)
+    MONITORED_LINE_3_3V = 1             # Logic voltage (3.3V)
+    MONITORED_LINE_5V_LOGIC = 2         # Logic voltage (5V)
+    MONITORED_LINE_5V_SENSORS = 3       # Sensors voltage (5V)
+    MONITORED_LINE_24V = 4              # Actuators voltage (24V)
+    MONITORED_LINE_24V_REGEN = 5        # Actuators regen voltage (24V)
+    MONITORED_LINE_FPGA_REF_V = 6       # FPGA ADC reference voltage (1V)
+    MONITORED_LINE_PBA_REF_V = 7        # PBA ADC reference voltage (3V)
+    NUM_OF_MONITORED_VOLTAGE_LINES = 8  # Number of HD operation modes
+
+
+class HDVoltages(_AbstractSubSystem):
+    """
+    Hemodialysis Delivery (HD) Dialin API sub-class for voltage monitor related commands and data.
+    """
+
+    def __init__(self, can_interface, logger: Logger):
+        """
+        HDVoltages 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 = MsgIds.MSG_ID_HD_VOLTAGES_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+                                                                       self._handler_monitored_voltages_sync)
+        self.monitored_voltages = [0.0] * HDMonitoredVoltages.NUM_OF_MONITORED_VOLTAGE_LINES.value
+
+    def get_monitored_voltages(self):
+        """
+        Gets all monitored voltages
+
+        @return: List of voltages of size NUM_OF_MONITORED_VOLTAGE_LINES
+        """
+        return self.monitored_voltages
+
+    @_publish([
+        "monitored_voltages"
+    ])
+    def _handler_monitored_voltages_sync(self, message):
+        """
+        Handles published monitored voltages data messages.  Voltage data are captured
+        for reference.
+
+        @param message:  published monitored voltages data message
+        @return: none
+        """
+
+        v12 = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))
+        v33 = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
+        v5l = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
+        v5s = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
+        v24 = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
+        v24g = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))
+        vfr = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
+        vpr = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
+
+        self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_1_2V.value] = v12[0]
+        self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_3_3V.value] = v33[0]
+        self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_5V_LOGIC.value] = v5l[0]
+        self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_5V_SENSORS.value] = v5s[0]
+        self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_24V.value] = v24[0]
+        self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_24V_REGEN.value] = v24g[0]
+        self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_FPGA_REF_V.value] = vfr[0]
+        self.monitored_voltages[HDMonitoredVoltages.MONITORED_LINE_PBA_REF_V.value] = vpr[0]
+
+    def cmd_monitored_voltage_override(self, signal:int=0, volts:float=0.0, reset:int=NO_RESET):
+        """
+        Constructs and sends the monitored voltage override command
+        Constraints:
+            Must be logged into HD.
+            Given signal must be valid member of HDMonitoredVoltages enum
+
+        @param signal: integer - ID of signal to override
+        @param volts:  float - value (in volts) to override signal with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
+        """
+
+        rst = integer_to_bytearray(reset)
+        vlt = float_to_bytearray(volts)
+        idx = integer_to_bytearray(signal)
+        payload = rst + vlt + idx
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_HD_MONITORED_VOLTAGES_OVERRIDE.value,
+                                              payload=payload)
+
+        self.logger.debug("override monitored voltage for signal " + str(signal))
+
+        # Send message
+        received_message = self.can_interface.send(message)
+
+        # If there is content...
+        if received_message is not None:
+            if reset == RESET:
+                str_res = "reset back to normal.  "
+            else:
+                str_res = str(volts) + " V.  "
+            self.logger.debug("Monitored voltage overridden to " + str_res +
+                  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_monitored_voltages_broadcast_interval_override(self, ms:int=1000, reset:int=NO_RESET):
+        """
+        Constructs and sends the monitored voltages broadcast interval override command
+        Constraints:
+            Must be logged into HD.
+            Given interval must be non-zero and a multiple of the HD general task interval (50 ms).
+
+        @param ms:  integer - interval (in ms) 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)
+        mis = integer_to_bytearray(ms)
+        payload = rst + mis
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+                                              message_id=MsgIds.MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE.value,
+                                              payload=payload)
+
+        self.logger.debug("override monitored HD voltages broadcast interval")
+
+        # Send message
+        received_message = self.can_interface.send(message)
+
+        # If there is content...
+        if received_message is not None:
+            if reset == RESET:
+                str_res = "reset back to normal: "
+            else:
+                str_res = str(ms) + " ms: "
+            self.logger.debug("HD monitored voltages broadcast interval overridden to " + str_res +
+                  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