From 75dfa4d28a35cc3ed0c876696fb8340373080c4c Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Fri, 1 Dec 2023 16:57:59 +0100 Subject: [PATCH] adjusted activities for rx'ed frames --- modem/frame_dispatcher.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modem/frame_dispatcher.py b/modem/frame_dispatcher.py index 9f7a9cf7..f83d53e0 100644 --- a/modem/frame_dispatcher.py +++ b/modem/frame_dispatcher.py @@ -174,15 +174,25 @@ class DISPATCHER(): MODEM_TRANSMIT_QUEUE, self.arq_sessions) + + activity = { - "dxcallsign": deconstructed_frame["origin"], "direction": "received", - "dxgrid": deconstructed_frame["gridsquare"], "snr": snr, "offset": offset, "activity_type": self.FRAME_HANDLER[frametype]['name'] } + if "origin" in deconstructed_frame: + activity["origin"] = deconstructed_frame["origin"] + + if "gridsquare" in deconstructed_frame: + activity["gridsquare"] = deconstructed_frame["gridsquare"] + + if "session_id" in deconstructed_frame: + activity["session_id"] = deconstructed_frame["session_id"] + self.states.add_activity(activity) + handler.handle(deconstructed_frame, snr, offset, freedv, bytes_per_frame) def old_process_data(self, bytes_out, freedv, bytes_per_frame: int, snr) -> None: