From 38caea01f55a2abc0613193629f50bb4a4ade78a Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 14:39:43 +0200 Subject: [PATCH 1/3] publish modem data as draft --- .github/workflows/build_multiplatform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 620881fa..dcb67591 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -388,6 +388,7 @@ jobs: uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/v') with: + draft: true files: ./modem/dist/modem/${{ matrix.zip_name }}.zip #files: ./modem/dist/${{ matrix.zip_name }}.zip From e2da509898d3dfa2ab61e1be22249cc52f2ce1f5 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 20:16:02 +0200 Subject: [PATCH 2/3] closes 492 --- modem/mesh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modem/mesh.py b/modem/mesh.py index a08303ef..ca027c2a 100644 --- a/modem/mesh.py +++ b/modem/mesh.py @@ -37,7 +37,7 @@ SNR: negative --> * 2 # pylint: disable=import-outside-toplevel, attribute-defined-outside-init 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 import numpy as np From 31cbdbeaf020f516f4151d047e934a207ac80d64 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 20:42:20 +0200 Subject: [PATCH 3/3] closes 471 --- modem/mesh.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modem/mesh.py b/modem/mesh.py index ca027c2a..af0ac5bd 100644 --- a/modem/mesh.py +++ b/modem/mesh.py @@ -143,10 +143,13 @@ class MeshRouter(): snr = bytes(item[snr_position], "utf-8").split(b"/") snr = int(float(snr[0])) except Exception as err: + self.log.debug("[MESH] error handling SNR calculation", e=err) 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]] self.add_router_to_routing_table(new_router) + except Exception as e: self.log.warning("[MESH] error fetching data from heard station list", e=e) @@ -171,7 +174,7 @@ class MeshRouter(): except Exception as e: 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: # always enable receiving for datac4 if broadcasting