Merge branch 'meshtastic:master' into master

GPSFan · Mar 12, 2024 · 20263bc · 20263bc
2 parents dbf9dbc + 6215495
commit 20263bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
@@ -185,7 +185,7 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), mqttQueue(MAX_MQTT_QUEUE)
             statusTopic = moduleConfig.mqtt.root + statusTopic;
             cryptTopic = moduleConfig.mqtt.root + cryptTopic;
             jsonTopic = moduleConfig.mqtt.root + jsonTopic;
-            mapTopic = moduleConfig.mqtt.root + jsonTopic;
+            mapTopic = moduleConfig.mqtt.root + mapTopic;
         } else {
             statusTopic = "msh" + statusTopic;
             cryptTopic = "msh" + cryptTopic;
@@ -915,4 +915,4 @@ bool MQTT::isValidJsonEnvelope(JSONObject &json)
            (json["from"]->AsNumber() == nodeDB.getNodeNum()) &&             // only accept message if the "from" is us
            (json.find("type") != json.end()) && json["type"]->IsString() && // should specify a type
            (json.find("payload") != json.end());                            // should have a payload
-}
+}
diff --git a/version.properties b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 3
-build = 0
+build = 1