Migrate to the new meshtastic MQTT topics

Version 2.3 uses 2/e
sokolpezinok · Apr 11, 2024 · 0f4c192 · 0f4c192
1 parent a8f600a
commit 0f4c192
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/python/yaroc/sources/mqtt.py b/python/yaroc/sources/mqtt.py
@@ -103,14 +103,14 @@ async def _on_message(self, msg: Message):
                 mac_addr = MqttForwader.extract_mac(topic)
                 await self._handle_status(mac_addr, msg.payload, now)
             elif self.meshtastic_channel is not None and topic.startswith(
-                f"yar/2/c/{self.meshtastic_channel}/"
+                f"yar/2/e/{self.meshtastic_channel}/"
             ):
                 recv_mac_addr = topic[10 + len(self.meshtastic_channel) :]
                 self.handler.msh_status_update(
                     MqttForwader._payload_to_bytes(msg.payload), now, recv_mac_addr
                 )
 
-            elif topic.startswith("yar/2/c/serial/"):
+            elif topic.startswith("yar/2/e/serial/"):
                 await self._handle_meshtastic_serial(msg.payload)
         except Exception as err:
             logging.error(f"Failed processing message: {err}")
@@ -146,9 +146,9 @@ async def loop(self):
                         for mac_addr in online_macs:
                             await client.subscribe(f"yar/{mac_addr}/#", qos=1)
                         for mac_addr in radio_macs:
-                            await client.subscribe(f"yar/2/c/serial/!{mac_addr}", qos=1)
+                            await client.subscribe(f"yar/2/e/serial/!{mac_addr}", qos=1)
                             await client.subscribe(
-                                f"yar/2/c/{self.meshtastic_channel}/!{mac_addr}", qos=1
+                                f"yar/2/e/{self.meshtastic_channel}/!{mac_addr}", qos=1
                             )
 
                         async for message in messages: