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

Merge branch 'captive_fix' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-18 09:35:20 -06:00
parent 46832306ad 19bd282274
commit da70e4d9d0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ class ESP32ImprovComponent : public Component, public improv_base::ImprovBase {
void start(); void start();
void stop(); void stop();
bool is_active() const { return this->state_ != improv::STATE_STOPPED; } bool is_active() const { return this->state_ != improv::STATE_STOPPED; }
bool should_start() const { return this->should_start_; }
#ifdef USE_ESP32_IMPROV_STATE_CALLBACK #ifdef USE_ESP32_IMPROV_STATE_CALLBACK
void add_on_state_callback(std::function<void(improv::State, improv::Error)> &&callback) { void add_on_state_callback(std::function<void(improv::State, improv::Error)> &&callback) {

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

@@ -502,7 +502,8 @@ void WiFiComponent::loop() {
#endif // USE_WIFI_AP #endif // USE_WIFI_AP
#ifdef USE_IMPROV #ifdef USE_IMPROV
if (esp32_improv::global_improv_component != nullptr && !esp32_improv::global_improv_component->is_active()) { if (esp32_improv::global_improv_component != nullptr && !esp32_improv::global_improv_component->is_active() &&
!esp32_improv::global_improv_component->should_start()) {
if (now - this->last_connected_ > esp32_improv::global_improv_component->get_wifi_timeout()) { if (now - this->last_connected_ > esp32_improv::global_improv_component->get_wifi_timeout()) {
if (this->wifi_mode_(true, {})) if (this->wifi_mode_(true, {}))
esp32_improv::global_improv_component->start(); esp32_improv::global_improv_component->start();