Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -r23d97164899d37cb70f73beda28e790996e18abc -r7c8e829c563547ee50c517f1d6b84cb800b72027 --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 23d97164899d37cb70f73beda28e790996e18abc) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 7c8e829c563547ee50c517f1d6b84cb800b72027) @@ -50,12 +50,11 @@ TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name: 0.0, TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name: 0.0, TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name: 0.0, - TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_MOTOR_CURRENT.name: 0.0, + TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE : 0.0, TDBloodFlowMotorAttributes.SET_RPM.name: 0.0, TDBloodFlowMotorAttributes.ROTOR_COUNT.name: 0, TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name: 0, TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name: 0, - TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE : 0.0 } @publish(["msg_id_td_blood_pump_data", "h4_motor", "td_blood_flow_timestamp"]) @@ -76,7 +75,7 @@ message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_MOTOR_CURRENT.name] = struct.unpack('f', bytearray( + self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.h4_motor[TDBloodFlowMotorAttributes.SET_RPM.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] @@ -86,8 +85,6 @@ message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] self.h4_motor[TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name] = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] self.td_blood_flow_timestamp = timestamp