Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into ls-modem

Browse source
This commit is contained in:
DJ2LS 2023-10-23 21:02:21 +02:00 committed by GitHub
commit ea4d0f21f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/build_multiplatform.yml vendored
View file

@ -388,6 +388,7 @@ jobs:
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/v') if: startsWith(github.ref, 'refs/tags/v')
with: with:
draft: true
files: ./modem/dist/modem/${{ matrix.zip_name }}.zip files: ./modem/dist/modem/${{ matrix.zip_name }}.zip
#files: ./modem/dist/${{ matrix.zip_name }}.zip #files: ./modem/dist/${{ matrix.zip_name }}.zip

7
modem/mesh.py
View file

@ -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