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

Fix discovery ethernet ip address 

Fix discovery ethernet ip address (#14929)
This commit is contained in:
Theo Arends 2022-02-22 15:42:04 +01:00
parent 27fb078f1b
commit 77660b5d3c
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tasmota/xdrv_12_discovery.ino
View File

@ -34,10 +34,18 @@
#define XDRV_12 12 #define XDRV_12 12
void TasDiscoverMessage(void) { void TasDiscoverMessage(void) {
uint32_t ip_address = (uint32_t)WiFi.localIP();
char* hostname = TasmotaGlobal.hostname;
#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32 && defined(USE_ETHERNET)
if (static_cast<uint32_t>(EthernetLocalIP()) != 0) {
ip_address = (uint32_t)EthernetLocalIP();
hostname = EthernetHostname();
}
#endif
Response_P(PSTR("{\"ip\":\"%_I\"," // IP Address Response_P(PSTR("{\"ip\":\"%_I\"," // IP Address
"\"dn\":\"%s\"," // Device Name "\"dn\":\"%s\"," // Device Name
"\"fn\":["), // Friendly Names (start) "\"fn\":["), // Friendly Names (start)
(uint32_t)WiFi.localIP(), ip_address,
SettingsText(SET_DEVICENAME)); SettingsText(SET_DEVICENAME));
uint32_t maxfn = (TasmotaGlobal.devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!TasmotaGlobal.devices_present) ? 1 : TasmotaGlobal.devices_present; uint32_t maxfn = (TasmotaGlobal.devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!TasmotaGlobal.devices_present) ? 1 : TasmotaGlobal.devices_present;
@ -69,7 +77,7 @@ void TasDiscoverMessage(void) {
"\"ft\":\"%s\"," // Full Topic "\"ft\":\"%s\"," // Full Topic
"\"tp\":[\"%s\",\"%s\",\"%s\"]," // Topics for command, stat and tele "\"tp\":[\"%s\",\"%s\",\"%s\"]," // Topics for command, stat and tele
"\"rl\":["), // Relays (start) "\"rl\":["), // Relays (start)
TasmotaGlobal.hostname, hostname,
NetworkUniqueId().c_str(), NetworkUniqueId().c_str(),
ModuleName().c_str(), ModuleName().c_str(),
TuyaMod, iFanMod, TuyaMod, iFanMod,

12
tasmota/xdrv_12_home_assistant.ino
View File

@ -201,10 +201,18 @@ int hass_tele_period = 0;
// NEW DISCOVERY // NEW DISCOVERY
void HassDiscoverMessage(void) { void HassDiscoverMessage(void) {
uint32_t ip_address = (uint32_t)WiFi.localIP();
char* hostname = TasmotaGlobal.hostname;
#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32 && defined(USE_ETHERNET)
if (static_cast<uint32_t>(EthernetLocalIP()) != 0) {
ip_address = (uint32_t)EthernetLocalIP();
hostname = EthernetHostname();
}
#endif
Response_P(PSTR("{\"ip\":\"%_I\"," // IP Address Response_P(PSTR("{\"ip\":\"%_I\"," // IP Address
"\"dn\":\"%s\"," // Device Name "\"dn\":\"%s\"," // Device Name
"\"fn\":["), // Friendly Names (start) "\"fn\":["), // Friendly Names (start)
(uint32_t)WiFi.localIP(), ip_address,
SettingsText(SET_DEVICENAME)); SettingsText(SET_DEVICENAME));
uint32_t maxfn = (TasmotaGlobal.devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!TasmotaGlobal.devices_present) ? 1 : TasmotaGlobal.devices_present; uint32_t maxfn = (TasmotaGlobal.devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!TasmotaGlobal.devices_present) ? 1 : TasmotaGlobal.devices_present;
@ -236,7 +244,7 @@ void HassDiscoverMessage(void) {
"\"ft\":\"%s\"," // Full Topic "\"ft\":\"%s\"," // Full Topic
"\"tp\":[\"%s\",\"%s\",\"%s\"]," // Topics for command, stat and tele "\"tp\":[\"%s\",\"%s\",\"%s\"]," // Topics for command, stat and tele
"\"rl\":["), // Relays (start) "\"rl\":["), // Relays (start)
TasmotaGlobal.hostname, hostname,
NetworkUniqueId().c_str(), NetworkUniqueId().c_str(),
ModuleName().c_str(), ModuleName().c_str(),
TuyaMod, iFanMod, TuyaMod, iFanMod,