mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change MQTT timeout 

Change MQTT_ARDUINOMQTT command timeout from 1 to 10 seconds
This commit is contained in:
Theo Arends 2018-10-03 10:00:46 +02:00
parent ce5264518d
commit 93460c6498
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sonoff/_changelog.ino
View File

@ -1,6 +1,7 @@
/* 6.2.1.11 20191002 /* 6.2.1.11 20191002
* Remove support for MQTT Client based on esp-mqtt-arduino by #define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO * Remove support for MQTT Client based on esp-mqtt-arduino by #define MQTT_LIBRARY_TYPE MQTT_ESPMQTTARDUINO
* Add support for MQTT Client based on lwmqtt to be selected by #define MQTT_LIBRARY_TYPE MQTT_ARDUINOMQTT * Add support for MQTT Client based on lwmqtt to be selected by #define MQTT_LIBRARY_TYPE MQTT_ARDUINOMQTT
* Change MQTT_ARDUINOMQTT command timeout from 1 to 10 seconds
* *
* 6.2.1.10 20180930 * 6.2.1.10 20180930
* Add command RGBWWTable to support color calibration (#3933) * Add command RGBWWTable to support color calibration (#3933)

12
sonoff/sonoff_post.h
View File

@ -50,11 +50,6 @@ void KNX_CB_Action(message_t const &msg, void *arg);
#define MODULE SONOFF_BASIC // [Module] Select default model #define MODULE SONOFF_BASIC // [Module] Select default model
#endif #endif
#define USE_DHT // Default DHT11 sensor needs no external library
#define USE_ENERGY_SENSOR // Use energy sensors (+14k code)
#define USE_HLW8012 // Use energy sensor for Sonoff Pow and WolfBlitz
#define USE_CSE7766 // Use energy sensor for Sonoff S31 and Pow R2
/*********************************************************************************************\ /*********************************************************************************************\
* [sonoff-sensors.bin] * [sonoff-sensors.bin]
* Provide an image with useful supported sensors enabled * Provide an image with useful supported sensors enabled
@ -272,10 +267,13 @@ void KNX_CB_Action(message_t const &msg, void *arg);
#endif #endif
#ifndef MQTT_MAX_PACKET_SIZE #ifndef MQTT_MAX_PACKET_SIZE
#define MQTT_MAX_PACKET_SIZE 1000 #define MQTT_MAX_PACKET_SIZE 1000 // Bytes
#endif #endif
#ifndef MQTT_KEEPALIVE #ifndef MQTT_KEEPALIVE
#define MQTT_KEEPALIVE 15 #define MQTT_KEEPALIVE 15 // Seconds
#endif
#ifndef MQTT_TIMEOUT
#define MQTT_TIMEOUT 10000 // milli seconds
#endif #endif
#ifndef MESSZ #ifndef MESSZ

2
sonoff/xdrv_01_mqtt.ino
View File

@ -500,7 +500,7 @@ void MqttReconnect()
#elif (MQTT_LIBRARY_TYPE == MQTT_ARDUINOMQTT) #elif (MQTT_LIBRARY_TYPE == MQTT_ARDUINOMQTT)
MqttClient.begin(Settings.mqtt_host, Settings.mqtt_port, EspClient); MqttClient.begin(Settings.mqtt_host, Settings.mqtt_port, EspClient);
MqttClient.setWill(stopic, mqtt_data, true, 1); MqttClient.setWill(stopic, mqtt_data, true, 1);
MqttClient.setOptions(MQTT_KEEPALIVE, true, 1000); MqttClient.setOptions(MQTT_KEEPALIVE, true, MQTT_TIMEOUT);
// MqttClient.onMessageAdvanced(MqttMyDataCb); // MqttClient.onMessageAdvanced(MqttMyDataCb);
MqttClient.onMessage(MqttMyDataCb); MqttClient.onMessage(MqttMyDataCb);
#endif #endif