From 3758b4c8015406e06d367c3afa8067715d7fa422 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 11 Oct 2025 13:45:22 -1000 Subject: [PATCH] preen --- .../components/esp32_improv/esp32_improv_component.cpp | 9 ++------- esphome/components/esp32_improv/esp32_improv_component.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/esphome/components/esp32_improv/esp32_improv_component.cpp b/esphome/components/esp32_improv/esp32_improv_component.cpp index b3258aedac..d83caf931b 100644 --- a/esphome/components/esp32_improv/esp32_improv_component.cpp +++ b/esphome/components/esp32_improv/esp32_improv_component.cpp @@ -375,15 +375,11 @@ void ESP32ImprovComponent::on_wifi_connect_timeout_() { } void ESP32ImprovComponent::check_wifi_connection_() { - if (wifi::global_wifi_component->is_connected()) { - this->on_wifi_connected_(); + if (!wifi::global_wifi_component->is_connected()) { + return; } -} -void ESP32ImprovComponent::on_wifi_connected_() { - // Handle WiFi connection, whether from Improv provisioning or external (e.g., captive portal) if (this->state_ == improv::STATE_PROVISIONING) { - // WiFi provisioned via Improv - save credentials and send response wifi::global_wifi_component->save_wifi_sta(this->connecting_sta_.get_ssid(), this->connecting_sta_.get_password()); this->connecting_sta_ = {}; this->cancel_timeout("wifi-connect-timeout"); @@ -401,7 +397,6 @@ void ESP32ImprovComponent::on_wifi_connected_() { std::vector data = improv::build_rpc_response(improv::WIFI_SETTINGS, urls); this->send_response_(data); } else if (this->is_active() && this->state_ != improv::STATE_PROVISIONED) { - // WiFi provisioned externally (e.g., captive portal) - just transition to provisioned ESP_LOGD(TAG, "WiFi provisioned externally"); } diff --git a/esphome/components/esp32_improv/esp32_improv_component.h b/esphome/components/esp32_improv/esp32_improv_component.h index da670f54bc..6782430ffe 100644 --- a/esphome/components/esp32_improv/esp32_improv_component.h +++ b/esphome/components/esp32_improv/esp32_improv_component.h @@ -111,7 +111,6 @@ class ESP32ImprovComponent : public Component { void send_response_(std::vector &response); void process_incoming_data_(); void on_wifi_connect_timeout_(); - void on_wifi_connected_(); void check_wifi_connection_(); bool check_identify_(); void advertise_service_data_();