mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
reduced logging and added transmit queue size for debugging purposes
This commit is contained in:
parent
d9a7d392ce
commit
11512d76bf
2 changed files with 16 additions and 12 deletions
|
@ -336,7 +336,7 @@ class DATA:
|
||||||
# Dispatch activity based on received frametype
|
# Dispatch activity based on received frametype
|
||||||
if frametype in self.rx_dispatcher:
|
if frametype in self.rx_dispatcher:
|
||||||
# Process frames "known" by 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])
|
self.rx_dispatcher[frametype][0](bytes_out[:-2])
|
||||||
|
|
||||||
# Process frametypes requiring a different set of arguments.
|
# Process frametypes requiring a different set of arguments.
|
||||||
|
@ -799,7 +799,7 @@ class DATA:
|
||||||
|
|
||||||
# Check if data_frame_crc is equal with received crc
|
# Check if data_frame_crc is equal with received crc
|
||||||
if data_frame_crc == data_frame_crc_received:
|
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
|
# Decompress the data frame
|
||||||
data_frame_decompressed = zlib.decompress(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.tx_n_retry_of_burst = 0 # reset retries
|
||||||
self.log.debug(
|
self.log.debug(
|
||||||
"[TNC] arq_transmit: Received BURST ACK. Sending next chunk."
|
"[TNC] arq_transmit: Received BURST ACK. Sending next chunk."
|
||||||
)
|
, irs_snr=self.burst_ack_snr)
|
||||||
break # break retry loop
|
break # break retry loop
|
||||||
|
|
||||||
if self.burst_nack:
|
if self.burst_nack:
|
||||||
|
@ -1252,17 +1252,16 @@ class DATA:
|
||||||
self.data_channel_last_received = int(time.time())
|
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 = int.from_bytes(bytes(data_in[2:3]), "big")
|
||||||
self.burst_ack_snr = helpers.snr_from_bytes(data_in[2:3])
|
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")
|
self.speed_level = int.from_bytes(bytes(data_in[3:4]), "big")
|
||||||
static.ARQ_SPEED_LEVEL = self.speed_level
|
static.ARQ_SPEED_LEVEL = self.speed_level
|
||||||
|
|
||||||
|
#self.log.debug(
|
||||||
self.log.debug(
|
# f"[TNC] burst_{desc}_received:",
|
||||||
f"[TNC] burst_{desc}_received:",
|
# speed_level=self.speed_level,
|
||||||
speed_level=self.speed_level,
|
# c2_mode=FREEDV_MODE(self.mode_list[self.speed_level]).name,
|
||||||
c2_mode=FREEDV_MODE(self.mode_list[self.speed_level]).name,
|
#)
|
||||||
)
|
|
||||||
|
|
||||||
def frame_ack_received(
|
def frame_ack_received(
|
||||||
self, data_in: bytes # pylint: disable=unused-argument
|
self, data_in: bytes # pylint: disable=unused-argument
|
||||||
|
|
|
@ -402,7 +402,7 @@ class RF:
|
||||||
frames:
|
frames:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
self.log.debug("[MDM] transmit", mode=mode)
|
# self.log.debug("[MDM] transmit", mode=mode)
|
||||||
static.TRANSMITTING = True
|
static.TRANSMITTING = True
|
||||||
start_of_transmission = time.time()
|
start_of_transmission = time.time()
|
||||||
# Toggle ptt early to save some time and send ptt state via socket
|
# Toggle ptt early to save some time and send ptt state via socket
|
||||||
|
@ -753,9 +753,14 @@ class RF:
|
||||||
def worker_transmit(self) -> None:
|
def worker_transmit(self) -> None:
|
||||||
"""Worker for FIFO queue for processing frames to be transmitted"""
|
"""Worker for FIFO queue for processing frames to be transmitted"""
|
||||||
while True:
|
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()
|
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(
|
self.transmit(
|
||||||
mode=data[0], repeats=data[1], repeat_delay=data[2], frames=data[3]
|
mode=data[0], repeats=data[1], repeat_delay=data[2], frames=data[3]
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue