Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions libraries/WiFi/src/STA.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -525,25 +525,6 @@ bool STAClass::connect(
#endif /* CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT */

bool STAClass::disconnect(bool eraseap, unsigned long timeout) {
if (eraseap) {
if (!started()) {
log_e("STA not started! You must call begin first.");
return false;
}
wifi_config_t conf;
memset(&conf, 0, sizeof(wifi_config_t));
esp_err_t err = esp_wifi_set_config(WIFI_IF_STA, &conf);
if (err != ESP_OK) {
log_e("STA clear config failed! 0x%x: %s", err, esp_err_to_name(err));
return false;
}
}

if (!connected()) {
log_w("STA already disconnected.");
return true;
}

esp_err_t err = esp_wifi_disconnect();
if (err != ESP_OK) {
log_e("STA disconnect failed! 0x%x: %s", err, esp_err_to_name(err));
Expand All @@ -560,6 +541,20 @@ bool STAClass::disconnect(bool eraseap, unsigned long timeout) {
}
}

if (eraseap) {
if (!started()) {
log_e("STA not started! You must call begin first.");
return false;
}
wifi_config_t conf;
memset(&conf, 0, sizeof(wifi_config_t));
esp_err_t err = esp_wifi_set_config(WIFI_IF_STA, &conf);
if (err != ESP_OK) {
log_e("STA clear config failed! 0x%x: %s", err, esp_err_to_name(err));
return false;
}
}

return true;
}

Expand Down
Loading