Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -rcd4a454309e537e52d2e5c064611ebf986cbe359 -rd28c8c54ba1f74adf348d1db6f5bfe034628c812 --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision cd4a454309e537e52d2e5c064611ebf986cbe359) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision d28c8c54ba1f74adf348d1db6f5bfe034628c812) @@ -44,20 +44,20 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_blood_flow_sync) self.td_blood_flow_timestamp = 0.0 - self.set_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_motor_current = 0.0 - self.set_rpm = 0.0 - self.rotor_count = 0 - self.pres_blood_flow_rate = 0 - self.rotor_hall_state = 0 + self.h4_set_blood_flow_rate = 0 + self.h4_measured_blood_flow_rate = 0.0 + self.h4_measured_blood_pump_rotor_speed = 0.0 + self.h4_measured_blood_pump_speed = 0.0 + self.h4_measured_blood_pump_motor_current = 0.0 + self.h4_set_rpm = 0.0 + self.h4_rotor_count = 0 + self.h4_pres_blood_flow_rate = 0 + self.h4_rotor_hall_state = 0 - @publish(["td_blood_flow_timestamp", "set_blood_flow_rate", "measured_blood_flow_rate", "measured_blood_pump_rotor_speed", - "measured_blood_pump_speed", "measured_blood_pump_motor_current", "set_rpm", - "rotor_count", "pres_blood_flow_rate", "rotor_hall_state"]) + @publish(["td_blood_flow_timestamp", "set_blood_flow_rate", "h4_measured_blood_flow_rate", "h4_measured_blood_pump_rotor_speed", + "h4_measured_blood_pump_speed", "h4_measured_blood_pump_motor_current", "h4_set_rpm", + "h4_rotor_count", "h4_pres_blood_flow_rate", "h4_rotor_hall_state"]) def _handler_blood_flow_sync(self, message, timestamp=0.0): """ Handles published blood flow data messages. Blood flow data are captured @@ -86,15 +86,15 @@ hal = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) - self.set_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_motor_current = mccurr[0] - self.set_rpm = rpm[0] - self.rotor_count = rot[0] - self.pres_blood_flow_rate = pres[0] - self.rotor_hall_state = hal[0] + self.h4_set_blood_flow_rate = tgt[0] + self.h4_measured_blood_flow_rate = flow[0] + self.h4_measured_blood_pump_rotor_speed = rotor[0] + self.h4_measured_blood_pump_speed = speed[0] + self.h4_measured_blood_pump_motor_current = mccurr[0] + self.h4_set_rpm = rpm[0] + self.h4_rotor_count = rot[0] + self.h4_pres_blood_flow_rate = pres[0] + self.h4_rotor_hall_state = hal[0] self.td_blood_flow_timestamp = timestamp def cmd_blood_flow_set_flow_rate_request(self, flow: int, mode: int = PUMP_CONTROL_MODE_CLOSED_LOOP) -> int: