Index: HD/DialysateInletFlow.py
===================================================================
diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837
--- HD/DialysateInletFlow.py	(.../DialysateInletFlow.py)	(revision c5826238ca4b80671231a9c564af3ea01b9be06f)
+++ HD/DialysateInletFlow.py	(.../DialysateInletFlow.py)	(revision 0da0106eca868b9144298c60911710b3414a5837)
@@ -5,7 +5,7 @@
 #  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 DialysateInletFlow.py
+#  @file dialysate_inlet_flow.py
 #
 #  @date 31-Mar-2020
 #  @author P. Lucia
@@ -16,8 +16,7 @@
 ############################################################################
 from DialIn.CoreCANProtocol import (DenaliMessage,
                                     DenaliChannels)
-from .utils import integer2ByteArray, float2ByteArray
-from .HemodialysisDevice import HD
+from utils import integer_to_byte_array, float_to_byte_array, RESET, NO_RESET
 import struct
 
 
@@ -39,7 +38,7 @@
     MSG_ID_HD_DIAL_IN_PUMP_MEAS_SPEED_OVERRIDE = 0x8015
     MSG_ID_HD_DIAL_IN_PUMP_ROTOR_MEAS_SPEED_OVERRIDE = 0x8016
 
-    # BloodFlow broadcast message field positions
+    # 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
@@ -66,17 +65,17 @@
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
             msg_id = self.MSG_ID_HD_DIAL_IN_FLOW_PUBLISHED_DATA
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
-                                                                       self.handlerDialysateInletFlowSyncFunction)
+                                                                       self.handler_dialysate_inlet_flow_sync)
 
-        self.TargetDialysateInletFlowRate = 0
-        self.MeasuredDialysateInletFlowRate = 0.0
-        self.MeasuredDialysateInletPumpRotorSpeed = 0.0
-        self.MeasuredDialysateInletPumpSpeed = 0.0
-        self.MeasuredDialysateInletPumpMCSpeed = 0.0
-        self.MeasuredDialysateInletPumpMCCurrent = 0.0
-        self.PWMDutyCyclePct = 0.0
+        self.target_dialysate_inlet_flow_rate = 0
+        self.measured_dialysate_inlet_flow_rate = 0.0
+        self.measured_dialysate_inlet_pump_rotor_speed = 0.0
+        self.measured_dialysate_inlet_pump_speed = 0.0
+        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
 
-    def handlerDialysateInletFlowSyncFunction(self, message):
+    def handler_dialysate_inlet_flow_sync(self, message):
         """
             Handles published dialysate inlet flow data messages.  Dialysate flow data are captured
             for reference.
@@ -85,7 +84,7 @@
             \returns none
         """
 
-        self.TargetDialysateInletFlowRate = int.from_bytes(bytearray(
+        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)
         flow = struct.unpack('f', bytearray(
@@ -101,14 +100,14 @@
         pwm = struct.unpack('f', bytearray(
             message['message'][self.START_POS_PWM_DC:self.END_POS_PWM_DC]))
 
-        self.MeasuredDialysateInletFlowRate = flow[0]
-        self.MeasuredDialysateInletPumpRotorSpeed = rotor[0]
-        self.MeasuredDialysateInletPumpSpeed = speed[0]
-        self.MeasuredDialysateInletPumpMCSpeed = mcspeed[0]
-        self.MeasuredDialysateInletPumpMCCurrent = mccurr[0]
-        self.PWMDutyCyclePct = pwm[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]
 
-    def CmdDialysateInletFlowSetPointOverride(self, reset, flow):
+    def cmd_dialysate_inlet_flow_set_point_override(self, reset, flow):
         """
             Constructs and sends the dialysate flow set point override command
 
@@ -117,8 +116,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        flo = integer2ByteArray(flow)
+        rst = integer_to_byte_array(reset)
+        flo = integer_to_byte_array(flow)
         payload = rst + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -133,7 +132,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(flow)
@@ -146,7 +145,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletFlowMeasuredOverride(self, reset, flow):
+    def cmd_dialysate_inlet_flow_measured_override(self, reset, flow):
         """
             Constructs and sends the measured dialysate flow override command
 
@@ -155,8 +154,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        flo = float2ByteArray(flow)
+        rst = integer_to_byte_array(reset)
+        flo = float_to_byte_array(flow)
         payload = rst + flo
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -171,7 +170,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(flow)
@@ -183,7 +182,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletPumpMCMeasuredSpeedOverride(self, reset, speed):
+    def cmd_dialysate_inlet_pump_mc_measured_speed_override(self, reset, speed):
         """
             Constructs and sends the measured dialysate inlet pump motor controller speed \n
             override command.
@@ -193,8 +192,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -209,7 +208,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(speed)
@@ -221,7 +220,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletPumpMeasuredCurrentOverride(self, reset, curr):
+    def cmd_dialysate_inlet_pump_measured_current_override(self, reset, curr):
         """
             Constructs and sends the measured dialysate inlet pump motor current override command
 
@@ -230,8 +229,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        cur = float2ByteArray(curr)
+        rst = integer_to_byte_array(reset)
+        cur = float_to_byte_array(curr)
         payload = rst + cur
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -246,7 +245,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(curr)
@@ -258,7 +257,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletPumpMeasuredSpeedOverride(self, reset, speed):
+    def cmd_dialysate_inlet_pump_measured_speed_override(self, reset, speed):
         """
             Constructs and sends the measured dialysate inlet pump motor speed override \n
             command.
@@ -268,8 +267,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -284,7 +283,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(speed)
@@ -296,7 +295,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletPumpRotorMeasuredSpeedOverride(self, reset, speed):
+    def cmd_dialysate_inlet_pump_rotor_measured_speed_override(self, reset, speed):
         """
             Constructs and sends the measured dialysate inlet pump rotor speed override \n
             command.
@@ -306,8 +305,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        spd = float2ByteArray(speed)
+        rst = integer_to_byte_array(reset)
+        spd = float_to_byte_array(speed)
         payload = rst + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -322,7 +321,7 @@
         # If there is content...
         if received_message is not None:
             # print(received_message)
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal"
             else:
                 str_res = str(speed)
@@ -334,7 +333,7 @@
             print("Timeout!!!!")
             return False
 
-    def CmdDialysateInletFlowBroadcastIntervalOverride(self, reset, ms):
+    def cmd_dialysate_inlet_flow_broadcast_interval_override(self, reset, ms):
         """
             Constructs and sends the measured dialysate inlet flow broadcast interval override command
 
@@ -343,8 +342,8 @@
             \returns 1 if successful, zero otherwise
         """
 
-        rst = integer2ByteArray(reset)
-        mis = integer2ByteArray(ms)
+        rst = integer_to_byte_array(reset)
+        mis = integer_to_byte_array(ms)
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
@@ -358,7 +357,7 @@
 
         # If there is content...
         if received_message is not None:
-            if reset == HD.RESET:
+            if reset == RESET:
                 str_res = "reset back to normal: "
             else:
                 str_res = str(ms) + " ms: "