From 33ad50fbe28f7aca7a0dd64f1db2f8bae9b90362 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Thu, 22 Feb 2024 21:49:57 +0100 Subject: [PATCH] moved from upshift downshift to speed level int --- modem/arq_session_irs.py | 2 ++ modem/arq_session_iss.py | 13 ------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/modem/arq_session_irs.py b/modem/arq_session_irs.py index 52dd8fa4..97c4a5a7 100644 --- a/modem/arq_session_irs.py +++ b/modem/arq_session_irs.py @@ -219,9 +219,11 @@ class ARQSessionIRS(arq_session.ARQSession): # Adjust the speed level by one step towards the appropriate level, if needed if appropriate_speed_level > self.speed_level and self.speed_level < len(self.SPEED_LEVEL_DICT) - 1: + # we need to ensure, the received data is equal to our speed level before changing it if received_speed_level == self.speed_level: self.speed_level += 1 elif appropriate_speed_level < self.speed_level and self.speed_level > 0: + # we need to ensure, the received data is equal to our speed level before changing it if received_speed_level == self.speed_level: self.speed_level -= 1 diff --git a/modem/arq_session_iss.py b/modem/arq_session_iss.py index 8308067d..f481c97b 100644 --- a/modem/arq_session_iss.py +++ b/modem/arq_session_iss.py @@ -119,7 +119,6 @@ class ARQSessionISS(arq_session.ARQSession): # Log the speed level change if it's different from the current speed level if new_speed_level != self.speed_level: self.log(f"Changing speed level from {self.speed_level} to {new_speed_level}", isWarning=True) - self.previous_speed_level = self.speed_level # Store the current speed level as previous self.speed_level = new_speed_level # Update the current speed level else: self.log("Received speed level is the same as the current speed level.", isWarning=True) @@ -128,18 +127,6 @@ class ARQSessionISS(arq_session.ARQSession): else: self.log("No speed level specified in the received frame.", isWarning=True) - # Apply the new decode mode based on the updated speed level, including the previous speed level - modes_to_decode = { - self.get_mode_by_speed_level(self.speed_level).value: True, - } - # Include the previous speed level mode if it's different from the current - if hasattr(self, 'previous_speed_level') and self.previous_speed_level != self.speed_level: - modes_to_decode[self.get_mode_by_speed_level(self.previous_speed_level).value] = True - - self.log(f"Modes to Decode: {list(modes_to_decode.keys())}", isWarning=True) - # Apply the new decode mode based on the current and previous speed levels - self.modem.demodulator.set_decode_mode(modes_to_decode) - def send_info(self, irs_frame): # check if we received an abort flag if irs_frame["flag"]["ABORT"]: