Index: HemodialysisDevice.py =================================================================== diff -u -r31b7863514f8099122a029151172cda9d1880d90 -r8e5f99291989ba68281aa5e763a7eb5df87e170e --- HemodialysisDevice.py (.../HemodialysisDevice.py) (revision 31b7863514f8099122a029151172cda9d1880d90) +++ HemodialysisDevice.py (.../HemodialysisDevice.py) (revision 8e5f99291989ba68281aa5e763a7eb5df87e170e) @@ -95,8 +95,12 @@ received_message = self.outer_instance.can_interface.send(message) if received_message is not None: - print(received_message) - print("Logged In: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) + #print(received_message) + if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: + print("Logged In") + else: + print("Log In Failed.") + #print("Logged In: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: print("Timeout!!!!") @@ -123,7 +127,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) print("Inserted message: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] @@ -177,7 +181,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -215,7 +219,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -275,7 +279,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -395,7 +399,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -434,7 +438,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -571,9 +575,11 @@ \returns none """ - self.TargetBloodFlowRate = int.from_bytes(bytearray( - message['message'][self.START_POS_SET_PT:self.END_POS_SET_PT]), - byteorder=DenaliMessage.BYTE_ORDER) + #self.TargetBloodFlowRate = int.from_bytes(bytearray( + # message['message'][self.START_POS_SET_PT:self.END_POS_SET_PT]), + # byteorder=DenaliMessage.BYTE_ORDER) + tgt = struct.unpack('i',bytearray( + message['message'][self.START_POS_SET_PT:self.END_POS_SET_PT])) flow = struct.unpack('f', bytearray( message['message'][self.START_POS_MEAS_FLOW:self.END_POS_MEAS_FLOW])) rotor = struct.unpack('f', bytearray( @@ -587,6 +593,7 @@ pwm = struct.unpack('f', bytearray( message['message'][self.START_POS_PWM_DC:self.END_POS_PWM_DC])) + self.TargetBloodFlowRate = tgt[0] self.MeasuredBloodFlowRate = flow[0] self.MeasuredBloodPumpRotorSpeed = rotor[0] self.MeasuredBloodPumpSpeed = speed[0] @@ -618,7 +625,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -656,7 +663,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -694,7 +701,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -731,7 +738,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -769,7 +776,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -807,7 +814,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -844,7 +851,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal: " else: @@ -971,7 +978,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -1009,7 +1016,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -1047,7 +1054,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -1084,7 +1091,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -1122,7 +1129,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -1160,7 +1167,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal" else: @@ -1197,7 +1204,7 @@ # If there is content... if received_message is not None: - print(received_message) + #print(received_message) if reset == HD.RESET: str_res = "reset back to normal: " else: Index: Miscellaneous/HD_TestScript.py =================================================================== diff -u -r3f171e5d0207b44d3008de8d213e7e513eb11729 -r8e5f99291989ba68281aa5e763a7eb5df87e170e --- Miscellaneous/HD_TestScript.py (.../HD_TestScript.py) (revision 3f171e5d0207b44d3008de8d213e7e513eb11729) +++ Miscellaneous/HD_TestScript.py (.../HD_TestScript.py) (revision 8e5f99291989ba68281aa5e763a7eb5df87e170e) @@ -20,28 +20,52 @@ from time import sleep if __name__ == "__main__": - # for reset param in override commands - SLOW_BROADCAST_INTERVAL = 2000 - FAST_BROADCAST_INTERVAL = 200 - # create an HD object called hd hd = HD() + sleep(2) - # wait 2 seconds and then login to HD as a tester + if hd._Basics.CmdLogInToHD() == 0: + exit(1) + + hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.RESET, 0) + sleep(2) - hd._Basics.CmdLogInToHD() + print("Blood Flow Target = " + str(hd.BloodFlow.TargetBloodFlowRate)) + print("Blood Pump Current= " + str(hd.BloodFlow.MeasuredBloodPumpMCCurrent)) + sleep(5) + print("Blood Pump Current= " + str(hd.BloodFlow.MeasuredBloodPumpMCCurrent)) + hd.BloodFlow.CmdBloodPumpMeasuredCurrentOverride(hd.NO_RESET, 140) + + sleep(1) + print("Blood Pump Current= " + str(hd.BloodFlow.MeasuredBloodPumpMCCurrent)) + sleep(5) + hd.BloodFlow.CmdBloodPumpMeasuredCurrentOverride(hd.RESET, 0) + + while True: + sleep(0.5) + print("Measured Flow = " + str(hd.BloodFlow.MeasuredBloodFlowRate) + " mL/min") + + + + + + + + + + tgtRate = 0 - hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, SLOW_BROADCAST_INTERVAL) + hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 2000) while True: if hd.BloodFlow.TargetBloodFlowRate == 0: if tgtRate != 0: - hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, SLOW_BROADCAST_INTERVAL) + hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 2000) tgtRate = 0 else: if tgtRate == 0: - hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, FAST_BROADCAST_INTERVAL) + hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 200) tgtRate = hd.BloodFlow.TargetBloodFlowRate # hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.RESET,0)