Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -r6caa49d072aceb2655d605de5d2eea52ab1a8911 --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 6caa49d072aceb2655d605de5d2eea52ab1a8911) @@ -50,7 +50,6 @@ self.td_blood_flow_timestamp = 0.0 #: The timestamp of the last message - #: The TD Blood Flow data in dictionary format self.h4_motor = { td_enum_repository.TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name: 0, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name: 0.0, @@ -62,10 +61,24 @@ td_enum_repository.TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name: 0, td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name: 0, } - self.handler_execution_times = [] +# ============================================================ Properties ============================================================ + @property + def h4_motor(self) -> dict: + """ + The Blood Flow data + """ + return self._h4_motor + + @h4_motor.setter + def h4_motor(self, value): + self._h4_motor = value + + + +# ============================================================ Handlers ============================================================ @publish(["msg_id_td_blood_pump_data", "h4_motor", "td_blood_flow_timestamp"]) def _handler_blood_flow_sync(self, message, timestamp=0.0): """ @@ -76,24 +89,25 @@ @return: none """ start = time.perf_counter() - sensor_list =[] - sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name, DataTypes.S32)) - sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name, DataTypes.F32)) - sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name, DataTypes.F32)) - sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name, DataTypes.F32)) - sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE.name, DataTypes.F32)) - sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.SET_RPM.name, DataTypes.F32)) - sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_COUNT.name, DataTypes.U32)) - sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name, DataTypes.U32)) - sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name, DataTypes.U32)) + msg_list =[] + msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name, DataTypes.S32)) + msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name, DataTypes.F32)) + msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name, DataTypes.F32)) + msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name, DataTypes.F32)) + msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE.name, DataTypes.F32)) + msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.SET_RPM.name, DataTypes.F32)) + msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_COUNT.name, DataTypes.U32)) + msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name, DataTypes.U32)) + msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name, DataTypes.U32)) - self.process_into_dict(dict_to_update = self.h4_motor, - decoder_list = sensor_list, - message = message) + + self.process_into_vars(decoder_list = msg_list, message = message) self.td_blood_flow_timestamp = timestamp self.handler_execution_times.append((timestamp, message, time.perf_counter() - start)) + +# ============================================================ Overrides and Requests ============================================================ def cmd_blood_flow_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the measured blood flow broadcast interval override command