thor/esphome-dev
1
0
Fork 0
mirror of https://github.com/Threnklyn/esphome-dev.git synced 2026-05-26 15:48:28 +02:00
Code Issues 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
esphome/components/logger/__init__.py
+2
View File
@@ -123,6 +123,8 @@ def to_code(config):
'TLS_MEM',
'UPDATER',
'WIFI',
# Spams logs too much:
# 'MDNS_RESPONDER',
}
for comp in DEBUG_COMPONENTS:
cg.add_build_flag("-DDEBUG_ESP_{}".format(comp))
esphome/components/wifi/wifi_component.cpp
+14 -1
View File
@@ -49,10 +49,16 @@ void WiFiComponent::setup() {
}
} else if (this->has_ap()) {
this->setup_ap_config_();
#ifdef USE_CAPTIVE_PORTAL
if (captive_portal::global_captive_portal != nullptr)
captive_portal::global_captive_portal->start();
#endif
}
this->wifi_apply_hostname_();
#ifdef ARDUINO_ARCH_ESP32
network_setup_mdns();
#endif
}
void WiFiComponent::loop() {
@@ -103,7 +109,8 @@ void WiFiComponent::loop() {
ESP_LOGI(TAG, "Starting fallback AP!");
this->setup_ap_config_();
#ifdef USE_CAPTIVE_PORTAL
captive_portal::global_captive_portal->start();
if (captive_portal::global_captive_portal != nullptr)
captive_portal::global_captive_portal->start();
#endif
}
}
@@ -157,6 +164,9 @@ void WiFiComponent::setup_ap_config_() {
this->ap_setup_ = this->wifi_start_ap_(this->ap_);
ESP_LOGCONFIG(TAG, " IP Address: %s", this->wifi_soft_ap_ip().toString().c_str());
#ifdef ARDUINO_ARCH_ESP8266
network_setup_mdns(this->wifi_soft_ap_ip(), 1);
#endif
if (!this->has_sta()) {
this->state_ = WIFI_COMPONENT_STATE_AP;
@@ -416,6 +426,9 @@ void WiFiComponent::check_connecting_finished() {
ESP_LOGD(TAG, "Disabling AP...");
this->wifi_mode_({}, false);
}
#ifdef ARDUINO_ARCH_ESP8266
network_setup_mdns(this->wifi_sta_ip_(), 0);
#endif
this->state_ = WIFI_COMPONENT_STATE_STA_CONNECTED;
this->num_retried_ = 0;
return;
esphome/components/wifi/wifi_component_esp32.cpp
+10 -4
View File
@@ -162,10 +162,16 @@ bool WiFiComponent::wifi_sta_connect_(WiFiAP ap) {
conf.sta.channel = *ap.get_channel();
}
esp_err_t err = esp_wifi_disconnect();
if (err != ESP_OK) {
ESP_LOGV(TAG, "esp_wifi_disconnect failed! %d", err);
return false;
wifi_config_t current_conf;
esp_err_t err;
esp_wifi_get_config(WIFI_IF_STA, &current_conf);
if (memcmp(&current_conf, &conf, sizeof(wifi_config_t)) != 0) {
err = esp_wifi_disconnect();
if (err != ESP_OK) {
ESP_LOGV(TAG, "esp_wifi_disconnect failed! %d", err);
return false;
}
}
err = esp_wifi_set_config(WIFI_IF_STA, &conf);