Florian/esphome
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Captive portal fixes (#766)

Browse Source 
* Enable MDNS logs comment

* Work around ESP8266 mDNS broken for AP

See also https://github.com/esp8266/Arduino/issues/6114

* Enable captive_portal in AP-only mode

Fixes https://github.com/esphome/issues/issues/671

* Make ESP32 connecting faster

See also https://github.com/espressif/arduino-esp32/pull/2989

* Format
This commit is contained in:
Otto Winter
2019-10-18 14:46:44 +02:00
committed by GitHub
parent 1cfc6ac3c6
commit 21bbafb63d
5 changed files with 77 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
esphome/core/util.cpp
View File

@@ -2,6 +2,7 @@
#include "esphome/core/defines.h"
#include "esphome/core/application.h"
#include "esphome/core/version.h"
#include "esphome/core/log.h"
#ifdef USE_WIFI
#include "esphome/components/wifi/wifi_component.h"
@@ -38,40 +39,56 @@ bool network_is_connected() {
return false;
}
void network_setup_mdns() {
MDNS.begin(App.get_name().c_str());
#ifdef USE_API
if (api::global_api_server != nullptr) {
MDNS.addService("esphomelib", "tcp", api::global_api_server->get_port());
// DNS-SD (!=mDNS !) requires at least one TXT record for service discovery - let's add version
MDNS.addServiceTxt("esphomelib", "tcp", "version", ESPHOME_VERSION);
MDNS.addServiceTxt("esphomelib", "tcp", "address", network_get_address().c_str());
} else {
#endif
// Publish "http" service if not using native API.
// This is just to have *some* mDNS service so that .local resolution works
MDNS.addService("http", "tcp", 80);
MDNS.addServiceTxt("http", "tcp", "version", ESPHOME_VERSION);
#ifdef USE_API
}
#endif
}
void network_tick_mdns() {
#ifdef ARDUINO_ARCH_ESP8266
MDNS.update();
bool mdns_setup;
#endif
}
std::string network_get_address() {
#ifdef ARDUINO_ARCH_ESP8266
void network_setup_mdns(IPAddress address, int interface) {
// Latest arduino framework breaks mDNS for AP interface
// see https://github.com/esp8266/Arduino/issues/6114
if (interface == 1)
return;
MDNS.begin(App.get_name().c_str(), address);
mdns_setup = true;
#endif
#ifdef ARDUINO_ARCH_ESP32
void network_setup_mdns() {
MDNS.begin(App.get_name().c_str());
#endif
#ifdef USE_API
if (api::global_api_server != nullptr) {
MDNS.addService("esphomelib", "tcp", api::global_api_server->get_port());
// DNS-SD (!=mDNS !) requires at least one TXT record for service discovery - let's add version
MDNS.addServiceTxt("esphomelib", "tcp", "version", ESPHOME_VERSION);
MDNS.addServiceTxt("esphomelib", "tcp", "address", network_get_address().c_str());
} else {
#endif
// Publish "http" service if not using native API.
// This is just to have *some* mDNS service so that .local resolution works
MDNS.addService("http", "tcp", 80);
MDNS.addServiceTxt("http", "tcp", "version", ESPHOME_VERSION);
#ifdef USE_API
}
#endif
}
void network_tick_mdns() {
#ifdef ARDUINO_ARCH_ESP8266
if (mdns_setup)
MDNS.update();
#endif
}
std::string network_get_address() {
#ifdef USE_ETHERNET
if (ethernet::global_eth_component != nullptr)
return ethernet::global_eth_component->get_use_address();
if (ethernet::global_eth_component != nullptr)
return ethernet::global_eth_component->get_use_address();
#endif
#ifdef USE_WIFI
if (wifi::global_wifi_component != nullptr)
return wifi::global_wifi_component->get_use_address();
if (wifi::global_wifi_component != nullptr)
return wifi::global_wifi_component->get_use_address();
#endif
return "";
}
return "";
}
} // namespace esphome