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

cleanup

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-09 11:38:29 -06:00
parent 94a09ffe2b
commit bd92487cf3
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,18 +92,16 @@ static void apply_scan_result_to_params(WiFiAP &params, const WiFiScanResult &sc
params.set_channel(scan.get_channel()); params.set_channel(scan.get_channel());
} }
/// Check if there's another BSSID with the same SSID in scan results (read-only check) /// Check if there's another matching BSSID in scan results (read-only check)
/// Returns true if found, false otherwise (does not modify state) /// Returns true if found, false otherwise (does not modify state)
bool WiFiComponent::has_next_bssid_with_same_ssid_() const { bool WiFiComponent::has_next_matching_bssid_() const {
if (this->scan_result_.empty() || this->scan_result_index_ >= this->scan_result_.size()) { if (this->scan_result_.empty() || this->scan_result_index_ >= this->scan_result_.size()) {
return false; return false;
} }
const auto &current_ssid = this->scan_result_[this->scan_result_index_].get_ssid(); // Check if there's any matching AP after current index
// Search for next AP with same SSID
for (size_t i = this->scan_result_index_ + 1; i < this->scan_result_.size(); i++) { for (size_t i = this->scan_result_index_ + 1; i < this->scan_result_.size(); i++) {
if (this->scan_result_[i].get_ssid() == current_ssid) { if (this->scan_result_[i].get_matches()) {
return true; return true;
} }
} }
@@ -111,19 +109,17 @@ bool WiFiComponent::has_next_bssid_with_same_ssid_() const {
return false; return false;
} }
/// Advance to the next BSSID with the same SSID in scan results /// Advance to the next matching BSSID in scan results (any configured SSID)
/// Returns true if found and advanced, false if no more BSSIDs available /// Returns true if found and advanced, false if no more BSSIDs available
/// @param reset_counter If true, resets num_retried_ to 0 (used when staying in same phase) /// @param reset_counter If true, resets num_retried_ to 0 (used when staying in same phase)
bool WiFiComponent::advance_to_next_bssid_with_same_ssid_(bool reset_counter) { bool WiFiComponent::advance_to_next_matching_bssid_(bool reset_counter) {
if (this->scan_result_.empty() || this->scan_result_index_ >= this->scan_result_.size()) { if (this->scan_result_.empty() || this->scan_result_index_ >= this->scan_result_.size()) {
return false; return false;
} }
const auto &current_ssid = this->scan_result_[this->scan_result_index_].get_ssid(); // Search for next matching AP (any configured SSID)
// Search for next AP with same SSID
for (size_t i = this->scan_result_index_ + 1; i < this->scan_result_.size(); i++) { for (size_t i = this->scan_result_index_ + 1; i < this->scan_result_.size(); i++) {
if (this->scan_result_[i].get_ssid() == current_ssid) { if (this->scan_result_[i].get_matches()) {
this->scan_result_index_ = i; this->scan_result_index_ = i;
if (reset_counter) { if (reset_counter) {
this->num_retried_ = 0; this->num_retried_ = 0;
@@ -990,8 +986,8 @@ WiFiRetryPhase WiFiComponent::determine_next_phase_() {
return WiFiRetryPhase::SCAN_CONNECTING; // Keep retrying return WiFiRetryPhase::SCAN_CONNECTING; // Keep retrying
} }
// Auth failure + have other same-SSID APs available? Try mesh fallback // Auth failure + have other matching APs available? Try next BSSID
if (wifi_sta_connect_auth_failed() && this->has_next_bssid_with_same_ssid_()) { if (wifi_sta_connect_auth_failed() && this->has_next_matching_bssid_()) {
return WiFiRetryPhase::SCAN_NEXT_SAME_SSID; return WiFiRetryPhase::SCAN_NEXT_SAME_SSID;
} }
@@ -1003,8 +999,8 @@ WiFiRetryPhase WiFiComponent::determine_next_phase_() {
return WiFiRetryPhase::SCAN_NEXT_SAME_SSID; // Keep retrying current AP return WiFiRetryPhase::SCAN_NEXT_SAME_SSID; // Keep retrying current AP
} }
// Try to advance to another same-SSID AP // Try to advance to another matching AP
if (this->advance_to_next_bssid_with_same_ssid_(false)) { if (this->advance_to_next_matching_bssid_(false)) {
return WiFiRetryPhase::SCAN_NEXT_SAME_SSID; // Stay in phase but with new BSSID return WiFiRetryPhase::SCAN_NEXT_SAME_SSID; // Stay in phase but with new BSSID
} }
@@ -1081,11 +1077,11 @@ bool WiFiComponent::transition_to_phase_(WiFiRetryPhase old_phase, WiFiRetryPhas
break; break;
case WiFiRetryPhase::SCAN_NEXT_SAME_SSID: case WiFiRetryPhase::SCAN_NEXT_SAME_SSID:
// Advance to next BSSID with same SSID when first entering this phase // Advance to next matching BSSID when first entering this phase
// Don't reset counter - transition_to_phase_() already did that // Don't reset counter - transition_to_phase_() already did that
// If no next BSSID found, just skip - determine_next_phase_() will handle transition // If no next BSSID found, just skip - determine_next_phase_() will handle transition
if (!this->advance_to_next_bssid_with_same_ssid_(false)) { if (!this->advance_to_next_matching_bssid_(false)) {
ESP_LOGD(TAG, "No more same-SSID APs available"); ESP_LOGD(TAG, "No more matching APs available");
} }
break; break;

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

@@ -372,13 +372,13 @@ class WiFiComponent : public Component {
/// Transition to a new retry phase with logging /// Transition to a new retry phase with logging
/// Returns true if a scan was started (caller should wait), false otherwise /// Returns true if a scan was started (caller should wait), false otherwise
bool transition_to_phase_(WiFiRetryPhase old_phase, WiFiRetryPhase new_phase); bool transition_to_phase_(WiFiRetryPhase old_phase, WiFiRetryPhase new_phase);
/// Check if there's another BSSID with the same SSID in scan results (read-only) /// Check if there's another matching BSSID in scan results (read-only)
/// Returns true if found, false otherwise (does not modify state) /// Returns true if found, false otherwise (does not modify state)
bool has_next_bssid_with_same_ssid_() const; bool has_next_matching_bssid_() const;
/// Advance to the next BSSID with the same SSID in scan results /// Advance to the next matching BSSID in scan results (any configured SSID)
/// Returns true if found and advanced, false if no more BSSIDs available /// Returns true if found and advanced, false if no more BSSIDs available
/// @param reset_counter If true, resets num_retried_ to 0 (used when staying in same phase) /// @param reset_counter If true, resets num_retried_ to 0 (used when staying in same phase)
bool advance_to_next_bssid_with_same_ssid_(bool reset_counter); bool advance_to_next_matching_bssid_(bool reset_counter);
const WiFiAP *get_selected_sta_() const { const WiFiAP *get_selected_sta_() const {
if (this->selected_sta_index_ >= 0 && static_cast<size_t>(this->selected_sta_index_) < this->sta_.size()) { if (this->selected_sta_index_ >= 0 && static_cast<size_t>(this->selected_sta_index_) < this->sta_.size()) {