From 966821cef8bc89483ba2818626c118087452d4a0 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Fri, 5 Jan 2024 16:25:14 +0100 Subject: [PATCH] ARQ WIP - fixed mode not decoding --- modem/arq_session.py | 2 +- modem/arq_session_irs.py | 3 +++ modem/demodulator.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modem/arq_session.py b/modem/arq_session.py index 76b33189..6873283c 100644 --- a/modem/arq_session.py +++ b/modem/arq_session.py @@ -46,7 +46,7 @@ class ARQSession(): self.id = None def log(self, message, isWarning = False): - msg = f"[{type(self).__name__}][state={self.state}]: {message}" + msg = f"[{type(self).__name__}][id={self.id}][state={self.state}]: {message}" logger = self.logger.warn if isWarning else self.logger.info logger(msg) diff --git a/modem/arq_session_irs.py b/modem/arq_session_irs.py index 3b78fe99..ff573022 100644 --- a/modem/arq_session_irs.py +++ b/modem/arq_session_irs.py @@ -124,6 +124,7 @@ class ARQSessionIRS(arq_session.ARQSession): self.event_manager.send_arq_session_new(False, self.id, self.dxcall, self.total_length, self.state.name) self.calibrate_speed_settings() + self.set_decode_mode() info_ack = self.frame_factory.build_arq_session_info_ack( self.id, self.total_crc, self.snr[0], @@ -165,6 +166,8 @@ class ARQSessionIRS(arq_session.ARQSession): self.id, self.received_bytes, self.speed_level, self.frames_per_burst, self.snr[0], flag_abort=self.abort) + self.set_decode_mode() + # increase ack counter # self.transmitted_acks += 1 self.set_state(IRS_State.BURST_REPLY_SENT) diff --git a/modem/demodulator.py b/modem/demodulator.py index 49673c5e..491ca9c7 100644 --- a/modem/demodulator.py +++ b/modem/demodulator.py @@ -391,6 +391,6 @@ class Demodulator(): # Enable mode based on speed_level self.MODE_DICT[mode.value]["decode"] = True - self.log.info(f"Demodulator data mode {mode.name}") + self.log.info(f"[MDM] [demod_audio] set data mode: {mode.name}") return