Index: HD/DialysateOutletFlow.py =================================================================== diff -u -rc5826238ca4b80671231a9c564af3ea01b9be06f -r0da0106eca868b9144298c60911710b3414a5837 --- HD/DialysateOutletFlow.py (.../DialysateOutletFlow.py) (revision c5826238ca4b80671231a9c564af3ea01b9be06f) +++ HD/DialysateOutletFlow.py (.../DialysateOutletFlow.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 DialysateOutletFlow.py +# @file dialysate_outlet_flow.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 HDDialysateOutletFlow: """ \class HD_DialysateOutletFlow @@ -40,7 +40,7 @@ MSG_ID_HD_DIAL_OUT_PUMP_ROTOR_MEAS_SPEED_OVERRIDE = 0x8024 MSG_ID_HD_DIAL_OUT_LOAD_CELL_WEIGHT_OVERRIDE = 0x8025 - # BloodFlow broadcast message field positions + # bloodflow broadcast message field positions START_POS_REF_VOL = DenaliMessage.PAYLOAD_START_INDEX END_POS_REF_VOL = START_POS_REF_VOL + 4 START_POS_MEAS_VOL = END_POS_REF_VOL @@ -66,17 +66,17 @@ channel_id = DenaliChannels.hd_sync_broadcast_ch_id msg_id = self.MSG_ID_HD_DIAL_OUT_FLOW_PUBLISHED_DATA self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self.handlerDialysateOutletFlowSyncFunction) + self.handler_dialysate_outlet_flow_sync) - self.ReferenceDialysateOutletUFVolume = 0.0 - self.MeasuredDialysateOutletUFVolume = 0.0 - self.MeasuredDialysateOutletPumpRotorSpeed = 0.0 - self.MeasuredDialysateOutletPumpSpeed = 0.0 - self.MeasuredDialysateOutletPumpMCSpeed = 0.0 - self.MeasuredDialysateOutletPumpMCCurrent = 0.0 - self.PWMDutyCyclePct = 0.0 + self.reference_dialysate_outlet_uf_volume = 0.0 + self.measured_dialysate_outlet_uf_volume = 0.0 + self.measured_dialysate_outlet_pump_rotor_speed = 0.0 + self.measured_dialysate_outlet_pump_speed = 0.0 + self.measured_dialysate_outlet_pump_mc_speed = 0.0 + self.measured_dialysate_outlet_pump_mc_current = 0.0 + self.pwm_duty_cycle_pct = 0.0 - def handlerDialysateOutletFlowSyncFunction(self, message): + def handler_dialysate_outlet_flow_sync(self, message): """ Handles published dialysate outlet flow data messages. Dialysate flow data are captured for reference. @@ -100,15 +100,15 @@ pwm = struct.unpack('f', bytearray( message['message'][self.START_POS_PWM_DC:self.END_POS_PWM_DC])) - self.ReferenceDialysateOutletUFVolume = refVol[0] - self.MeasuredDialysateOutletUFVolume = measVol[0] - self.MeasuredDialysateOutletPumpRotorSpeed = rotor[0] - self.MeasuredDialysateOutletPumpSpeed = speed[0] - self.MeasuredDialysateOutletPumpMCSpeed = mcspeed[0] - self.MeasuredDialysateOutletPumpMCCurrent = mccurr[0] - self.PWMDutyCyclePct = pwm[0] + self.reference_dialysate_outlet_uf_volume = refVol[0] + self.measured_dialysate_outlet_uf_volume = measVol[0] + self.measured_dialysate_outlet_pump_rotor_speed = rotor[0] + self.measured_dialysate_outlet_pump_speed = speed[0] + self.measured_dialysate_outlet_pump_mc_speed = mcspeed[0] + self.measured_dialysate_outlet_pump_mc_current = mccurr[0] + self.pwm_duty_cycle_pct = pwm[0] - def CmdDialysateOutletReferenceUFVolumeOverride(self, reset, refVol): + def cmd_dialysate_outlet_reference_uf_volume_override(self, reset, refVol): """ Constructs and sends the UF reference volume override command @@ -117,8 +117,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer2ByteArray(reset) - vol = float2ByteArray(refVol) + rst = integer_to_byte_array(reset) + vol = float_to_byte_array(refVol) payload = rst + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -133,7 +133,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 = "overridden to " + str(refVol) + " mL. " @@ -146,7 +146,7 @@ print("Timeout!!!!") return False - def CmdDialysateOutletMeasuredUFVolumeOverride(self, reset, measVol): + def cmd_dialysate_outlet_measured_uf_volume_override(self, reset, measVol): """ Constructs and sends the measured UF volume override command @@ -155,8 +155,8 @@ \returns 1 if successful, zero otherwise """ - rst = integer2ByteArray(reset) - vol = float2ByteArray(measVol) + rst = integer_to_byte_array(reset) + vol = float_to_byte_array(measVol) payload = rst + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -171,7 +171,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 = "overridden to " + str(measVol) + " mL. " @@ -183,7 +183,7 @@ print("Timeout!!!!") return False - def CmdDialysateOutletPumpMCMeasuredSpeedOverride(self, reset, speed): + def cmd_dialysate_outlet_pump_mc_measured_speed_override(self, reset, speed): """ Constructs and sends the measured dialysate outlet pump motor controller speed \n override command. @@ -193,12 +193,12 @@ \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, - message_id=self.MeasuredDialysateOutletPumpMCSpeed, + message_id=self.measured_dialysate_outlet_pump_mc_speed, payload=payload) print("override measured dialysate outlet pump motor controller speed to " + str(spd) + " RPM.") @@ -209,7 +209,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 = "overridden to " + str(speed) + " RPM. " @@ -221,7 +221,7 @@ print("Timeout!!!!") return False - def CmdDialysateOutletPumpMeasuredCurrentOverride(self, reset, curr): + def cmd_dialysate_outlet_pump_measured_current_override(self, reset, curr): """ Constructs and sends the measured dialysate outlet pump motor current override command @@ -230,8 +230,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 +246,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 = "overridden to " + str(curr) + " mA. " @@ -258,7 +258,7 @@ print("Timeout!!!!") return False - def CmdDialysateOutletPumpMeasuredSpeedOverride(self, reset, speed): + def cmd_dialysate_outlet_pump_measured_speed_override(self, reset, speed): """ Constructs and sends the measured dialysate outlet pump motor speed override \n command. @@ -268,8 +268,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 +284,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 = "overridden to " + str(speed) + " RPM. " @@ -296,7 +296,7 @@ print("Timeout!!!!") return False - def CmdDialysateOutletPumpRotorMeasuredSpeedOverride(self, reset, speed): + def cmd_dialysate_outlet_pump_rotor_measured_speed_override(self, reset, speed): """ Constructs and sends the measured dialysate outlet pump rotor speed override \n command. @@ -306,8 +306,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 +322,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 = "overridden to " + str(speed) + " RPM. " @@ -334,7 +334,7 @@ print("Timeout!!!!") return False - def CmdDialysateOutletFlowBroadcastIntervalOverride(self, reset, ms): + def cmd_dialysate_outlet_flow_broadcast_interval_override(self, reset, ms): """ Constructs and sends the measured dialysate outlet flow broadcast interval override command @@ -343,8 +343,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, @@ -359,7 +359,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 = "overridden to " + str(ms) + " ms. " @@ -371,7 +371,7 @@ print("Timeout!!!!") return False - def CmdDialysateOutletPumpLoadCellWeightOverride(self, reset, weight, sensor): + def cmd_dialysate_outlet_pump_load_cell_weight_override(self, reset, weight, sensor): """ Constructs and sends the measured load cell weight override command. @@ -387,9 +387,9 @@ 3 = reservoir 2 backup \n """ - rst = integer2ByteArray(reset) - spd = float2ByteArray(weight) - sen = integer2ByteArray(sensor) + rst = integer_to_byte_array(reset) + spd = float_to_byte_array(weight) + sen = integer_to_byte_array(sensor) payload = rst + spd + sen message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -404,7 +404,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 = "overridden to " + str(weight) + " grams. " @@ -416,7 +416,7 @@ print("Timeout!!!!") return False - def CmdSetLoadCellWeights(self, r1p, r1b, r2p, r2b): + def cmd_set_load_cell_weights(self, r1p, r1b, r2p, r2b): """ Constructs and sends the set load cell weights command. @@ -427,10 +427,10 @@ \returns 0 - no response will come from HD for this message """ - r1pb = float2ByteArray(r1p) - r1bb = float2ByteArray(r1b) - r2pb = float2ByteArray(r2p) - r2bb = float2ByteArray(r2b) + r1pb = float_to_byte_array(r1p) + r1bb = float_to_byte_array(r1b) + r2pb = float_to_byte_array(r2p) + r2bb = float_to_byte_array(r2b) payload = r1pb + r1bb + r2pb + r2bb message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, @@ -440,6 +440,6 @@ print("measured load cell weights set.") # Send message - received_message = self.can_interface.send(message, 0) + self.can_interface.send(message, 0) return 0