Index: HemodialysisDevice.py =================================================================== diff -u -r29be612221aa2f9f2fbd08a1287abb60d416fc33 -r64e64e45f1fe18efa87a7e4f3379db48f50d0daf --- HemodialysisDevice.py (.../HemodialysisDevice.py) (revision 29be612221aa2f9f2fbd08a1287abb60d416fc33) +++ HemodialysisDevice.py (.../HemodialysisDevice.py) (revision 64e64e45f1fe18efa87a7e4f3379db48f50d0daf) @@ -445,8 +445,10 @@ self.TargetBloodFlowRate = 0 self.MeasuredBloodFlowRate = 0.0 + self.MeasuredBloodPumpRotorSpeed = 0.0 + self.MeasuredBloodPumpSpeed = 0.0 self.MeasuredBloodPumpMCSpeed = 0.0 - self.MeasuredBloodPumpCurrent = 0.0 + self.MeasuredBloodPumpMCurrent = 0.0 """ HD_BloodFlow constructor @@ -459,9 +461,10 @@ def handlerBloodFlowSyncFunction(self, message): self.TargetBloodFlowRate = int.from_bytes(bytearray(message['message'][4:8]), byteorder='little') self.MeasuredBloodFlowRate = struct.unpack('f', bytearray(message['message'][8:12])) - self.MeasuredBloodPumpMCSpeed = struct.unpack('f', bytearray(message['message'][12:16])) - self.MeasuredBloodPumpCurrent = struct.unpack('f', bytearray(message['message'][16:20])) - # print("Tgt Flow: " + str(self.TargetBloodFlowRate) + " Meas Flow: " + str(self.MeasuredBloodFlowRate) + " Meas Spd: " + str(self.MeasuredBloodPumpMCSpeed) + " Meas Curr: " + str(self.MeasuredBloodPumpCurrent)) + self.MeasuredBloodPumpRotorSpeed = struct.unpack('f', bytearray(message['message'][12:16])) + self.MeasuredBloodPumpSpeed = struct.unpack('f', bytearray(message['message'][16:20])) + self.MeasuredBloodPumpMCSpeed = struct.unpack('f', bytearray(message['message'][20:24])) + self.MeasuredBloodPumpMCCurrent = struct.unpack('f', bytearray(message['message'][24:28])) def CmdBloodFlowSetPointOverride(self, reset, flow): """