Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-27 19:57:38 +00:00
Code Issues Releases Activity

[Network] Fix merge-conflict on ESP32-build

Browse Source
This commit is contained in:
TD-er
2025-08-31 08:00:57 +02:00
parent 4c9c3c1312
commit 920d54afeb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/src/ESPEasyCore/Controller.cpp
+1 -1
View File
@@ -668,7 +668,7 @@ void MQTT_execute_connect_task(void *parameter)
LoadControllerSettings(MQTT_task_data->ControllerIndex, *ControllerSettings);
uint32_t timeout = ControllerSettings->MustCheckReply
? WiFiEventData.getSuggestedTimeout(Settings.Protocol[MQTT_task_data->ControllerIndex], ControllerSettings->ClientTimeout)
? ControllerSettings->getSuggestedTimeout(Settings.Protocol[MQTT_task_data->ControllerIndex])
: ControllerSettings->ClientTimeout;
uint8_t incr = 5; // Increment timeout between connection attempts 5 times by 100 msec