mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
cleanup and improved logging
This commit is contained in:
parent
b3595fb033
commit
dba7f63de8
|
@ -649,7 +649,7 @@ class DATA:
|
||||||
|
|
||||||
if bof_position >= 0:
|
if bof_position >= 0:
|
||||||
payload = static.RX_FRAME_BUFFER[
|
payload = static.RX_FRAME_BUFFER[
|
||||||
bof_position + len(self.data_frame_bof) : eof_position
|
bof_position + len(self.data_frame_bof): eof_position
|
||||||
]
|
]
|
||||||
frame_length = int.from_bytes(payload[4:8], "big") # 4:8 4bytes
|
frame_length = int.from_bytes(payload[4:8], "big") # 4:8 4bytes
|
||||||
static.TOTAL_BYTES = frame_length
|
static.TOTAL_BYTES = frame_length
|
||||||
|
@ -676,7 +676,7 @@ class DATA:
|
||||||
|
|
||||||
# Extract raw data from buffer
|
# Extract raw data from buffer
|
||||||
payload = static.RX_FRAME_BUFFER[
|
payload = static.RX_FRAME_BUFFER[
|
||||||
bof_position + len(self.data_frame_bof) : eof_position
|
bof_position + len(self.data_frame_bof): eof_position
|
||||||
]
|
]
|
||||||
# Get the data frame crc
|
# Get the data frame crc
|
||||||
data_frame_crc = payload[:4] # 0:4 = 4 bytes
|
data_frame_crc = payload[:4] # 0:4 = 4 bytes
|
||||||
|
@ -1202,8 +1202,8 @@ class DATA:
|
||||||
missing_area = bytes(data_in[3:12]) # 1:9
|
missing_area = bytes(data_in[3:12]) # 1:9
|
||||||
|
|
||||||
for i in range(0, 6, 2):
|
for i in range(0, 6, 2):
|
||||||
if not missing_area[i : i + 2].endswith(b"\x00\x00"):
|
if not missing_area[i: i + 2].endswith(b"\x00\x00"):
|
||||||
missing = missing_area[i : i + 2]
|
missing = missing_area[i: i + 2]
|
||||||
self.rpt_request_buffer.insert(0, missing)
|
self.rpt_request_buffer.insert(0, missing)
|
||||||
|
|
||||||
############################################################################################################
|
############################################################################################################
|
||||||
|
@ -1567,7 +1567,7 @@ class DATA:
|
||||||
+ "]>> <<["
|
+ "]>> <<["
|
||||||
+ str(static.DXCALLSIGN, "UTF-8")
|
+ str(static.DXCALLSIGN, "UTF-8")
|
||||||
+ "]",
|
+ "]",
|
||||||
attempt=f"{str(attempt+1)}/{str(self.data_channel_max_retries)}",
|
attempt=f"{str(attempt + 1)}/{str(self.data_channel_max_retries)}",
|
||||||
)
|
)
|
||||||
|
|
||||||
self.enqueue_frame_for_tx(connection_frame)
|
self.enqueue_frame_for_tx(connection_frame)
|
||||||
|
@ -1680,12 +1680,19 @@ class DATA:
|
||||||
self.time_list = self.time_list_low_bw
|
self.time_list = self.time_list_low_bw
|
||||||
self.snr_list = self.snr_list_low_bw
|
self.snr_list = self.snr_list_low_bw
|
||||||
|
|
||||||
|
|
||||||
# get mode which fits to given SNR
|
# get mode which fits to given SNR
|
||||||
|
# initially set speed_level 0 in case of really bad SNR and no matching mode
|
||||||
|
self.speed_level = 0
|
||||||
for i in range(len(self.mode_list)):
|
for i in range(len(self.mode_list)):
|
||||||
if static.SNR >= self.snr_list[i]:
|
if static.SNR >= self.snr_list[i]:
|
||||||
self.speed_level = i
|
self.speed_level = i
|
||||||
self.log.debug("[TNC] calculated speed level", speed_level=self.speed_level, given_snr=static.SNR, min_snr=self.snr_list[self.speed_level])
|
|
||||||
|
self.log.debug(
|
||||||
|
"[TNC] calculated speed level",
|
||||||
|
speed_level=self.speed_level,
|
||||||
|
given_snr=static.SNR,
|
||||||
|
min_snr=self.snr_list[self.speed_level],
|
||||||
|
)
|
||||||
|
|
||||||
# Update modes we are listening to
|
# Update modes we are listening to
|
||||||
self.set_listening_modes(self.mode_list[self.speed_level])
|
self.set_listening_modes(self.mode_list[self.speed_level])
|
||||||
|
@ -1784,7 +1791,7 @@ class DATA:
|
||||||
# set speed level from session opener frame which is selected by SNR measurement
|
# set speed level from session opener frame which is selected by SNR measurement
|
||||||
self.speed_level = int.from_bytes(bytes(data_in[8:9]), "big")
|
self.speed_level = int.from_bytes(bytes(data_in[8:9]), "big")
|
||||||
self.log.debug("[TNC] speed level selected for given SNR", speed_level=self.speed_level)
|
self.log.debug("[TNC] speed level selected for given SNR", speed_level=self.speed_level)
|
||||||
#self.speed_level = len(self.mode_list) - 1
|
# self.speed_level = len(self.mode_list) - 1
|
||||||
|
|
||||||
helpers.add_to_heard_stations(
|
helpers.add_to_heard_stations(
|
||||||
static.DXCALLSIGN,
|
static.DXCALLSIGN,
|
||||||
|
|
Loading…
Reference in a new issue