Fix KNX reconnection issue

5.13.1a
* Fix KNX reconnection issue (#2679)
This commit is contained in:
Theo Arends 2018-05-11 15:00:41 +02:00
parent f7ecc99209
commit d18707f977
4 changed files with 15 additions and 3 deletions

View File

@ -182,6 +182,7 @@ People helping to keep the show on the road:
- Gerhard Mutz for his SGP30 and Sunrise/Sunset driver
- Nuno Ferreira for his HC-SR04 driver
- Adrian Scillato for his (security)fixes and implementing and maintaining KNX
- Gennaro Tortone for his Eastron SDM120 driver
- Raymond Mouthaan for managing Wemos Wiki information
- Norbert Richter, Frogmore42 and Jason2866 for providing many issue answers
- Many more providing Tips, Pocs or PRs

View File

@ -6,6 +6,7 @@
* Fix several timer data input and output errors (#2597, #2620)
* Fix KNX config error (#2628)
* Fix sensor MHZ-19 vanishing data over time (#2659)
* Fix KNX reconnection issue (#2679)
* Add Portuguese in Brazil language file
* Add rule state test for On/Off in addition to 0/1 (#2613)
* Add hardware serial option to MHZ-19 sensor (#2659)

View File

@ -35,6 +35,10 @@ byte oswatch_blocked_loop = 0;
//void OsWatchTicker() ICACHE_RAM_ATTR;
#endif // USE_WS2812_DMA
#ifdef USE_KNX
bool knx_started = false;
#endif // USE_KNX
void OsWatchTicker()
{
unsigned long t = millis();
@ -822,11 +826,20 @@ void WifiCheck(uint8_t param)
}
#endif // USE_EMULATION
#endif // USE_WEBSERVER
#ifdef USE_KNX
if (!knx_started && Settings.flag.knx_enabled) {
KNXStart();
knx_started = true;
}
#endif // USE_KNX
} else {
#if defined(USE_WEBSERVER) && defined(USE_EMULATION)
UdpDisconnect();
#endif // USE_EMULATION
mdns_begun = false;
#ifdef USE_KNX
knx_started = false;
#endif // USE_KNX
}
}
}

View File

@ -392,9 +392,6 @@ void StartWebserver(int type, IPAddress ipweb)
}
#endif // USE_EMULATION
WebServer->onNotFound(HandleNotFound);
#ifdef USE_KNX
KNXStart();
#endif // USE_KNX
}
reset_web_log_flag = 0;
WebServer->begin(); // Web server start