mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-09 22:52:07 +00:00
Fix missing msh default topic.
This commit is contained in:
parent
7bd836673e
commit
b43a5bc4f8
@ -350,12 +350,12 @@ void Power::readPowerStatus()
|
|||||||
char mac[18];
|
char mac[18];
|
||||||
sprintf(mac, "!%02x%02x%02x%02x", dmac[2], dmac[3], dmac[4], dmac[5]);
|
sprintf(mac, "!%02x%02x%02x%02x", dmac[2], dmac[3], dmac[4], dmac[5]);
|
||||||
auto newHeap = ESP.getFreeHeap();
|
auto newHeap = ESP.getFreeHeap();
|
||||||
std::string heapTopic = "msh/2/heap/" + std::string(mac);
|
std::string heapTopic = (*moduleConfig.mqtt.root ? moduleConfig.mqtt.root : "msh") + "/2/heap/" + std::string(mac);
|
||||||
std::string heapString = std::to_string(newHeap);
|
std::string heapString = std::to_string(newHeap);
|
||||||
mqtt->pubSub.publish(heapTopic.c_str(), heapString.c_str(), false);
|
mqtt->pubSub.publish(heapTopic.c_str(), heapString.c_str(), false);
|
||||||
// auto fragHeap = ESP.getHeapFragmentation();
|
// auto fragHeap = ESP.getHeapFragmentation();
|
||||||
auto wifiRSSI = WiFi.RSSI();
|
auto wifiRSSI = WiFi.RSSI();
|
||||||
heapTopic = "msh/2/wifi/" + std::string(mac);
|
heapTopic = (*moduleConfig.mqtt.root ? moduleConfig.mqtt.root : "msh") + "/2/wifi/" + std::string(mac);
|
||||||
std::string wifiString = std::to_string(wifiRSSI);
|
std::string wifiString = std::to_string(wifiRSSI);
|
||||||
mqtt->pubSub.publish(heapTopic.c_str(), wifiString.c_str(), false);
|
mqtt->pubSub.publish(heapTopic.c_str(), wifiString.c_str(), false);
|
||||||
}
|
}
|
||||||
|
@ -19,10 +19,6 @@ const int reconnectMax = 5;
|
|||||||
|
|
||||||
MQTT *mqtt;
|
MQTT *mqtt;
|
||||||
|
|
||||||
std::string statusTopic = "/2/stat/";
|
|
||||||
std::string cryptTopic = "/2/c/"; // msh/2/c/CHANNELID/NODEID
|
|
||||||
std::string jsonTopic = "/2/json/"; // msh/2/json/CHANNELID/NODEID
|
|
||||||
|
|
||||||
static MemoryDynamic<meshtastic_ServiceEnvelope> staticMqttPool;
|
static MemoryDynamic<meshtastic_ServiceEnvelope> staticMqttPool;
|
||||||
|
|
||||||
Allocator<meshtastic_ServiceEnvelope> &mqttPool = staticMqttPool;
|
Allocator<meshtastic_ServiceEnvelope> &mqttPool = staticMqttPool;
|
||||||
@ -164,7 +160,7 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), pubSub(mqttClient), mqttQueue(MAX_
|
|||||||
assert(!mqtt);
|
assert(!mqtt);
|
||||||
mqtt = this;
|
mqtt = this;
|
||||||
|
|
||||||
if (moduleConfig.mqtt.root) {
|
if (*moduleConfig.mqtt.root) {
|
||||||
statusTopic = moduleConfig.mqtt.root + statusTopic;
|
statusTopic = moduleConfig.mqtt.root + statusTopic;
|
||||||
cryptTopic = moduleConfig.mqtt.root + cryptTopic;
|
cryptTopic = moduleConfig.mqtt.root + cryptTopic;
|
||||||
jsonTopic = moduleConfig.mqtt.root + jsonTopic;
|
jsonTopic = moduleConfig.mqtt.root + jsonTopic;
|
||||||
|
@ -69,6 +69,9 @@ class MQTT : private concurrency::OSThread
|
|||||||
virtual int32_t runOnce() override;
|
virtual int32_t runOnce() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
std::string statusTopic = "/2/stat/";
|
||||||
|
std::string cryptTopic = "/2/c/"; // msh/2/c/CHANNELID/NODEID
|
||||||
|
std::string jsonTopic = "/2/json/"; // msh/2/json/CHANNELID/NODEID
|
||||||
/** return true if we have a channel that wants uplink/downlink
|
/** return true if we have a channel that wants uplink/downlink
|
||||||
*/
|
*/
|
||||||
bool wantsLink() const;
|
bool wantsLink() const;
|
||||||
|
Loading…
Reference in New Issue
Block a user