From 329bf6f3e61fbaab585388bbae313ed97988c75e Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 27 Jan 2025 10:04:38 +0100 Subject: [PATCH] Cleanup --- sbapp/sideband/mqtt.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sbapp/sideband/mqtt.py b/sbapp/sideband/mqtt.py index 0d4837e..bed0e6d 100644 --- a/sbapp/sideband/mqtt.py +++ b/sbapp/sideband/mqtt.py @@ -22,8 +22,6 @@ class MQTT(): self.queue_lock = threading.Lock() self.waiting_msgs = deque(maxlen=MQTT.QUEUE_MAXLEN) self.waiting_telemetry = set() - self.unacked_msgs = set() - self.client.user_data_set(self.unacked_msgs) self.client.on_connect_fail = self.connect_failed self.client.on_disconnect = self.disconnected self.start() @@ -86,7 +84,6 @@ class MQTT(): def post_message(self, topic, data): mqtt_msg = self.client.publish(topic, data, qos=1) - self.unacked_msgs.add(mqtt_msg.mid) self.waiting_telemetry.add(mqtt_msg) def process_queue(self): @@ -108,6 +105,8 @@ class MQTT(): try: for msg in self.waiting_telemetry: msg.wait_for_publish() + self.waiting_telemetry.clear() + except Exception as e: RNS.log(f"An error occurred while publishing MQTT messages: {e}", RNS.LOG_ERROR) RNS.trace_exception(e) @@ -127,5 +126,4 @@ class MQTT(): for topic in topics: topic_path = f"{root_path}/{topic}" data = topics[topic] - self.waiting_msgs.append((topic_path, data)) - # RNS.log(f"{topic_path}: {data}") # TODO: Remove debug + self.waiting_msgs.append((topic_path, data)) \ No newline at end of file