mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
changed freq_offset to frequency_offset for equal naming
This commit is contained in:
parent
cefaea2369
commit
2e02186ea6
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue