From 11512d76bfa3362abcb9bcc47f26206464634d70 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sun, 11 Dec 2022 11:57:37 +0100 Subject: [PATCH] reduced logging and added transmit queue size for debugging purposes --- tnc/data_handler.py | 19 +++++++++---------- tnc/modem.py | 9 +++++++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/tnc/data_handler.py b/tnc/data_handler.py index 8ca06357..0d852640 100644 --- a/tnc/data_handler.py +++ b/tnc/data_handler.py @@ -336,7 +336,7 @@ class DATA: # Dispatch activity based on received frametype if frametype in self.rx_dispatcher: # Process frames "known" by rx_dispatcher - self.log.debug(f"[TNC] {self.rx_dispatcher[frametype][1]} RECEIVED....") + # self.log.debug(f"[TNC] {self.rx_dispatcher[frametype][1]} RECEIVED....") self.rx_dispatcher[frametype][0](bytes_out[:-2]) # Process frametypes requiring a different set of arguments. @@ -799,7 +799,7 @@ class DATA: # Check if data_frame_crc is equal with received crc if data_frame_crc == data_frame_crc_received: - self.log.info("[TNC] ARQ | RX | DATA FRAME SUCESSFULLY RECEIVED") + self.log.info("[TNC] ARQ | RX | DATA FRAME SUCCESSFULLY RECEIVED") # Decompress the data frame data_frame_decompressed = zlib.decompress(data_frame) @@ -1093,7 +1093,7 @@ class DATA: self.tx_n_retry_of_burst = 0 # reset retries self.log.debug( "[TNC] arq_transmit: Received BURST ACK. Sending next chunk." - ) + , irs_snr=self.burst_ack_snr) break # break retry loop if self.burst_nack: @@ -1252,17 +1252,16 @@ class DATA: self.data_channel_last_received = int(time.time()) # self.burst_ack_snr = int.from_bytes(bytes(data_in[2:3]), "big") self.burst_ack_snr = helpers.snr_from_bytes(data_in[2:3]) - self.log.info("SNR ON IRS", snr=self.burst_ack_snr) + # self.log.info("SNR ON IRS", snr=self.burst_ack_snr) self.speed_level = int.from_bytes(bytes(data_in[3:4]), "big") static.ARQ_SPEED_LEVEL = self.speed_level - - self.log.debug( - f"[TNC] burst_{desc}_received:", - speed_level=self.speed_level, - c2_mode=FREEDV_MODE(self.mode_list[self.speed_level]).name, - ) + #self.log.debug( + # f"[TNC] burst_{desc}_received:", + # speed_level=self.speed_level, + # c2_mode=FREEDV_MODE(self.mode_list[self.speed_level]).name, + #) def frame_ack_received( self, data_in: bytes # pylint: disable=unused-argument diff --git a/tnc/modem.py b/tnc/modem.py index 0df0719c..a7f99adf 100644 --- a/tnc/modem.py +++ b/tnc/modem.py @@ -402,7 +402,7 @@ class RF: frames: """ - self.log.debug("[MDM] transmit", mode=mode) + # self.log.debug("[MDM] transmit", mode=mode) static.TRANSMITTING = True start_of_transmission = time.time() # Toggle ptt early to save some time and send ptt state via socket @@ -753,9 +753,14 @@ class RF: def worker_transmit(self) -> None: """Worker for FIFO queue for processing frames to be transmitted""" while True: + # print queue size for debugging purposes + # TODO: Lets check why we have several frames in our transmit queue which causes sometimes a double transmission + # we could do a cleanup after a transmission so theres no reason sending twice + queuesize = self.modem_transmit_queue.qsize() + self.log.debug("[MDM] self.modem_transmit_queue", qsize=queuesize) data = self.modem_transmit_queue.get() - self.log.debug("[MDM] worker_transmit", mode=data[0]) + # self.log.debug("[MDM] worker_transmit", mode=data[0]) self.transmit( mode=data[0], repeats=data[1], repeat_delay=data[2], frames=data[3] )