From 93460c6498652cb5563d71d41ad1d5416719a683 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 3 Oct 2018 10:00:46 +0200
Subject: [PATCH] Change MQTT timeout

Change MQTT_ARDUINOMQTT command timeout from 1 to 10 seconds
---
 sonoff/_changelog.ino   |  1 +
 sonoff/sonoff_post.h    | 12 +++++-------
 sonoff/xdrv_01_mqtt.ino |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino
index 217b665ff..c0eea6fde 100644
--- a/sonoff/_changelog.ino
+++ b/sonoff/_changelog.ino
@@ -1,6 +1,7 @@
 /* 6.2.1.11 20191002
  * 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
+ * Change MQTT_ARDUINOMQTT command timeout from 1 to 10 seconds
  *
  * 6.2.1.10 20180930
  * Add command RGBWWTable to support color calibration (#3933)
diff --git a/sonoff/sonoff_post.h b/sonoff/sonoff_post.h
index 423a75f3c..bc747155e 100755
--- a/sonoff/sonoff_post.h
+++ b/sonoff/sonoff_post.h
@@ -50,11 +50,6 @@ void KNX_CB_Action(message_t const &msg, void *arg);
 #define MODULE                 SONOFF_BASIC   // [Module] Select default model
 #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]
  * Provide an image with useful supported sensors enabled
@@ -272,10 +267,13 @@ void KNX_CB_Action(message_t const &msg, void *arg);
 #endif
 
 #ifndef MQTT_MAX_PACKET_SIZE
-#define MQTT_MAX_PACKET_SIZE   1000
+#define MQTT_MAX_PACKET_SIZE   1000           // Bytes
 #endif
 #ifndef MQTT_KEEPALIVE
-#define MQTT_KEEPALIVE         15
+#define MQTT_KEEPALIVE         15             // Seconds
+#endif
+#ifndef MQTT_TIMEOUT
+#define MQTT_TIMEOUT           10000          // milli seconds
 #endif
 
 #ifndef MESSZ
diff --git a/sonoff/xdrv_01_mqtt.ino b/sonoff/xdrv_01_mqtt.ino
index 42214216a..3a7d16990 100644
--- a/sonoff/xdrv_01_mqtt.ino
+++ b/sonoff/xdrv_01_mqtt.ino
@@ -500,7 +500,7 @@ void MqttReconnect()
 #elif (MQTT_LIBRARY_TYPE == MQTT_ARDUINOMQTT)
     MqttClient.begin(Settings.mqtt_host, Settings.mqtt_port, EspClient);
     MqttClient.setWill(stopic, mqtt_data, true, 1);
-    MqttClient.setOptions(MQTT_KEEPALIVE, true, 1000);
+    MqttClient.setOptions(MQTT_KEEPALIVE, true, MQTT_TIMEOUT);
 //    MqttClient.onMessageAdvanced(MqttMyDataCb);
     MqttClient.onMessage(MqttMyDataCb);
 #endif