Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -r9904f1ca279d6c71e6ee12e6503ec609d52fa3e0 -rcd4a454309e537e52d2e5c064611ebf986cbe359 --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 9904f1ca279d6c71e6ee12e6503ec609d52fa3e0) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision cd4a454309e537e52d2e5c064611ebf986cbe359) @@ -80,11 +80,11 @@ rpm = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) rot = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_7])) + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) pres = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_8])) + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) hal = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_9])) + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) self.set_blood_flow_rate = tgt[0] self.measured_blood_flow_rate = flow[0] @@ -123,19 +123,8 @@ # If there is content... if received_message is not None: - # self.logger.debug(received_message) - if reset == RESET: - str_res = "reset back to normal" - else: - str_res = str(flow) - - if mode == PUMP_CONTROL_MODE_OPEN_LOOP: - str_mode = " (open loop): " - else: - str_mode = " (closed loop): " self.logger.debug( - "Blood flow set point overridden to " + str_res + " mL/min" + str_mode + - + "Blood flow set point overridden to " + str(flo) + " mL/min" + str(mod) + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] @@ -145,7 +134,7 @@ def cmd_blood_flow_set_speed_rate_request(self, rpm: int) -> int: """ - Constructs and sends the blood flow set point command + Constructs and sends the blood flow set speed command Constraints: Must be logged into TD. @@ -167,19 +156,8 @@ # If there is content... if received_message is not None: - # self.logger.debug(received_message) - if reset == RESET: - str_res = "reset back to normal" - else: - str_res = str(flow) - - if mode == PUMP_CONTROL_MODE_OPEN_LOOP: - str_mode = " (open loop): " - else: - str_mode = " (closed loop): " self.logger.debug( - "Blood flow set point overridden to " + str_res + " mL/min" + str_mode + - + "Blood flow speed rate to " + str(rpm) + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rcd4a454309e537e52d2e5c064611ebf986cbe359 --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision cd4a454309e537e52d2e5c064611ebf986cbe359) @@ -228,8 +228,8 @@ if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: self.logger.debug("Success: Logged In") self.td_set_logged_in_status(True) - self._send_td_checkin_message() # Timer starts interval first - self.can_interface.transmit_interval_dictionary[self.callback_id].start() + #self._send_td_checkin_message() # Timer starts interval first + #self.can_interface.transmit_interval_dictionary[self.callback_id].start() else: self.logger.debug("Failure: Log In Failed.") return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] @@ -307,7 +307,7 @@ @return: none """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.TD_to_ui_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.td_to_ui_ch_id, message_id=MsgIds.MSG_ID_TD_UI_VERSION_INFO_REQUEST.value) self.logger.debug("Sending an UI version request to the TD.")