From b28ee0aa85f30654835fc9282c83a91f76a22ddf Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Sun, 24 Mar 2024 20:17:11 +0100 Subject: [PATCH] adjusted cq and ping --- modem/frame_handler_cq.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/modem/frame_handler_cq.py b/modem/frame_handler_cq.py index 0486c390..9fc9ab4d 100644 --- a/modem/frame_handler_cq.py +++ b/modem/frame_handler_cq.py @@ -5,12 +5,22 @@ import frame_handler from message_system_db_messages import DatabaseManagerMessages -class CQFrameHandler(frame_handler_ping.PingFrameHandler): +class CQFrameHandler(frame_handler.FrameHandler): - def should_respond(self): - self.logger.debug(f"Respond to CQ: {self.config['MODEM']['respond_to_cq']}") - return bool(self.config['MODEM']['respond_to_cq'] and not self.states.getARQ()) + #def should_respond(self): + # self.logger.debug(f"Respond to CQ: {self.config['MODEM']['respond_to_cq']}") + # return bool(self.config['MODEM']['respond_to_cq'] and not self.states.getARQ()) + def follow_protocol(self): + if self.states.getARQ(): + return + + self.logger.debug( + f"[Modem] Responding to request from [{self.details['frame']['origin']}]", + snr=self.details['snr'], + ) + + self.send_ack() def send_ack(self): factory = data_frame_factory.DataFrameFactory(self.config)