Skip to content

Commit 9ab9ed4

Browse files
mobrembskiMichał Obrembski
authored andcommitted
Add MY_MQTT_ETH_CLIENT_CONNECTION_TIMEOUT to config
MY_MQTT_ETH_CLIENT_CONNECTION_TIMEOUT is useful for adjusting default MQTT TCP/IP connection timeout by library user.
1 parent a090351 commit 9ab9ed4

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

MyConfig.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,6 +1562,18 @@
15621562
#ifndef MY_MQTT_ETH_INIT_DELAY
15631563
#define MY_MQTT_ETH_INIT_DELAY 1000
15641564
#endif
1565+
/**
1566+
* @def MY_MQTT_ETH_CLIENT_CONNECTION_TIMEOUT
1567+
* @brief Set a MQTT broker socket connection timeout time.
1568+
*
1569+
* This define is useful if you want to change default MQTT TCP/IP broker
1570+
* connection timeout. By default, it is 1000ms.
1571+
* Example: @code #define MY_MQTT_ETH_CLIENT_CONNECTION_TIMEOUT 1000 @endcode
1572+
*/
1573+
#ifndef MY_MQTT_ETH_CLIENT_CONNECTION_TIMEOUT
1574+
#define MY_MQTT_ETH_CLIENT_CONNECTION_TIMEOUT 1000
1575+
#endif
1576+
15651577
/**
15661578
* @def MY_IP_ADDRESS
15671579
* @brief Static ip address of gateway. If not defined, DHCP will be used.
@@ -2335,6 +2347,7 @@
23352347
#define MY_MQTT_CLIENT_CERT
23362348
#define MY_MQTT_CLIENT_KEY
23372349
#define MY_MQTT_ETH_INIT_DELAY
2350+
#define MY_MQTT_ETH_CLIENT_CONNECTION_TIMEOUT
23382351
#define MY_SIGNAL_REPORT_ENABLED
23392352
// general
23402353
#define MY_WITH_LEDS_BLINKING_INVERSE

core/MyGatewayTransportMQTTClient.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ bool reconnectMQTT(void)
159159

160160
return true;
161161
}
162-
delay(1000);
162+
delay(MY_MQTT_ETH_CLIENT_CONNECTION_TIMEOUT);
163163
GATEWAY_DEBUG(PSTR("!GWT:RMQ:FAIL\n"));
164164
return false;
165165
}
@@ -247,7 +247,7 @@ bool gatewayTransportInit(void)
247247
#else
248248
_MQTT_client.setServer(MY_CONTROLLER_URL_ADDRESS, MY_PORT);
249249
#endif /* End of MY_CONTROLLER_IP_ADDRESS */
250-
250+
_MQTT_ethClient.setConnectionTimeout(MY_MQTT_ETH_CLIENT_CONNECTION_TIMEOUT);
251251
_MQTT_client.setCallback(incomingMQTT);
252252

253253
#if defined(MY_GATEWAY_ESP8266) || defined(MY_GATEWAY_ESP32)

keywords.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ MY_MQTT_PASSWORD LITERAL1
258258
MY_MQTT_PUBLISH_TOPIC_PREFIX LITERAL1
259259
MY_MQTT_SUBSCRIBE_TOPIC_PREFIX LITERAL1
260260
MY_MQTT_USER LITERAL1
261+
MY_MQTT_ETH_CLIENT_CONNECTION_TIMEOUT LITERAL1
262+
MY_MQTT_ETH_INIT_DELAY LITERAL1
261263
MY_W5100_SPI_EN LITERAL1
262264
MY_WIFI_SSID LITERAL1
263265
MY_WIFI_BSSID LITERAL1

0 commit comments

Comments
 (0)