sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-13 23:33:48 +01:00
Code Issues Releases Wiki Activity

[esp32_improv] Fix state not transitioning to PROVISIONED when WiFi configured via captive portal

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-11 12:55:03 -10:00
parent dcf2697a2a
commit ff6191cfd4
2 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,9 @@ void ESP32ImprovComponent::setup() {
#endif #endif
global_ble_server->on_disconnect([this](uint16_t conn_id) { this->set_error_(improv::ERROR_NONE); }); global_ble_server->on_disconnect([this](uint16_t conn_id) { this->set_error_(improv::ERROR_NONE); });
// Listen for WiFi connections to detect when provisioning happens via captive portal or other means
wifi::global_wifi_component->get_connect_trigger()->add_callback([this]() { this->on_wifi_connected_(); });
// Start with loop disabled - will be enabled by start() when needed // Start with loop disabled - will be enabled by start() when needed
this->disable_loop(); this->disable_loop();
} }
@@ -161,25 +164,7 @@ void ESP32ImprovComponent::loop() {
case improv::STATE_PROVISIONING: { case improv::STATE_PROVISIONING: {
this->set_status_indicator_state_((now % 200) < 100); this->set_status_indicator_state_((now % 200) < 100);
if (wifi::global_wifi_component->is_connected()) { if (wifi::global_wifi_component->is_connected()) {
wifi::global_wifi_component->save_wifi_sta(this->connecting_sta_.get_ssid(), this->on_wifi_connected_();
this->connecting_sta_.get_password());
this->connecting_sta_ = {};
this->cancel_timeout("wifi-connect-timeout");
this->set_state_(improv::STATE_PROVISIONED);
std::vector<std::string> urls = {ESPHOME_MY_LINK};
#ifdef USE_WEBSERVER
for (auto &ip : wifi::global_wifi_component->wifi_sta_ip_addresses()) {
if (ip.is_ip4()) {
std::string webserver_url = "http://" + ip.str() + ":" + to_string(USE_WEBSERVER_PORT);
urls.push_back(webserver_url);
break;
}
}
#endif
std::vector<uint8_t> data = improv::build_rpc_response(improv::WIFI_SETTINGS, urls);
this->send_response_(data);
this->stop();
} }
break; break;
} }
@@ -392,6 +377,36 @@ void ESP32ImprovComponent::on_wifi_connect_timeout_() {
wifi::global_wifi_component->clear_sta(); wifi::global_wifi_component->clear_sta();
} }
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");
std::vector<std::string> urls = {ESPHOME_MY_LINK};
#ifdef USE_WEBSERVER
for (auto &ip : wifi::global_wifi_component->wifi_sta_ip_addresses()) {
if (ip.is_ip4()) {
std::string webserver_url = "http://" + ip.str() + ":" + to_string(USE_WEBSERVER_PORT);
urls.push_back(webserver_url);
break;
}
}
#endif
std::vector<uint8_t> 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, transitioning to provisioned state");
}
// Common actions for both cases
this->set_state_(improv::STATE_PROVISIONED);
this->stop();
}
void ESP32ImprovComponent::advertise_service_data_() { void ESP32ImprovComponent::advertise_service_data_() {
uint8_t service_data[IMPROV_SERVICE_DATA_SIZE] = {}; uint8_t service_data[IMPROV_SERVICE_DATA_SIZE] = {};
service_data[0] = IMPROV_PROTOCOL_ID_1; // PR service_data[0] = IMPROV_PROTOCOL_ID_1; // PR

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

@@ -111,6 +111,7 @@ 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_();
bool check_identify_(); bool check_identify_();
void advertise_service_data_(); void advertise_service_data_();
#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_DEBUG #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_DEBUG