Merge branch 'mega' into feature/P111_rc522_rfid

This commit is contained in:
Ton Huisman
2021-02-17 21:27:51 +01:00
committed by GitHub
4 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -190,7 +190,7 @@ bool MQTTConnect(controllerIndex_t controller_idx)
updateMQTTclient_connected();
// mqtt = WiFiClient(); // workaround see: https://github.com/esp8266/Arduino/issues/4497#issuecomment-373023864
yield();
delay(0);
mqtt.setTimeout(ControllerSettings.ClientTimeout);
MQTTclient.setClient(mqtt);
+2 -2
View File
@@ -991,7 +991,7 @@ bool connectClient(WiFiClient& client, IPAddress ip, uint16_t port)
// https://github.com/esp8266/Arduino/blob/18f643c7e2d6a0da9d26ff2b14c94e6536ab78c1/libraries/Ethernet/src/Dns.cpp#L44
// Thus must match the result with 1.
bool connected = (client.connect(ip, port) == 1);
yield();
delay(0);
if (!connected) {
Scheduler.sendGratuitousARP_now();
@@ -1019,7 +1019,7 @@ bool resolveHostByName(const char *aHostname, IPAddress& aResult) {
#else // if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ESP32)
bool resolvedIP = WiFi.hostByName(aHostname, aResult, CONTROLLER_CLIENTTIMEOUT_DFLT) == 1;
#endif // if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ESP32)
yield();
delay(0);
if (!resolvedIP) {
Scheduler.sendGratuitousARP_now();
+3 -3
View File
@@ -288,7 +288,7 @@ bool try_connect_host(int controller_number, WiFiUDP& client, ControllerSettings
if (!NetworkConnected()) { return false; }
client.setTimeout(ControllerSettings.ClientTimeout);
yield();
delay(0);
#ifndef BUILD_NO_DEBUG
log_connecting_to(F("UDP : "), controller_number, ControllerSettings);
#endif // ifndef BUILD_NO_DEBUG
@@ -310,7 +310,7 @@ bool try_connect_host(int controller_number, WiFiClient& client, ControllerSetti
if (!NetworkConnected()) { return false; }
// Use WiFiClient class to create TCP connections
yield();
delay(0);
client.setTimeout(ControllerSettings.ClientTimeout);
#ifndef BUILD_NO_DEBUG
log_connecting_to(loglabel, controller_number, ControllerSettings);
@@ -525,7 +525,7 @@ String send_via_http(const String& logIdentifier,
PrepareSend();
yield();
delay(0);
#if defined(CORE_POST_2_6_0) || defined(ESP32)
http.begin(client, host, port, uri, false); // HTTP
#else
+1 -1
View File
@@ -636,7 +636,7 @@ void P092_data_struct::Plugin_092_StartReceiving(taskIndex_t taskindex) {
while ((timePassedSince(start) < 100) && (DLbus_Data->ISR_PulseCount == 0)) {
// wait for first pulse received (timeout 100ms)
yield();
delay(0);
}
if (DLbus_Data->ISR_PulseCount == 0) {