jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update PubSubClient lib

Browse Source 
Add delay when waiting for data and flush on disconnect
This commit is contained in:
Theo Arends 2018-10-23 17:07:43 +02:00
parent 19b7a33f6b
commit 9f4fed1584
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/PubSubClient-EspEasy-2.6.09/src/PubSubClient.cpp
View File

@ -209,6 +209,7 @@ boolean PubSubClient::connect(const char *id, const char *user, const char *pass
boolean PubSubClient::readByte(uint8_t * result) { boolean PubSubClient::readByte(uint8_t * result) {
uint32_t previousMillis = millis(); uint32_t previousMillis = millis();
while(!_client->available()) { while(!_client->available()) {
delay(1); // Add esp8266 de-blocking (Tasmota #790, EspEasy #1943)
uint32_t currentMillis = millis(); uint32_t currentMillis = millis();
if(currentMillis - previousMillis >= ((int32_t) MQTT_SOCKET_TIMEOUT * 1000)){ if(currentMillis - previousMillis >= ((int32_t) MQTT_SOCKET_TIMEOUT * 1000)){
return false; return false;
@ -522,9 +523,12 @@ boolean PubSubClient::unsubscribe(const char* topic) {
void PubSubClient::disconnect() { void PubSubClient::disconnect() {
buffer[0] = MQTTDISCONNECT; buffer[0] = MQTTDISCONNECT;
buffer[1] = 0; buffer[1] = 0;
_client->write(buffer,2); if (_client != NULL) {
_client->write(buffer,2);
_client->flush();
_client->stop();
}
_state = MQTT_DISCONNECTED; _state = MQTT_DISCONNECTED;
_client->stop();
lastInActivity = lastOutActivity = millis(); lastInActivity = lastOutActivity = millis();
} }