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

cleanup

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-09 10:09:49 -06:00
parent 629cd6cf7c
commit f34aa529f9
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,10 @@ static const LogString *retry_phase_to_log_string(WiFiRetryPhase phase) {
switch (phase) { switch (phase) {
case WiFiRetryPhase::INITIAL_CONNECT: case WiFiRetryPhase::INITIAL_CONNECT:
return LOG_STR("INITIAL_CONNECT"); return LOG_STR("INITIAL_CONNECT");
#ifdef USE_WIFI_FAST_CONNECT
case WiFiRetryPhase::FAST_CONNECT_CYCLING_APS: case WiFiRetryPhase::FAST_CONNECT_CYCLING_APS:
return LOG_STR("FAST_CONNECT_CYCLING"); return LOG_STR("FAST_CONNECT_CYCLING");
#endif
case WiFiRetryPhase::SCAN_CONNECTING: case WiFiRetryPhase::SCAN_CONNECTING:
return LOG_STR("SCAN_CONNECTING"); return LOG_STR("SCAN_CONNECTING");
case WiFiRetryPhase::SCAN_NEXT_SAME_SSID: case WiFiRetryPhase::SCAN_NEXT_SAME_SSID:
@@ -404,7 +406,9 @@ WiFiAP WiFiComponent::build_params_for_current_phase_() {
switch (this->retry_phase_) { switch (this->retry_phase_) {
case WiFiRetryPhase::INITIAL_CONNECT: case WiFiRetryPhase::INITIAL_CONNECT:
#ifdef USE_WIFI_FAST_CONNECT
case WiFiRetryPhase::FAST_CONNECT_CYCLING_APS: case WiFiRetryPhase::FAST_CONNECT_CYCLING_APS:
#endif
// Fast connect phases: use config-only (no scan results) // Fast connect phases: use config-only (no scan results)
// BSSID/channel from config if user specified them, otherwise empty // BSSID/channel from config if user specified them, otherwise empty
break; break;
@@ -882,6 +886,7 @@ WiFiRetryPhase WiFiComponent::determine_next_phase_() {
// No more fast_connect APs (or fast_connect disabled), fall back to scan // No more fast_connect APs (or fast_connect disabled), fall back to scan
return WiFiRetryPhase::SCAN_CONNECTING; return WiFiRetryPhase::SCAN_CONNECTING;
#ifdef USE_WIFI_FAST_CONNECT
case WiFiRetryPhase::FAST_CONNECT_CYCLING_APS: case WiFiRetryPhase::FAST_CONNECT_CYCLING_APS:
if (this->num_retried_ < 3) { if (this->num_retried_ < 3) {
return WiFiRetryPhase::FAST_CONNECT_CYCLING_APS; // Keep retrying return WiFiRetryPhase::FAST_CONNECT_CYCLING_APS; // Keep retrying
@@ -894,6 +899,7 @@ WiFiRetryPhase WiFiComponent::determine_next_phase_() {
// Exhausted, need to scan // Exhausted, need to scan
return WiFiRetryPhase::SCAN_CONNECTING; return WiFiRetryPhase::SCAN_CONNECTING;
} }
#endif
case WiFiRetryPhase::SCAN_CONNECTING: case WiFiRetryPhase::SCAN_CONNECTING:
if (this->num_retried_ < 3) { if (this->num_retried_ < 3) {
@@ -967,21 +973,21 @@ void WiFiComponent::transition_to_phase_(WiFiRetryPhase new_phase) {
// Phase-specific setup // Phase-specific setup
switch (new_phase) { switch (new_phase) {
#ifdef USE_WIFI_FAST_CONNECT
case WiFiRetryPhase::FAST_CONNECT_CYCLING_APS: case WiFiRetryPhase::FAST_CONNECT_CYCLING_APS:
// Move to next configured AP // Move to next configured AP
this->selected_sta_index_++; this->selected_sta_index_++;
#ifdef USE_WIFI_FAST_CONNECT
this->reset_for_next_ap_attempt_(); this->reset_for_next_ap_attempt_();
#else
this->num_retried_ = 0;
this->scan_result_.clear();
#endif
break; break;
#endif
case WiFiRetryPhase::SCAN_CONNECTING: case WiFiRetryPhase::SCAN_CONNECTING:
// Transitioning to scan-based connection from fast_connect phases // Transitioning to scan-based connection from fast_connect phases
if (this->retry_phase_ == WiFiRetryPhase::INITIAL_CONNECT || if (this->retry_phase_ == WiFiRetryPhase::INITIAL_CONNECT
this->retry_phase_ == WiFiRetryPhase::FAST_CONNECT_CYCLING_APS) { #ifdef USE_WIFI_FAST_CONNECT
|| this->retry_phase_ == WiFiRetryPhase::FAST_CONNECT_CYCLING_APS
#endif
) {
ESP_LOGI(TAG, "Fast connect exhausted, falling back to scan-based connection"); ESP_LOGI(TAG, "Fast connect exhausted, falling back to scan-based connection");
this->selected_sta_index_ = 0; this->selected_sta_index_ = 0;
this->scan_result_index_ = 0; this->scan_result_index_ = 0;

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

@@ -103,8 +103,10 @@ enum class WiFiSTAConnectStatus : int {
enum class WiFiRetryPhase : uint8_t { enum class WiFiRetryPhase : uint8_t {
/// Initial connection attempt (varies based on fast_connect setting) /// Initial connection attempt (varies based on fast_connect setting)
INITIAL_CONNECT, INITIAL_CONNECT,
#ifdef USE_WIFI_FAST_CONNECT
/// Fast connect mode: cycling through configured APs (config-only, no scan) /// Fast connect mode: cycling through configured APs (config-only, no scan)
FAST_CONNECT_CYCLING_APS, FAST_CONNECT_CYCLING_APS,
#endif
/// Scan-based: connecting to best AP from scan results /// Scan-based: connecting to best AP from scan results
SCAN_CONNECTING, SCAN_CONNECTING,
/// Mesh fallback: trying next BSSID with same SSID after auth failure /// Mesh fallback: trying next BSSID with same SSID after auth failure