Index: HD/BloodFlow.py =================================================================== diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837 --- HD/BloodFlow.py (.../BloodFlow.py) (revision c5826238ca4b80671231a9c564af3ea01b9be06f) +++ HD/BloodFlow.py (.../BloodFlow.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 BloodFlow.py +# @file bloodflow.py # # @date 31-Mar-2020 # @author P. Lucia @@ -16,10 +16,10 @@ ############################################################################ 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 import struct + class HDBloodFlow: """ \class HD_BloodFlow @@ -28,7 +28,7 @@ """ - # BloodFlow message IDs + # 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 @@ -38,7 +38,7 @@ MSG_ID_HD_BLOOD_PUMP_MEAS_SPEED_OVERRIDE = 0x800E MSG_ID_HD_BLOOD_PUMP_ROTOR_MEAS_SPEED_OVERRIDE = 0x800F - # 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 @@ -56,38 +56,36 @@ def __init__(self, can_interface=None): """ - HD_BloodFlow constructor + HD_BloodFlow constructor - \param outer_instance: reference to the HD (outer) class. - - \returns HD_BloodFlow object. + \param outer_instance: reference to the HD (outer) class. """ self.can_interface = can_interface 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 self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handlerBloodFlowSyncFunction) + self.handler_blood_flow_sync) - self.TargetBloodFlowRate = 0 - self.MeasuredBloodFlowRate = 0.0 - self.MeasuredBloodPumpRotorSpeed = 0.0 - self.MeasuredBloodPumpSpeed = 0.0 - self.MeasuredBloodPumpMCSpeed = 0.0 - self.MeasuredBloodPumpMCCurrent = 0.0 - self.PWMDutyCyclePct = 0.0 + self.target_blood_flow_rate = 0 + self.measured_blood_flow_rate = 0.0 + self.measured_blood_pump_rotor_speed = 0.0 + self.measured_blood_pump_speed = 0.0 + self.measured_blood_pump_mc_speed = 0.0 + self.measured_blood_pump_mc_current = 0.0 + self.pwm_duty_cycle_pct = 0.0 - def handlerBloodFlowSyncFunction(self, message): + def handler_blood_flow_sync(self, message): """ - Handles published blood flow data messages. Blood flow data are captured - for reference. + Handles published blood flow data messages. Blood flow data are captured + for reference. - \param message: published blood flow data message - \returns none + \param message: published blood flow data message + \returns none """ - # self.TargetBloodFlowRate = int.from_bytes(bytearray( + # 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( @@ -106,25 +104,25 @@ pwm = struct.unpack('f', bytearray( message['message'][self.START_POS_PWM_DC:self.END_POS_PWM_DC])) - self.TargetBloodFlowRate = tgt[0] - self.MeasuredBloodFlowRate = flow[0] - self.MeasuredBloodPumpRotorSpeed = rotor[0] - self.MeasuredBloodPumpSpeed = speed[0] - self.MeasuredBloodPumpMCSpeed = mcspeed[0] - self.MeasuredBloodPumpMCCurrent = mccurr[0] - self.PWMDutyCyclePct = pwm[0] + self.target_blood_flow_rate = tgt[0] + self.measured_blood_flow_rate = flow[0] + self.measured_blood_pump_rotor_speed = rotor[0] + self.measured_blood_pump_speed = speed[0] + self.measured_blood_pump_mc_speed = mcspeed[0] + self.measured_blood_pump_mc_current = mccurr[0] + self.pwm_duty_cycle_pct = pwm[0] - def CmdBloodFlowSetPointOverride(self, reset, flow): + def cmd_blood_flow_set_point_override(self, reset, flow): """ - Constructs and sends the blood flow set point override command + Constructs and sends the blood flow set point override command - \param reset: integer - 1 to reset a previous override, 0 to override - \param flow: integer - flow set point (in mL/min) to override with (negative for reverse direction) - \returns 1 if successful, zero otherwise + \param reset: integer - 1 to reset a previous override, 0 to override + \param flow: integer - flow set point (in mL/min) to override with (negative for reverse direction) + \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, @@ -139,7 +137,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) @@ -152,17 +150,17 @@ print("Timeout!!!!") return False - def CmdBloodFlowMeasuredOverride(self, reset, flow): + def cmd_blood_flow_measured_override(self, reset, flow): """ - Constructs and sends the measured blood flow override command + Constructs and sends the measured blood flow override command - \param reset: integer - 1 to reset a previous override, 0 to override - \param flow: integer - measured flow (in mL/min) to override with - \returns 1 if successful, zero otherwise + \param reset: integer - 1 to reset a previous override, 0 to override + \param flow: integer - measured flow (in mL/min) to override with + \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, @@ -177,7 +175,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) @@ -189,18 +187,18 @@ print("Timeout!!!!") return False - def CmdBloodPumpMCMeasuredSpeedOverride(self, reset, speed): + def cmd_blood_pump_mc_measured_speed_override(self, reset, speed): """ - Constructs and sends the measured blood pump motor controller speed \n - override command. + Constructs and sends the measured blood pump motor controller speed \n + override command. - \param reset: integer - 1 to reset a previous override, 0 to override - \param speed: integer - speed (in RPM) to override with - \returns 1 if successful, zero otherwise + \param reset: integer - 1 to reset a previous override, 0 to override + \param speed: integer - speed (in RPM) to override with + \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, @@ -215,7 +213,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) @@ -227,17 +225,17 @@ print("Timeout!!!!") return False - def CmdBloodPumpMeasuredCurrentOverride(self, reset, curr): + def cmd_blood_pump_measured_current_override(self, reset, curr): """ - Constructs and sends the measured blood pump motor current override command + Constructs and sends the measured blood pump motor current override command - \param reset: integer - 1 to reset a previous override, 0 to override - \param curr: float - current (in mA) to override with - \returns 1 if successful, zero otherwise + \param reset: integer - 1 to reset a previous override, 0 to override + \param curr: float - current (in mA) to override with + \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, @@ -252,7 +250,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) @@ -264,18 +262,18 @@ print("Timeout!!!!") return False - def CmdBloodPumpMeasuredSpeedOverride(self, reset, speed): + def cmd_blood_pump_measured_speed_override(self, reset, speed): """ - Constructs and sends the measured blood pump motor speed override \n - command. + Constructs and sends the measured blood pump motor speed override \n + command. - \param reset: integer - 1 to reset a previous override, 0 to override - \param speed: integer - speed (in RPM) to override with - \returns 1 if successful, zero otherwise + \param reset: integer - 1 to reset a previous override, 0 to override + \param speed: integer - speed (in RPM) to override with + \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, @@ -290,7 +288,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) @@ -302,7 +300,7 @@ print("Timeout!!!!") return False - def CmdBloodPumpRotorMeasuredSpeedOverride(self, reset, speed): + def cmd_blood_pump_rotor_measured_speed_override(self, reset, speed): """ Constructs and sends the measured blood pump rotor speed override \n command. @@ -312,8 +310,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, @@ -328,7 +326,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) @@ -340,17 +338,17 @@ print("Timeout!!!!") return False - def CmdBloodFlowBroadcastIntervalOverride(self, reset, ms): + def cmd_blood_flow_broadcast_interval_override(self, reset, ms): """ - Constructs and sends the measured blood flow broadcast interval override command + Constructs and sends the measured blood flow broadcast interval override command - \param reset: integer - 1 to reset a previous override, 0 to override - \param ms: integer - interval (in ms) to override with - \returns 1 if successful, zero otherwise + \param reset: integer - 1 to reset a previous override, 0 to override + \param ms: integer - interval (in ms) to override with + \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, @@ -365,7 +363,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(ms) + " ms: "