Updated with latest changes and resoved conflits

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

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

sonoff/sonoff.h

@@ -120,8 +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
 
-#define WEB_LOG_SIZE (4000)                 // Max number of characters in weblog
-
 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
 

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
@@ -435,7 +441,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

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_