sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-17 23:35:47 +00:00
Code Issues Releases Wiki Activity

cleanups

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-11 13:55:29 -06:00
parent 8b6400f24c
commit c166e063f9
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
esphome/components/wifi/wifi_component.cpp
View File

@@ -437,8 +437,14 @@ void WiFiComponent::loop() {
case WIFI_COMPONENT_STATE_COOLDOWN: { case WIFI_COMPONENT_STATE_COOLDOWN: {
this->status_set_warning(LOG_STR("waiting to reconnect")); this->status_set_warning(LOG_STR("waiting to reconnect"));
if (millis() - this->action_started_ > 5000) { if (millis() - this->action_started_ > 5000) {
// After cooldown, let retry_connect handle phase transitions and connection logic // After cooldown we either restarted the adapter because of
this->retry_connect(); // a failure, or something tried to connect over and over
// so we entered cooldown. In both cases we call
// check_connecting_finished to continue the state machine.
// If we just restarted the adapter because we failed to connect,
// this->error_from_callback_ will be true and we will move to the
// next retry phase.
this->check_connecting_finished();
} }
break; break;
} }
@@ -1083,12 +1089,18 @@ void WiFiComponent::check_connecting_finished() {
uint32_t now = millis(); uint32_t now = millis();
if (now - this->action_started_ > 30000) { if (now - this->action_started_ > 30000) {
ESP_LOGW(TAG, "Connection timeout"); ESP_LOGW(TAG, "Connection timeout");
// Move from STA_CONNECTING_2 back to STA_CONNECTING state
// since we know the connection attempt has failed
this->state_ = WIFI_COMPONENT_STATE_STA_CONNECTING;
this->retry_connect(); this->retry_connect();
return; return;
} }
if (this->error_from_callback_) { if (this->error_from_callback_) {
ESP_LOGW(TAG, "Connecting to network failed"); ESP_LOGW(TAG, "Connecting to network failed (callback)");
// Move from STA_CONNECTING_2 back to STA_CONNECTING state
// since we know the connection attempt is finished
this->state_ = WIFI_COMPONENT_STATE_STA_CONNECTING;
this->retry_connect(); this->retry_connect();
return; return;
} }
@@ -1097,6 +1109,9 @@ void WiFiComponent::check_connecting_finished() {
return; return;
} }
// Move from STA_CONNECTING_2 back to STA_CONNECTING state
// since we know the connection attempt is finished
this->state_ = WIFI_COMPONENT_STATE_STA_CONNECTING;
if (status == WiFiSTAConnectStatus::ERROR_NETWORK_NOT_FOUND) { if (status == WiFiSTAConnectStatus::ERROR_NETWORK_NOT_FOUND) {
ESP_LOGW(TAG, "Network no longer found"); ESP_LOGW(TAG, "Network no longer found");
this->retry_connect(); this->retry_connect();
@@ -1480,7 +1495,7 @@ void WiFiComponent::retry_connect() {
this->error_from_callback_ = false; this->error_from_callback_ = false;
if (this->state_ == WIFI_COMPONENT_STATE_STA_CONNECTING || this->state_ == WIFI_COMPONENT_STATE_STA_CONNECTING_2) { if (this->state_ == WIFI_COMPONENT_STATE_STA_CONNECTING) {
yield(); yield();
// Check if we have a valid target before building params // Check if we have a valid target before building params
// After exhausting all networks in a phase, selected_sta_index_ may be -1 // After exhausting all networks in a phase, selected_sta_index_ may be -1
@@ -1489,10 +1504,14 @@ void WiFiComponent::retry_connect() {
this->state_ = WIFI_COMPONENT_STATE_STA_CONNECTING_2; this->state_ = WIFI_COMPONENT_STATE_STA_CONNECTING_2;
WiFiAP params = this->build_params_for_current_phase_(); WiFiAP params = this->build_params_for_current_phase_();
this->start_connecting(params, true); this->start_connecting(params, true);
return;
} }
} else {
ESP_LOGW(TAG, "Retry called in invalid state %d", (int) this->state_);
} }
ESP_LOGD(TAG, "Entering cooldown from state %d and phase %s", this->state_,
LOG_STR_ARG(retry_phase_to_log_string(this->retry_phase_)));
this->state_ = WIFI_COMPONENT_STATE_COOLDOWN;
this->action_started_ = millis();
} }
void WiFiComponent::set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; } void WiFiComponent::set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; }