mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-25 11:46:31 +00:00
Fix KNX reconnection issue
5.13.1a * Fix KNX reconnection issue (#2679)
This commit is contained in:
parent
f7ecc99209
commit
d18707f977
@ -182,6 +182,7 @@ People helping to keep the show on the road:
|
|||||||
- Gerhard Mutz for his SGP30 and Sunrise/Sunset driver
|
- Gerhard Mutz for his SGP30 and Sunrise/Sunset driver
|
||||||
- Nuno Ferreira for his HC-SR04 driver
|
- Nuno Ferreira for his HC-SR04 driver
|
||||||
- Adrian Scillato for his (security)fixes and implementing and maintaining KNX
|
- 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
|
- Raymond Mouthaan for managing Wemos Wiki information
|
||||||
- Norbert Richter, Frogmore42 and Jason2866 for providing many issue answers
|
- Norbert Richter, Frogmore42 and Jason2866 for providing many issue answers
|
||||||
- Many more providing Tips, Pocs or PRs
|
- Many more providing Tips, Pocs or PRs
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
* Fix several timer data input and output errors (#2597, #2620)
|
* Fix several timer data input and output errors (#2597, #2620)
|
||||||
* Fix KNX config error (#2628)
|
* Fix KNX config error (#2628)
|
||||||
* Fix sensor MHZ-19 vanishing data over time (#2659)
|
* Fix sensor MHZ-19 vanishing data over time (#2659)
|
||||||
|
* Fix KNX reconnection issue (#2679)
|
||||||
* Add Portuguese in Brazil language file
|
* Add Portuguese in Brazil language file
|
||||||
* Add rule state test for On/Off in addition to 0/1 (#2613)
|
* Add rule state test for On/Off in addition to 0/1 (#2613)
|
||||||
* Add hardware serial option to MHZ-19 sensor (#2659)
|
* Add hardware serial option to MHZ-19 sensor (#2659)
|
||||||
|
@ -35,6 +35,10 @@ byte oswatch_blocked_loop = 0;
|
|||||||
//void OsWatchTicker() ICACHE_RAM_ATTR;
|
//void OsWatchTicker() ICACHE_RAM_ATTR;
|
||||||
#endif // USE_WS2812_DMA
|
#endif // USE_WS2812_DMA
|
||||||
|
|
||||||
|
#ifdef USE_KNX
|
||||||
|
bool knx_started = false;
|
||||||
|
#endif // USE_KNX
|
||||||
|
|
||||||
void OsWatchTicker()
|
void OsWatchTicker()
|
||||||
{
|
{
|
||||||
unsigned long t = millis();
|
unsigned long t = millis();
|
||||||
@ -822,11 +826,20 @@ void WifiCheck(uint8_t param)
|
|||||||
}
|
}
|
||||||
#endif // USE_EMULATION
|
#endif // USE_EMULATION
|
||||||
#endif // USE_WEBSERVER
|
#endif // USE_WEBSERVER
|
||||||
|
#ifdef USE_KNX
|
||||||
|
if (!knx_started && Settings.flag.knx_enabled) {
|
||||||
|
KNXStart();
|
||||||
|
knx_started = true;
|
||||||
|
}
|
||||||
|
#endif // USE_KNX
|
||||||
} else {
|
} else {
|
||||||
#if defined(USE_WEBSERVER) && defined(USE_EMULATION)
|
#if defined(USE_WEBSERVER) && defined(USE_EMULATION)
|
||||||
UdpDisconnect();
|
UdpDisconnect();
|
||||||
#endif // USE_EMULATION
|
#endif // USE_EMULATION
|
||||||
mdns_begun = false;
|
mdns_begun = false;
|
||||||
|
#ifdef USE_KNX
|
||||||
|
knx_started = false;
|
||||||
|
#endif // USE_KNX
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -392,9 +392,6 @@ void StartWebserver(int type, IPAddress ipweb)
|
|||||||
}
|
}
|
||||||
#endif // USE_EMULATION
|
#endif // USE_EMULATION
|
||||||
WebServer->onNotFound(HandleNotFound);
|
WebServer->onNotFound(HandleNotFound);
|
||||||
#ifdef USE_KNX
|
|
||||||
KNXStart();
|
|
||||||
#endif // USE_KNX
|
|
||||||
}
|
}
|
||||||
reset_web_log_flag = 0;
|
reset_web_log_flag = 0;
|
||||||
WebServer->begin(); // Web server start
|
WebServer->begin(); // Web server start
|
||||||
|
Loading…
x
Reference in New Issue
Block a user