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

merge latest change from official repo

Browse Source
This commit is contained in:
Proddy
2023-12-12 22:34:34 +01:00
parent 3d5c08118c
commit dd6b435417
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/espMqttClient/src/MqttClient.cpp
View File

@@ -317,7 +317,8 @@ void MqttClient::_loop(MqttClient * c) {
uint16_t MqttClient::_getNextPacketId() { uint16_t MqttClient::_getNextPacketId() {
++_packetId; ++_packetId;
if (_packetId == 0) ++_packetId; if (_packetId == 0)
++_packetId;
return _packetId; return _packetId;
} }
@@ -333,7 +334,7 @@ int MqttClient::_sendPacket() {
EMC_SEMAPHORE_TAKE(); EMC_SEMAPHORE_TAKE();
OutgoingPacket * packet = _outbox.getCurrent(); OutgoingPacket * packet = _outbox.getCurrent();
size_t written = 0; size_t written = 0;
if (packet) { if (packet) {
size_t wantToWrite = packet->packet.available(_bytesSent); size_t wantToWrite = packet->packet.available(_bytesSent);
if (wantToWrite == 0) { if (wantToWrite == 0) {
@@ -498,12 +499,12 @@ void MqttClient::_onConnack() {
} }
void MqttClient::_onPublish() { void MqttClient::_onPublish() {
espMqttClientInternals::IncomingPacket p = _parser.getPacket(); const espMqttClientInternals::IncomingPacket & p = _parser.getPacket();
uint8_t qos = p.qos(); uint8_t qos = p.qos();
bool retain = p.retain(); bool retain = p.retain();
bool dup = p.dup(); bool dup = p.dup();
uint16_t packetId = p.variableHeader.fixed.packetId; uint16_t packetId = p.variableHeader.fixed.packetId;
bool callback = true; bool callback = true;
if (qos == 1) { if (qos == 1) {
if (p.payload.index + p.payload.length == p.payload.total) { if (p.payload.index + p.payload.length == p.payload.total) {
EMC_SEMAPHORE_TAKE(); EMC_SEMAPHORE_TAKE();