jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-16 07:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Matter and mDNS can be enabled at the same time (#23373)

Browse Source
This commit is contained in:
s-hadinger 2025-05-04 10:15:07 +02:00 committed by GitHub
parent d7073b3bdf
commit 9ed833ec5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file.
- Berry string literals containing NULL are truncated (#23312) - Berry string literals containing NULL are truncated (#23312)
- Berry `display.touch_update` wrongly applies resistive calibration (#23363) - Berry `display.touch_update` wrongly applies resistive calibration (#23363)
- NimBLE log_level definition conflict (#23366) - NimBLE log_level definition conflict (#23366)
- Matter and mDNS can be enabled at the same time
### Removed ### Removed

2
tasmota/tasmota_support/support_network.ino
View File

@ -29,7 +29,9 @@ struct {
void StartMdns(void) { void StartMdns(void) {
if (Settings->flag3.mdns_enabled) { // SetOption55 - Control mDNS service if (Settings->flag3.mdns_enabled) { // SetOption55 - Control mDNS service
if (!Mdns.begun) { if (!Mdns.begun) {
#ifdef ESP8266 // the following will break Matter support, MDNS.end() does not seem necessary for ESP32, but I prefer to keep it on ESP8266 because I can't test it (#23371)
MDNS.end(); // close existing or MDNS.begin will fail MDNS.end(); // close existing or MDNS.begin will fail
#endif // ESP8266
Mdns.begun = (uint8_t)MDNS.begin(TasmotaGlobal.hostname); Mdns.begun = (uint8_t)MDNS.begin(TasmotaGlobal.hostname);
AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS "%s '%s.local'"), (Mdns.begun) ? PSTR(D_INITIALIZED) : PSTR(D_FAILED), TasmotaGlobal.hostname); AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_MDNS "%s '%s.local'"), (Mdns.begun) ? PSTR(D_INITIALIZED) : PSTR(D_FAILED), TasmotaGlobal.hostname);
} }