mgillespie/TinyMqtt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' into main

Browse Source
This commit is contained in:
hsaturn
2021-03-31 19:11:24 +02:00
parent 3a1af655d7 87a78c549f
commit 4ed6f72602
9 changed files with 190 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/TinyMqtt.h
View File

@@ -120,9 +120,8 @@ class MqttClient
FlagReserved = 1
};
public:
MqttClient(MqttBroker*);
MqttClient(MqttBroker* brk, const std::string& id) : MqttClient(brk) { clientId=id; }
MqttClient() : MqttClient(nullptr) {};
MqttClient(MqttBroker* brk = nullptr, const std::string& id="");
MqttClient(const std::string& id) : MqttClient(nullptr, id){}
~MqttClient();
@@ -158,11 +157,10 @@ class MqttClient
void dump()
{
uint32_t ms=millis();
Serial << "MqttClient (" << clientId.c_str() << ") p=" << (uint32_t) parent
<< " c=" << (uint32_t)client << (connected() ? " ON " : " OFF");
Serial << ", alive=" << (uint32_t)alive << '/' << ms << ", ka=" << keep_alive;
Serial << "MqttClient (" << clientId.c_str() << ") " << (connected() ? " ON " : " OFF");
Serial << ", alive=" << alive << '/' << ms << ", ka=" << keep_alive;
Serial << (client && client->connected() ? "" : "dis") << "connected";
message.hexdump("entrant msg");
message.hexdump("entrant msg");
bool c=false;
Serial << " [";
for(auto s: subscriptions)