diff --git a/comIF/obsw_serial_com_if.py b/comIF/obsw_serial_com_if.py index 321190b85e4fc02cb6ef9c0b35c55da331540a65..ce2538e4425c94ffad7e4cb8f0d8e10a0c7381ea 100644 --- a/comIF/obsw_serial_com_if.py +++ b/comIF/obsw_serial_com_if.py @@ -92,20 +92,14 @@ class SerialComIF(CommunicationInterface): return [], 0 read_size = len(self.data) self.number_of_packets = 1 - pus_data_list.append(self.data) - #if read_size < packet_size: - # print("Serial Com IF: Size missmatch when polling PUS wiretapping_packet. Packet Size: " + - # str(packet_size) + ". Read Size: " + str(read_size) + ". Check timeout too") - if read_size > packet_size: - self.__handle_multiple_packets(packet_size, read_size, pus_data_list) + pus_data = self.data[0:packet_size] + pus_data_list.append(pus_data) + self.__handle_multiple_packets(packet_size, read_size, pus_data_list) return pus_data_list, self.number_of_packets def __handle_multiple_packets(self, packet_size: int, read_size: int, pus_data_list: list): end_of_buffer = read_size - 1 end_index = packet_size - start_index = 0 - pus_data = self.data[start_index:end_index] - pus_data_list.append(pus_data) while end_index < end_of_buffer: end_index = self.__parse_next_packets(end_index, pus_data_list) diff --git a/obsw_tmtc_client.py b/obsw_tmtc_client.py index 76ef4bfe4cf5164bf9da2dac48606c02db6ca4da..4df679848073dcb3c2e57a767f72bb65c15f0438 100644 --- a/obsw_tmtc_client.py +++ b/obsw_tmtc_client.py @@ -181,7 +181,7 @@ def set_communication_interface(tmtc_printer: TmTcPrinterT) -> ComIfT: receiveAddress=g.G_REC_ADDRESS) else: com_port = g.G_COM_PORT - baud_rate = 115200 + baud_rate = 250000 g.G_SERIAL_TIMEOUT = 1 communication_interface = SerialComIF( tmtc_printer=tmtc_printer, com_port=com_port, baud_rate=baud_rate, diff --git a/utility/obsw_tmtc_printer.py b/utility/obsw_tmtc_printer.py index e8ba7b046f326a1367589b438d5acafa7f4654e7..f723157852da1d3d1a8cb47277a8fa912ae6c121 100644 --- a/utility/obsw_tmtc_printer.py +++ b/utility/obsw_tmtc_printer.py @@ -184,7 +184,7 @@ class TmTcPrinter: :return: """ if tm_packet.get_service() == 8 and tm_packet.get_subservice() == 130: - self.print_buffer = "Service 8 Direct Command Reply TM[8,130] with _tm_data: " \ + self.print_buffer = "Service 8 Direct Command Reply TM[8,130] with TM data: " \ + tm_packet.return_data_string() print(self.print_buffer)