mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add ethernet ipaddress to GUI 

Add ethernet ipaddress to GUI (#14929)
This commit is contained in:
Theo Arends 2022-02-22 15:13:26 +01:00
parent 850f50d82e
commit a6ec7dde16
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tasmota/xdrv_01_webserver.ino
View File

@ -881,12 +881,28 @@ void WSContentSendStyle_P(const char* formatP, ...) {
#endif #endif
bool lip = (static_cast<uint32_t>(WiFi.localIP()) != 0); bool lip = (static_cast<uint32_t>(WiFi.localIP()) != 0);
bool sip = (static_cast<uint32_t>(WiFi.softAPIP()) != 0); bool sip = (static_cast<uint32_t>(WiFi.softAPIP()) != 0);
WSContentSend_P(PSTR("<h4>%s%s (%s%s%s)</h4>"), // tasmota.local (192.168.2.12, 192.168.4.1) bool eip = false;
NetworkHostname(), if (lip || sip) {
(Mdns.begun) ? PSTR(".local") : "", WSContentSend_P(PSTR("<h4>%s%s (%s%s%s)"), // tasmota.local (192.168.2.12, 192.168.4.1)
(lip) ? WiFi.localIP().toString().c_str() : "", TasmotaGlobal.hostname,
(lip && sip) ? ", " : "", (Mdns.begun) ? PSTR(".local") : "",
(sip) ? WiFi.softAPIP().toString().c_str() : ""); (lip) ? WiFi.localIP().toString().c_str() : "",
(lip && sip) ? ", " : "",
(sip) ? WiFi.softAPIP().toString().c_str() : "");
}
#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32 && defined(USE_ETHERNET)
eip = (static_cast<uint32_t>(EthernetLocalIP()) != 0);
if (eip) {
WSContentSend_P(PSTR("%s%s%s (%s)"), // tasmota-eth.local (192.168.2.13)
(lip || sip) ? PSTR("</br>") : PSTR("<h4>"),
EthernetHostname(),
(Mdns.begun) ? PSTR(".local") : "",
(eip) ? EthernetLocalIP().toString().c_str() : "");
}
#endif
if (lip || sip || eip) {
WSContentSend_P(PSTR("</h4>"));
}
} }
WSContentSend_P(PSTR("</div>")); WSContentSend_P(PSTR("</div>"));
} }