sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-19 08:15:49 +00:00
Code Issues Releases Wiki Activity

Merge branch 'integration' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-18 09:58:59 -06:00
parent 9091285559 44d40804b2
commit 6253496192
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -445,6 +445,12 @@ void WiFiComponent::loop() {
switch (this->state_) { switch (this->state_) {
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"));
// Skip cooldown if new credentials were provided while connecting
if (this->skip_cooldown_next_cycle_) {
this->skip_cooldown_next_cycle_ = false;
this->check_connecting_finished();
break;
}
// Use longer cooldown when captive portal/improv is active to avoid disrupting user config // Use longer cooldown when captive portal/improv is active to avoid disrupting user config
bool portal_active = this->is_captive_portal_active_() || this->is_esp32_improv_active_(); bool portal_active = this->is_captive_portal_active_() || this->is_esp32_improv_active_();
uint32_t cooldown_duration = portal_active ? WIFI_COOLDOWN_WITH_AP_ACTIVE_MS : WIFI_COOLDOWN_DURATION_MS; uint32_t cooldown_duration = portal_active ? WIFI_COOLDOWN_WITH_AP_ACTIVE_MS : WIFI_COOLDOWN_DURATION_MS;
@@ -613,6 +619,9 @@ void WiFiComponent::set_sta(const WiFiAP &ap) {
this->init_sta(1); this->init_sta(1);
this->add_sta(ap); this->add_sta(ap);
this->selected_sta_index_ = 0; this->selected_sta_index_ = 0;
// Force scan on next attempt even if captive portal is still active
// This ensures new credentials are tried with proper BSSID selection after provisioning
this->force_scan_after_provision_ = true;
} }
WiFiAP WiFiComponent::build_params_for_current_phase_() { WiFiAP WiFiComponent::build_params_for_current_phase_() {
@@ -692,6 +701,14 @@ void WiFiComponent::connect_soon_() {
} }
void WiFiComponent::start_connecting(const WiFiAP &ap) { void WiFiComponent::start_connecting(const WiFiAP &ap) {
// If already connecting/connected, set flag to skip cooldown on next cycle
// Caller (e.g., improv) already called set_sta() with new credentials, state machine will retry
if (this->state_ == WIFI_COMPONENT_STATE_STA_CONNECTING || this->state_ == WIFI_COMPONENT_STATE_STA_CONNECTED) {
ESP_LOGD(TAG, "Already connecting, will retry on next cycle");
this->skip_cooldown_next_cycle_ = true;
return;
}
// Log connection attempt at INFO level with priority // Log connection attempt at INFO level with priority
char bssid_s[18]; char bssid_s[18];
int8_t priority = 0; int8_t priority = 0;

1
esphome/components/wifi/wifi_component.h
View File

@@ -534,6 +534,7 @@ class WiFiComponent : public Component {
bool keep_scan_results_{false}; bool keep_scan_results_{false};
bool force_scan_after_provision_{false}; bool force_scan_after_provision_{false};
bool did_scan_this_cycle_{false}; bool did_scan_this_cycle_{false};
bool skip_cooldown_next_cycle_{false};
// Pointers at the end (naturally aligned) // Pointers at the end (naturally aligned)
Trigger<> *connect_trigger_{new Trigger<>()}; Trigger<> *connect_trigger_{new Trigger<>()};