mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Merge branch 'main' into ls-github-action
This commit is contained in:
commit
8de7303543
1 changed files with 5 additions and 2 deletions
|
@ -37,7 +37,7 @@ SNR: negative --> * 2
|
||||||
# pylint: disable=import-outside-toplevel, attribute-defined-outside-init
|
# pylint: disable=import-outside-toplevel, attribute-defined-outside-init
|
||||||
|
|
||||||
from static import FRAME_TYPE
|
from static import FRAME_TYPE
|
||||||
from global_instances import ARQ, AudioParam, Beacon, Channel, Daemon, HamlibParam, ModemParam, Station, Statistics, TCIParam, Modem
|
from global_instances import ARQ, AudioParam, Beacon, Channel, Daemon, HamlibParam, ModemParam, MeshParam, Station, Statistics, TCIParam, Modem
|
||||||
|
|
||||||
from codec2 import FREEDV_MODE
|
from codec2 import FREEDV_MODE
|
||||||
import numpy as np
|
import numpy as np
|
||||||
|
@ -143,10 +143,13 @@ class MeshRouter():
|
||||||
snr = bytes(item[snr_position], "utf-8").split(b"/")
|
snr = bytes(item[snr_position], "utf-8").split(b"/")
|
||||||
snr = int(float(snr[0]))
|
snr = int(float(snr[0]))
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
|
self.log.debug("[MESH] error handling SNR calculation", e=err)
|
||||||
snr = int(float(item[snr_position]))
|
snr = int(float(item[snr_position]))
|
||||||
|
|
||||||
|
snr = np.clip(snr, -12, 12) # limit to max value of -12/12
|
||||||
new_router = [helpers.get_crc_24(item[dxcallsign_position]), helpers.get_crc_24(b'direct'), 0, snr, self.calculate_score_by_snr(snr), item[timestamp_position]]
|
new_router = [helpers.get_crc_24(item[dxcallsign_position]), helpers.get_crc_24(b'direct'), 0, snr, self.calculate_score_by_snr(snr), item[timestamp_position]]
|
||||||
self.add_router_to_routing_table(new_router)
|
self.add_router_to_routing_table(new_router)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.log.warning("[MESH] error fetching data from heard station list", e=e)
|
self.log.warning("[MESH] error fetching data from heard station list", e=e)
|
||||||
|
|
||||||
|
@ -171,7 +174,7 @@ class MeshRouter():
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.log.warning("[MESH] error adding data to routing table", e=e, router=new_router)
|
self.log.warning("[MESH] error adding data to routing table", e=e, router=new_router)
|
||||||
|
|
||||||
def broadcast_routing_table(self, interval=600):
|
def broadcast_routing_table(self, interval=10):
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
# always enable receiving for datac4 if broadcasting
|
# always enable receiving for datac4 if broadcasting
|
||||||
|
|
Loading…
Reference in a new issue