From ba846013e8726fb2669a041217636d987a1f71ea Mon Sep 17 00:00:00 2001 From: Pedro Date: Wed, 13 Dec 2023 14:59:22 +0100 Subject: [PATCH] ARQ progress --- modem/arq_session_irs.py | 6 +++--- modem/data_frame_factory.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modem/arq_session_irs.py b/modem/arq_session_irs.py index ea011905..bcbea9d1 100644 --- a/modem/arq_session_irs.py +++ b/modem/arq_session_irs.py @@ -112,7 +112,7 @@ class ARQSessionIRS(arq_session.ARQSession): builder = self.frame_factory.build_arq_burst_nack frame = builder ( - self.session_id, self.received_bytes, + self.id, self.received_bytes, self.speed_level, self.frames_per_burst, self.snr) self.transmit_frame(frame) @@ -129,14 +129,14 @@ class ARQSessionIRS(arq_session.ARQSession): self.calibrate_speed_settings() self.set_modem_decode_modes(None) - + self.event_info_received.set() def on_data_received(self, frame): if self.state != self.STATE_WAITING_DATA: raise RuntimeError(f"ARQ Session: Received data while in state {self.state}, expected {self.STATE_WAITING_DATA}") - self.frame_received = frame + self.received_frame = frame self.event_data_received.set() def process_incoming_data(self): diff --git a/modem/data_frame_factory.py b/modem/data_frame_factory.py index 623dcc87..c488222f 100644 --- a/modem/data_frame_factory.py +++ b/modem/data_frame_factory.py @@ -342,7 +342,7 @@ class DataFrameFactory: def build_arq_burst_ack(self, session_id: bytes, offset, speed_level: int, frames_per_burst: int, snr: int): payload = { - "session_id": session_id, + "session_id": session_id.to_bytes(1, 'big'), "offset": offset.to_bytes(4, 'big'), "speed_level": speed_level.to_bytes(1, 'big'), "frames_per_burst": frames_per_burst.to_bytes(1, 'big'), @@ -353,7 +353,7 @@ class DataFrameFactory: def build_arq_burst_nack(self, session_id: bytes, offset, speed_level: int, frames_per_burst: int, snr: int): payload = { - "session_id": session_id, + "session_id": session_id.to_bytes(1, 'big'), "offset": offset.to_bytes(4, 'big'), "speed_level": speed_level.to_bytes(1, 'big'), "frames_per_burst": frames_per_burst.to_bytes(1, 'big'),