andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge mqtt changes from bertmelis, dev2

Browse Source
This commit is contained in:
MichaelDvP
2023-08-31 09:47:07 +02:00
parent bde06621bd
commit ae1bf1cbfb
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/espMqttClient/src/MqttClient.h
View File

@@ -131,10 +131,9 @@ class MqttClient {
uint32_t timeSent; uint32_t timeSent;
espMqttClientInternals::Packet packet; espMqttClientInternals::Packet packet;
template <typename... Args> template <typename... Args>
OutgoingPacket(uint32_t t, espMqttClientTypes::Error & error, Args &&... args) OutgoingPacket(uint32_t t, espMqttClientTypes::Error& error, Args&&... args) : // NOLINT(runtime/references)
: timeSent(t) timeSent(t),
, packet(error, std::forward<Args>(args)...) { packet(error, std::forward<Args>(args)...) {}
}
}; };
espMqttClientInternals::Outbox<OutgoingPacket> _outbox; espMqttClientInternals::Outbox<OutgoingPacket> _outbox;
size_t _bytesSent; size_t _bytesSent;
@@ -150,19 +149,27 @@ class MqttClient {
bool _addPacket(Args &&... args) { bool _addPacket(Args &&... args) {
espMqttClientTypes::Error error(espMqttClientTypes::Error::SUCCESS); espMqttClientTypes::Error error(espMqttClientTypes::Error::SUCCESS);
espMqttClientInternals::Outbox<OutgoingPacket>::Iterator it = _outbox.emplace(0, error, std::forward<Args>(args)...); espMqttClientInternals::Outbox<OutgoingPacket>::Iterator it = _outbox.emplace(0, error, std::forward<Args>(args)...);
if (it && error == espMqttClientTypes::Error::SUCCESS) if (it && error == espMqttClientTypes::Error::SUCCESS) {
return true; return true;
} else {
if (it)
_outbox.remove(it);
return false; return false;
} }
}
template <typename... Args> template <typename... Args>
bool _addPacketFront(Args &&... args) { bool _addPacketFront(Args &&... args) {
espMqttClientTypes::Error error(espMqttClientTypes::Error::SUCCESS); espMqttClientTypes::Error error(espMqttClientTypes::Error::SUCCESS);
espMqttClientInternals::Outbox<OutgoingPacket>::Iterator it = _outbox.emplaceFront(0, error, std::forward<Args>(args)...); espMqttClientInternals::Outbox<OutgoingPacket>::Iterator it = _outbox.emplaceFront(0, error, std::forward<Args>(args)...);
if (it && error == espMqttClientTypes::Error::SUCCESS) if (it && error == espMqttClientTypes::Error::SUCCESS) {
return true; return true;
} else {
if (it)
_outbox.remove(it);
return false; return false;
} }
}
void _checkOutbox(); void _checkOutbox();
int _sendPacket(); int _sendPacket();

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.7.0-dev.1d" #define EMSESP_APP_VERSION "3.7.0-dev.2"