sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-18 09:43:47 +01:00
Code Issues Releases Wiki Activity

preen

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-11 13:45:22 -10:00
parent 678a93cc56
commit 3758b4c801
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
esphome/components/esp32_improv/esp32_improv_component.cpp
View File

@@ -375,15 +375,11 @@ void ESP32ImprovComponent::on_wifi_connect_timeout_() {
} }
void ESP32ImprovComponent::check_wifi_connection_() { void ESP32ImprovComponent::check_wifi_connection_() {
if (wifi::global_wifi_component->is_connected()) { if (!wifi::global_wifi_component->is_connected()) {
this->on_wifi_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) { 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()); wifi::global_wifi_component->save_wifi_sta(this->connecting_sta_.get_ssid(), this->connecting_sta_.get_password());
this->connecting_sta_ = {}; this->connecting_sta_ = {};
this->cancel_timeout("wifi-connect-timeout"); this->cancel_timeout("wifi-connect-timeout");
@@ -401,7 +397,6 @@ void ESP32ImprovComponent::on_wifi_connected_() {
std::vector<uint8_t> data = improv::build_rpc_response(improv::WIFI_SETTINGS, urls); std::vector<uint8_t> data = improv::build_rpc_response(improv::WIFI_SETTINGS, urls);
this->send_response_(data); this->send_response_(data);
} else if (this->is_active() && this->state_ != improv::STATE_PROVISIONED) { } 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"); ESP_LOGD(TAG, "WiFi provisioned externally");
} }

1
esphome/components/esp32_improv/esp32_improv_component.h
View File

@@ -111,7 +111,6 @@ class ESP32ImprovComponent : public Component {
void send_response_(std::vector<uint8_t> &response); void send_response_(std::vector<uint8_t> &response);
void process_incoming_data_(); void process_incoming_data_();
void on_wifi_connect_timeout_(); void on_wifi_connect_timeout_();
void on_wifi_connected_();
void check_wifi_connection_(); void check_wifi_connection_();
bool check_identify_(); bool check_identify_();
void advertise_service_data_(); void advertise_service_data_();