Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix weird ESP8266 wifi crashes #831

Merged
merged 2 commits into from Nov 2, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 5 additions & 20 deletions esphome/components/wifi/wifi_component_esp8266.cpp
Expand Up @@ -394,24 +394,6 @@ bool WiFiComponent::wifi_sta_pre_setup_() {
if (!this->wifi_mode_(true, {}))
return false;

// Clear saved STA config
station_config default_config{};
wifi_station_get_config_default(&default_config);
bool is_zero = default_config.ssid[0] == '\0' && default_config.password[0] == '\0' && default_config.bssid[0] == 0 &&
default_config.bssid_set == 0;
if (!is_zero) {
ESP_LOGV(TAG, "Clearing default wifi STA config");

memset(&default_config, 0, sizeof(default_config));
ETS_UART_INTR_DISABLE();
bool ret = wifi_station_set_config(&default_config);
ETS_UART_INTR_ENABLE();

if (!ret) {
ESP_LOGW(TAG, "Clearing default wif STA config failed!");
}
}

bool ret1, ret2;
ETS_UART_INTR_DISABLE();
ret1 = wifi_station_set_auto_connect(0);
Expand Down Expand Up @@ -496,11 +478,14 @@ bool WiFiComponent::wifi_scan_start_() {
return ret;
}
bool WiFiComponent::wifi_disconnect_() {
bool ret = true;
// Only call disconnect if interface is up
if (wifi_get_opmode() & WIFI_STA)
ret = wifi_station_disconnect();
station_config conf{};
memset(&conf, 0, sizeof(conf));
ETS_UART_INTR_DISABLE();
wifi_station_set_config(&conf);
bool ret = wifi_station_disconnect();
wifi_station_set_config_current(&conf);
ETS_UART_INTR_ENABLE();
return ret;
}
Expand Down