From 0e8e3d1b670149be6521a19b2260810746b7abef Mon Sep 17 00:00:00 2001 From: dj2ls Date: Sun, 1 May 2022 11:19:59 +0200 Subject: [PATCH] fixed file transfer for 24bit crc --- tnc/data_handler.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tnc/data_handler.py b/tnc/data_handler.py index 4ccc0a27..4dcec71d 100644 --- a/tnc/data_handler.py +++ b/tnc/data_handler.py @@ -385,7 +385,9 @@ class DATA(): static.RX_BURST_BUFFER = [None] * RX_N_FRAMES_PER_BURST # append data to rx burst buffer - static.RX_BURST_BUFFER[RX_N_FRAME_OF_BURST] = data_in[6:] # [frame_type][n_frames_per_burst][CRC16][CRC16] + static.RX_BURST_BUFFER[RX_N_FRAME_OF_BURST] = data_in[8:] # [frame_type][n_frames_per_burst][CRC24][CRC24] + + structlog.get_logger("structlog").debug("[TNC] static.RX_BURST_BUFFER", buffer=static.RX_BURST_BUFFER) @@ -543,9 +545,11 @@ class DATA(): static.TOTAL_BYTES = frame_length # 8:9 = compression factor + data_frame = payload[9:] data_frame_crc_received = helpers.get_crc_32(data_frame) + # check if data_frame_crc is equal with received crc if data_frame_crc == data_frame_crc_received: structlog.get_logger("structlog").info("[TNC] ARQ | RX | DATA FRAME SUCESSFULLY RECEIVED") @@ -688,6 +692,9 @@ class DATA(): # append a crc and beginn and end of file indicators frame_payload_crc = helpers.get_crc_32(data_out) + structlog.get_logger("structlog").debug("frame payload crc", crc=frame_payload_crc) + + # data_out = self.data_frame_bof + frame_payload_crc + data_out + self.data_frame_eof data_out = self.data_frame_bof + frame_payload_crc + frame_total_size + compression_factor + data_out + self.data_frame_eof