From c7b2b023166fa6356f4185f0b1063c69b4fc705b Mon Sep 17 00:00:00 2001 From: Rigear <278971+Rigear@users.noreply.github.com> Date: Tue, 21 Apr 2026 21:21:13 -0700 Subject: [PATCH] fix: Fixed extra topic publishing to letsmesh --- repeater/data_acquisition/mqtt_handler.py | 2 +- repeater/data_acquisition/storage_collector.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/repeater/data_acquisition/mqtt_handler.py b/repeater/data_acquisition/mqtt_handler.py index 178ec57..59b016f 100644 --- a/repeater/data_acquisition/mqtt_handler.py +++ b/repeater/data_acquisition/mqtt_handler.py @@ -806,7 +806,7 @@ class MeshCoreToMqttPusher: return results - def publish_mqtt(self, subtopic: str, payload: dict, retain: bool = False, qos: int = 0): + def publish_mqtt(self, payload: dict, subtopic: str, retain: bool = False, qos: int = 0): """Publish message to all connected brokers""" message = json.dumps(payload) diff --git a/repeater/data_acquisition/storage_collector.py b/repeater/data_acquisition/storage_collector.py index a05c8ec..8fa5652 100644 --- a/repeater/data_acquisition/storage_collector.py +++ b/repeater/data_acquisition/storage_collector.py @@ -241,7 +241,7 @@ class StorageCollector: def _publish_advert_sync(self, advert_record: dict): if self.mqtt_handler: - self.mqtt_handler.publish("advert", advert_record) + self.mqtt_handler.publish_mqtt(advert_record, "advert") self._publish_to_glass(advert_record, "advert") def record_noise_floor(self, noise_floor_dbm: float): @@ -263,7 +263,7 @@ class StorageCollector: def _publish_noise_floor_sync(self, noise_record: dict): if self.mqtt_handler: - self.mqtt_handler.publish("noise_floor", noise_record) + self.mqtt_handler.publish_mqtt(noise_record, "noise_floor") self._publish_to_glass(noise_record, "noise_floor") def record_crc_errors(self, count: int): @@ -285,7 +285,7 @@ class StorageCollector: def _publish_crc_errors_sync(self, crc_record: dict): if self.mqtt_handler: - self.mqtt_handler.publish("crc_errors", crc_record) + self.mqtt_handler.publish_mqtt(crc_record, "crc_errors") self._publish_to_glass(crc_record, "crc_errors") def get_crc_error_count(self, hours: int = 24) -> int: