rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-19 09:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix nodeid

Browse Source
This commit is contained in:
Kevin Hester
2021-04-03 15:04:03 +08:00
parent 139da372e7
commit 8890ca759d
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mqtt/MQTT.cpp
View File

@@ -42,9 +42,9 @@ MQTT::MQTT() : pubSub(mqttClient)
pubSub.setCallback(mqttCallback);
DEBUG_MSG("Connecting to MQTT server: %s\n", serverAddr);
auto myStatus = (statusTopic + nodeId);
auto myStatus = (statusTopic + owner.id);
// bool connected = pubSub.connect(nodeId.c_str(), "meshdev", "apes4cats", myStatus.c_str(), 1, true, "offline");
bool connected = pubSub.connect(nodeId.c_str(), myStatus.c_str(), 1, true, "offline");
bool connected = pubSub.connect(owner.id, myStatus.c_str(), 1, true, "offline");
if (connected) {
DEBUG_MSG("MQTT connected\n");
@@ -59,7 +59,7 @@ MQTT::MQTT() : pubSub(mqttClient)
}
}
void MQTT::publish(const MeshPacket *mp, String channelId)
void MQTT::publish(const MeshPacket *mp)
{
// DEBUG_MSG("publish %s = %s\n", suffix.c_str(), payload.c_str());
@@ -71,6 +71,6 @@ const char *MQTT::getTopic(String suffix, const char *direction)
static char buf[128];
// "mesh/crypt/CHANNELID/NODEID/PORTID"
snprintf(buf, sizeof(buf), "mesh/%s/%s/%s", direction, nodeId.c_str(), suffix.c_str());
snprintf(buf, sizeof(buf), "mesh/%s/%s/%s", direction, owner.id, suffix.c_str());
return buf;
}