From ff13009699087d742e1257a723873457178cad87 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" <robin.mueller.m@gmail.com> Date: Mon, 5 Oct 2020 23:35:20 +0200 Subject: [PATCH] some bugfixes --- tc/obsw_tc_service23.py | 4 +++- utility/obsw_binary_uploader.py | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tc/obsw_tc_service23.py b/tc/obsw_tc_service23.py index 513c87d..01d0315 100644 --- a/tc/obsw_tc_service23.py +++ b/tc/obsw_tc_service23.py @@ -89,6 +89,9 @@ class FileTransferHelper: """ self.max_file_data_size = max_file_data_size + def queue_size(self): + return len(self.tc_queue) + def generate_packets(self, ssc: int): if self.transfer_mode == self.TransferMode.DELETE_OLD: command = generate_rm_file_srv23_2_packet(self.target_filename, self.target_repository, @@ -165,7 +168,6 @@ class FileTransferHelper: packet_sequence_number = 0 for i in range(number_of_packets): - print("appending split") header.append(packet_sequence_number >> 8) header.append(0xFF & packet_sequence_number) header += data[i * size_of_data_blocks:(i + 1) * size_of_data_blocks] diff --git a/utility/obsw_binary_uploader.py b/utility/obsw_binary_uploader.py index c489847..55afa4b 100644 --- a/utility/obsw_binary_uploader.py +++ b/utility/obsw_binary_uploader.py @@ -71,7 +71,7 @@ def perform_binary_upload(com_if: CommunicationInterface, tmtc_printer: TmTcPrin # Delete existing binary file first, otherwise data might be appended to otherwise # valid file which already exists. file_transfer_helper = FileTransferHelper( - tc_queue=tc_queue, max_size_of_app_data=1500, target_repository="BIN/AT91/BL", + tc_queue=tc_queue, max_size_of_app_data=1400, target_repository="BIN/AT91/BL", target_filename="bl.bin") init_ssc = 0 @@ -79,13 +79,17 @@ def perform_binary_upload(com_if: CommunicationInterface, tmtc_printer: TmTcPrin file_transfer_helper.set_data_from_file(file_path) file_transfer_helper.set_to_delete_old_file() file_transfer_helper.generate_packets(init_ssc) + print_string = str(file_transfer_helper.queue_size()) + " packets generated.." + LOGGER.info(print_string) idx = 1 while tc_queue: (tc_packet, tc_info) = tc_queue.pop() if not isinstance(tc_packet, str): print_string = "Sending packet " + str(idx) + idx += 1 LOGGER.info(print_string) + print("Sending packet with length " + str(len(tc_packet)) + " ..") com_if.send_telecommand(tc_packet, tc_info) elif tc_packet == "print": LOGGER.info(tc_info) -- GitLab