From 2e02186ea686ba4772c80f80cdc324e49e1dd934 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Tue, 12 Dec 2023 09:41:08 +0100 Subject: [PATCH] changed freq_offset to frequency_offset for equal naming --- modem/data_frame_factory.py | 1 - modem/frame_handler.py | 10 +++++----- modem/frame_handler_arq_session.py | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modem/data_frame_factory.py b/modem/data_frame_factory.py index c1041b38..2bb86826 100644 --- a/modem/data_frame_factory.py +++ b/modem/data_frame_factory.py @@ -199,7 +199,6 @@ class DataFrameFactory: def deconstruct(self, frame): buffer_position = 1 - # Extract frametype and get the corresponding template frametype = int.from_bytes(frame[:1], "big") frame_template = self.template_list.get(frametype) diff --git a/modem/frame_handler.py b/modem/frame_handler.py index 7bab6cd5..077d8dfe 100644 --- a/modem/frame_handler.py +++ b/modem/frame_handler.py @@ -21,7 +21,7 @@ class FrameHandler(): self.details = { 'frame' : None, 'snr' : 0, - 'freq_offset': 0, + 'frequency_offset': 0, 'freedv_inst': None, 'bytes_per_frame': 0 } @@ -34,7 +34,7 @@ class FrameHandler(): activity = { "direction": "received", "snr": self.details['snr'], - "freq_offset": self.details['freq_offset'], + "frequency_offset": self.details['frequency_offset'], "activity_type": frame["frame_type"] } if "origin" in frame: @@ -64,7 +64,7 @@ class FrameHandler(): dxgrid, self.name, self.details['snr'], - self.details['freq_offset'], + self.details['frequency_offset'], self.states.radio_frequency, self.states.heard_stations, ) @@ -112,10 +112,10 @@ class FrameHandler(): self.logger.info(f"[Frame Handler] Handling frame {self.details['frame']}") pass - def handle(self, frame, snr, freq_offset, freedv_inst, bytes_per_frame): + def handle(self, frame, snr, frequency_offset, freedv_inst, bytes_per_frame): self.details['frame'] = frame self.details['snr'] = snr - self.details['freq_offset'] = freq_offset + self.details['frequency_offset'] = frequency_offset self.details['freedv_inst'] = freedv_inst self.details['bytes_per_frame'] = bytes_per_frame diff --git a/modem/frame_handler_arq_session.py b/modem/frame_handler_arq_session.py index 2de7d19b..5913b47e 100644 --- a/modem/frame_handler_arq_session.py +++ b/modem/frame_handler_arq_session.py @@ -9,6 +9,7 @@ from arq_session_iss import ARQSessionISS class ARQFrameHandler(frame_handler.FrameHandler): def follow_protocol(self): + # self.details == {'frame': {'frame_type': 'BURST_01', 'frame_type_int': 1, 'n_frames_per_burst': 1, 'session_id': 31, 'data': b'Hello world!'}, 'snr': 0, 'frequency_offset': 0, 'freedv_inst': None, 'bytes_per_frame': 15} frame = self.details['frame'] # ARQ session open received