diff --git a/lib/PubSubClient-EspEasy-2.7.11/.gitignore b/lib/PubSubClient-EspEasy-2.7.12/.gitignore similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/.gitignore rename to lib/PubSubClient-EspEasy-2.7.12/.gitignore diff --git a/lib/PubSubClient-EspEasy-2.7.11/.travis.yml b/lib/PubSubClient-EspEasy-2.7.12/.travis.yml similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/.travis.yml rename to lib/PubSubClient-EspEasy-2.7.12/.travis.yml diff --git a/lib/PubSubClient-EspEasy-2.7.11/CHANGES.txt b/lib/PubSubClient-EspEasy-2.7.12/CHANGES.txt similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/CHANGES.txt rename to lib/PubSubClient-EspEasy-2.7.12/CHANGES.txt diff --git a/lib/PubSubClient-EspEasy-2.7.11/LICENSE.txt b/lib/PubSubClient-EspEasy-2.7.12/LICENSE.txt similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/LICENSE.txt rename to lib/PubSubClient-EspEasy-2.7.12/LICENSE.txt diff --git a/lib/PubSubClient-EspEasy-2.7.11/README.md b/lib/PubSubClient-EspEasy-2.7.12/README.md similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/README.md rename to lib/PubSubClient-EspEasy-2.7.12/README.md diff --git a/lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_auth/mqtt_auth.ino b/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_auth/mqtt_auth.ino similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_auth/mqtt_auth.ino rename to lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_auth/mqtt_auth.ino diff --git a/lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_basic/mqtt_basic.ino b/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_basic/mqtt_basic.ino similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_basic/mqtt_basic.ino rename to lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_basic/mqtt_basic.ino diff --git a/lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_esp8266/mqtt_esp8266.ino b/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_esp8266/mqtt_esp8266.ino similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_esp8266/mqtt_esp8266.ino rename to lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_esp8266/mqtt_esp8266.ino diff --git a/lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_large_message/mqtt_large_message.ino b/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_large_message/mqtt_large_message.ino similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_large_message/mqtt_large_message.ino rename to lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_large_message/mqtt_large_message.ino diff --git a/lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino b/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino rename to lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino diff --git a/lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino b/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino rename to lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino diff --git a/lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_stream/mqtt_stream.ino b/lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_stream/mqtt_stream.ino similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/examples/mqtt_stream/mqtt_stream.ino rename to lib/PubSubClient-EspEasy-2.7.12/examples/mqtt_stream/mqtt_stream.ino diff --git a/lib/PubSubClient-EspEasy-2.7.11/keywords.txt b/lib/PubSubClient-EspEasy-2.7.12/keywords.txt similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/keywords.txt rename to lib/PubSubClient-EspEasy-2.7.12/keywords.txt diff --git a/lib/PubSubClient-EspEasy-2.7.11/library.json b/lib/PubSubClient-EspEasy-2.7.12/library.json similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/library.json rename to lib/PubSubClient-EspEasy-2.7.12/library.json diff --git a/lib/PubSubClient-EspEasy-2.7.11/library.properties b/lib/PubSubClient-EspEasy-2.7.12/library.properties similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/library.properties rename to lib/PubSubClient-EspEasy-2.7.12/library.properties diff --git a/lib/PubSubClient-EspEasy-2.7.11/src/PubSubClient.cpp b/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.cpp similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/src/PubSubClient.cpp rename to lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.cpp diff --git a/lib/PubSubClient-EspEasy-2.7.11/src/PubSubClient.h b/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h similarity index 98% rename from lib/PubSubClient-EspEasy-2.7.11/src/PubSubClient.h rename to lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h index a519f75d7..aa2080ed1 100644 --- a/lib/PubSubClient-EspEasy-2.7.11/src/PubSubClient.h +++ b/lib/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h @@ -30,7 +30,8 @@ // MQTT_KEEPALIVE : keepAlive interval in Seconds // Keepalive timeout for default MQTT Broker is 10s #ifndef MQTT_KEEPALIVE -#define MQTT_KEEPALIVE 10 +//#define MQTT_KEEPALIVE 10 +#define MQTT_KEEPALIVE 30 // Tasmota v6.5.0.14 enabling AWS-iot #endif // MQTT_SOCKET_TIMEOUT: socket timeout interval in Seconds diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/.gitignore b/lib/PubSubClient-EspEasy-2.7.12/tests/.gitignore similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/.gitignore rename to lib/PubSubClient-EspEasy-2.7.12/tests/.gitignore diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/Makefile b/lib/PubSubClient-EspEasy-2.7.12/tests/Makefile similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/Makefile rename to lib/PubSubClient-EspEasy-2.7.12/tests/Makefile diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/README.md b/lib/PubSubClient-EspEasy-2.7.12/tests/README.md similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/README.md rename to lib/PubSubClient-EspEasy-2.7.12/tests/README.md diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/connect_spec.cpp b/lib/PubSubClient-EspEasy-2.7.12/tests/src/connect_spec.cpp similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/connect_spec.cpp rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/connect_spec.cpp diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/keepalive_spec.cpp b/lib/PubSubClient-EspEasy-2.7.12/tests/src/keepalive_spec.cpp similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/keepalive_spec.cpp rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/keepalive_spec.cpp diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Arduino.h b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Arduino.h similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Arduino.h rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Arduino.h diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/BDDTest.cpp b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.cpp similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/BDDTest.cpp rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.cpp diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/BDDTest.h b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.h similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/BDDTest.h rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/BDDTest.h diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Buffer.cpp b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.cpp similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Buffer.cpp rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.cpp diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Buffer.h b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.h similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Buffer.h rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Buffer.h diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Client.h b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Client.h similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Client.h rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Client.h diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/IPAddress.cpp b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.cpp similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/IPAddress.cpp rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.cpp diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/IPAddress.h b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.h similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/IPAddress.h rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/IPAddress.h diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Print.h b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Print.h similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Print.h rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Print.h diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/ShimClient.cpp b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.cpp similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/ShimClient.cpp rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.cpp diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/ShimClient.h b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.h similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/ShimClient.h rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/ShimClient.h diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Stream.cpp b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.cpp similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Stream.cpp rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.cpp diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Stream.h b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.h similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/Stream.h rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/Stream.h diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/trace.h b/lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/trace.h similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/lib/trace.h rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/lib/trace.h diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/publish_spec.cpp b/lib/PubSubClient-EspEasy-2.7.12/tests/src/publish_spec.cpp similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/publish_spec.cpp rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/publish_spec.cpp diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/receive_spec.cpp b/lib/PubSubClient-EspEasy-2.7.12/tests/src/receive_spec.cpp similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/receive_spec.cpp rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/receive_spec.cpp diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/src/subscribe_spec.cpp b/lib/PubSubClient-EspEasy-2.7.12/tests/src/subscribe_spec.cpp similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/src/subscribe_spec.cpp rename to lib/PubSubClient-EspEasy-2.7.12/tests/src/subscribe_spec.cpp diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/testcases/__init__.py b/lib/PubSubClient-EspEasy-2.7.12/tests/testcases/__init__.py similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/testcases/__init__.py rename to lib/PubSubClient-EspEasy-2.7.12/tests/testcases/__init__.py diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/testcases/mqtt_basic.py b/lib/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_basic.py similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/testcases/mqtt_basic.py rename to lib/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_basic.py diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/testcases/mqtt_publish_in_callback.py b/lib/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_publish_in_callback.py similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/testcases/mqtt_publish_in_callback.py rename to lib/PubSubClient-EspEasy-2.7.12/tests/testcases/mqtt_publish_in_callback.py diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/testcases/settings.py b/lib/PubSubClient-EspEasy-2.7.12/tests/testcases/settings.py similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/testcases/settings.py rename to lib/PubSubClient-EspEasy-2.7.12/tests/testcases/settings.py diff --git a/lib/PubSubClient-EspEasy-2.7.11/tests/testsuite.py b/lib/PubSubClient-EspEasy-2.7.12/tests/testsuite.py similarity index 100% rename from lib/PubSubClient-EspEasy-2.7.11/tests/testsuite.py rename to lib/PubSubClient-EspEasy-2.7.12/tests/testsuite.py diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino index f7be4da96..3f008eaa7 100644 --- a/sonoff/_changelog.ino +++ b/sonoff/_changelog.ino @@ -1,4 +1,7 @@ /* + * 6.5.0.15 20190606 + * Change pubsubclient MQTT_KEEPALIVE from 10 to 30 seconds in preparation of AWS IoT support + * * 6.5.0.14 20190602 * Change webserver HTML input, button, textarea, and select name based on id * Fix webserver multiple Javascript window.onload functionality diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h index d6c4f20b1..fe8c2cc4a 100644 --- a/sonoff/sonoff.h +++ b/sonoff/sonoff.h @@ -120,12 +120,6 @@ const uint16_t MIN_MESSZ = 893; // Min number of characters in MQTT const uint8_t SENSOR_MAX_MISS = 5; // Max number of missed sensor reads before deciding it's offline -#ifdef USE_MQTT_TLS - const uint16_t WEB_LOG_SIZE = 2000; // Max number of characters in weblog -#else - const uint16_t WEB_LOG_SIZE = 4000; // Max number of characters in weblog -#endif - const uint8_t MAX_BACKLOG = 30; // Max number of commands in backlog const uint32_t MIN_BACKLOG_DELAY = 2; // Minimal backlog delay in 0.1 seconds diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h index 6089adfa5..92e82de13 100644 --- a/sonoff/sonoff_post.h +++ b/sonoff/sonoff_post.h @@ -46,6 +46,12 @@ void KNX_CB_Action(message_t const &msg, void *arg); * Default global defines \*********************************************************************************************/ +#ifdef USE_MQTT_TLS + const uint16_t WEB_LOG_SIZE = 2000; // Max number of characters in weblog +#else + const uint16_t WEB_LOG_SIZE = 4000; // Max number of characters in weblog +#endif + #ifdef USE_EMULATION_HUE #define USE_EMULATION #endif @@ -434,7 +440,7 @@ void KNX_CB_Action(message_t const &msg, void *arg); #define MQTT_MAX_PACKET_SIZE 1000 // Bytes #endif #ifndef MQTT_KEEPALIVE -#define MQTT_KEEPALIVE 15 // Seconds +#define MQTT_KEEPALIVE 30 // Seconds #endif #ifndef MQTT_TIMEOUT #define MQTT_TIMEOUT 10000 // milli seconds diff --git a/sonoff/sonoff_version.h b/sonoff/sonoff_version.h index 6c475febc..e4650a484 100644 --- a/sonoff/sonoff_version.h +++ b/sonoff/sonoff_version.h @@ -20,6 +20,6 @@ #ifndef _SONOFF_VERSION_H_ #define _SONOFF_VERSION_H_ -const uint32_t VERSION = 0x0605000E; +const uint32_t VERSION = 0x0605000F; #endif // _SONOFF_VERSION_H_