Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r23d97164899d37cb70f73beda28e790996e18abc --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 23d97164899d37cb70f73beda28e790996e18abc) @@ -224,7 +224,8 @@ ROTOR_COUNT = 6 # Rotor Count for Blood Flow Motor PRES_BLOOD_FLOW_RATE = 7 # Pressure Blood Flow Rate for Blood Flow Motor ROTOR_HALL_STATE = 8 # Rotor Hall State for Blood Flow Motor - NUM_OF_BLOOD_FLOW_MOTOR_ATTRIBUTES = 9 # Number of Blood Flow Motor Attributes + MEASURED_BLOOD_PUMP_TORQUE = 9 # Measured Blood Pump torque + NUM_OF_BLOOD_FLOW_MOTOR_ATTRIBUTES = 10 # Number of Blood Flow Motor Attributes @unique class TDAirBubbleDetectorNames(DialinEnum): Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -r43fec7787f9a4115d19deeb5cbc1d7bbf23134fe -r23d97164899d37cb70f73beda28e790996e18abc --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 43fec7787f9a4115d19deeb5cbc1d7bbf23134fe) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 23d97164899d37cb70f73beda28e790996e18abc) @@ -54,7 +54,8 @@ 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.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"]) @@ -85,6 +86,8 @@ 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