Index: HemodialysisDevice.py =================================================================== diff -u -rbd673a479717cbbf5ad5acdb6fa0effa52904152 -r1550adb024fe0ea22b81ba8ef73387f6af7fc3e3 --- HemodialysisDevice.py (.../HemodialysisDevice.py) (revision bd673a479717cbbf5ad5acdb6fa0effa52904152) +++ HemodialysisDevice.py (.../HemodialysisDevice.py) (revision 1550adb024fe0ea22b81ba8ef73387f6af7fc3e3) @@ -97,8 +97,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!!!!") @@ -125,7 +129,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] @@ -179,7 +183,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: @@ -217,7 +221,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: @@ -277,7 +281,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: @@ -397,7 +401,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: @@ -436,7 +440,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: @@ -648,9 +652,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( @@ -664,6 +670,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] @@ -695,7 +702,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: @@ -733,7 +740,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: @@ -771,7 +778,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: @@ -808,7 +815,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: @@ -846,7 +853,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: @@ -884,7 +891,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: @@ -921,7 +928,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: @@ -1048,7 +1055,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: @@ -1086,7 +1093,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: @@ -1124,7 +1131,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: @@ -1161,7 +1168,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: @@ -1199,7 +1206,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: @@ -1237,7 +1244,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: @@ -1274,7 +1281,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: