Merge branch 'master' of github.com:meshtastic/firmware into issue-2434

meshtastic · Apr 18, 2023 · 9eb7a4c · 9eb7a4c
2 parents e6dc71e + 9700fa5
commit 9eb7a4c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/Power.cpp b/src/Power.cpp
@@ -351,14 +351,15 @@ void Power::readPowerStatus()
             sprintf(mac, "!%02x%02x%02x%02x", dmac[2], dmac[3], dmac[4], dmac[5]);
 
             auto newHeap = memGet.getFreeHeap();
-            std::string heapTopic = (*moduleConfig.mqtt.root ? moduleConfig.mqtt.root : "msh") + "/2/heap/" + std::string(mac);
+            std::string heapTopic =
+                (*moduleConfig.mqtt.root ? moduleConfig.mqtt.root : "msh") + std::string("/2/heap/") + std::string(mac);
             std::string heapString = std::to_string(newHeap);
             mqtt->pubSub.publish(heapTopic.c_str(), heapString.c_str(), false);
-            // auto fragHeap = memGet.getHeapFragmentation();
             auto wifiRSSI = WiFi.RSSI();
-            heapTopic = (*moduleConfig.mqtt.root ? moduleConfig.mqtt.root : "msh") + "/2/wifi/" + std::string(mac);
+            std::string wifiTopic =
+                (*moduleConfig.mqtt.root ? moduleConfig.mqtt.root : "msh") + std::string("/2/wifi/") + std::string(mac);
             std::string wifiString = std::to_string(wifiRSSI);
-            mqtt->pubSub.publish(heapTopic.c_str(), wifiString.c_str(), false);
+            mqtt->pubSub.publish(wifiTopic.c_str(), wifiString.c_str(), false);
         }
 #endif