sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-18 07:45:56 +00:00
Code Issues Releases Wiki Activity

preen

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-06 11:54:09 -06:00
parent 27fb72a1d3
commit 083f41c43f
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,6 @@ void WiFiComponent::start() {
if (!this->trying_loaded_ap_) { if (!this->trying_loaded_ap_) {
// Fast connect failed - start from first configured AP without scan result // Fast connect failed - start from first configured AP without scan result
this->selected_sta_index_ = 0; this->selected_sta_index_ = 0;
this->selected_scan_index_ = -1;
} }
this->start_connecting_to_selected_(false); this->start_connecting_to_selected_(false);
#else #else
@@ -336,12 +335,10 @@ void WiFiComponent::set_sta(const WiFiAP &ap) {
this->init_sta(1); this->init_sta(1);
this->add_sta(ap); this->add_sta(ap);
this->selected_sta_index_ = 0; this->selected_sta_index_ = 0;
this->selected_scan_index_ = -1;
} }
void WiFiComponent::clear_sta() { void WiFiComponent::clear_sta() {
this->sta_.clear(); this->sta_.clear();
this->selected_sta_index_ = -1; this->selected_sta_index_ = -1;
this->selected_scan_index_ = -1;
} }
WiFiAP WiFiComponent::build_selected_ap_() const { WiFiAP WiFiComponent::build_selected_ap_() const {
@@ -370,8 +367,9 @@ WiFiAP WiFiComponent::build_selected_ap_() const {
} }
// Overlay scan result data (if available) // Overlay scan result data (if available)
if (this->selected_scan_index_ >= 0 && this->selected_scan_index_ < this->scan_result_.size()) { // Scan results are sorted, so index 0 is always the best network
const WiFiScanResult &scan = this->scan_result_[this->selected_scan_index_]; if (!this->scan_result_.empty()) {
const WiFiScanResult &scan = this->scan_result_[0];
if (!params.get_hidden()) { if (!params.get_hidden()) {
// Selected network is visible, we use the data from the scan. // Selected network is visible, we use the data from the scan.
@@ -691,9 +689,8 @@ void WiFiComponent::check_scanning_finished() {
return; return;
} }
// Find matching config and set indices for on-demand connection params building // Find matching config for on-demand connection params building
const WiFiScanResult &scan_res = this->scan_result_[0]; const WiFiScanResult &scan_res = this->scan_result_[0];
this->selected_scan_index_ = 0;
for (size_t i = 0; i < this->sta_.size(); i++) { for (size_t i = 0; i < this->sta_.size(); i++) {
// search for matching STA config, at least one will match (from checks before) // search for matching STA config, at least one will match (from checks before)
@@ -760,7 +757,6 @@ void WiFiComponent::check_connecting_finished() {
if (!this->keep_scan_results_) { if (!this->keep_scan_results_) {
this->scan_result_.clear(); this->scan_result_.clear();
this->scan_result_.shrink_to_fit(); this->scan_result_.shrink_to_fit();
this->selected_scan_index_ = -1; // Invalidate index since scan results are gone
} }
return; return;
@@ -822,7 +818,6 @@ void WiFiComponent::retry_connect() {
this->selected_sta_index_++; this->selected_sta_index_++;
} }
this->num_retried_ = 0; this->num_retried_ = 0;
this->selected_scan_index_ = -1;
#else #else
if (this->num_retried_ > 5) { if (this->num_retried_ > 5) {
// If retry failed for more than 5 times, let's restart STA // If retry failed for more than 5 times, let's restart STA
@@ -893,9 +888,8 @@ bool WiFiComponent::load_fast_connect_settings_() {
WiFiScanResult fast_connect_scan(bssid, "", fast_connect_save.channel, 0, false, false); WiFiScanResult fast_connect_scan(bssid, "", fast_connect_save.channel, 0, false, false);
this->scan_result_.push_back(fast_connect_scan); this->scan_result_.push_back(fast_connect_scan);
// Set indices to use the loaded AP config and temporary scan result // Set index to use the loaded AP config with temporary scan result
this->selected_sta_index_ = fast_connect_save.ap_index; this->selected_sta_index_ = fast_connect_save.ap_index;
this->selected_scan_index_ = 0;
ESP_LOGD(TAG, "Loaded fast_connect settings"); ESP_LOGD(TAG, "Loaded fast_connect settings");
return true; return true;
@@ -909,8 +903,8 @@ void WiFiComponent::save_fast_connect_settings_() {
uint8_t channel = get_wifi_channel(); uint8_t channel = get_wifi_channel();
// Skip save if settings haven't changed (compare with current scan result if available) // Skip save if settings haven't changed (compare with current scan result if available)
if (this->selected_scan_index_ >= 0 && this->selected_scan_index_ < this->scan_result_.size()) { if (!this->scan_result_.empty()) {
const WiFiScanResult &scan = this->scan_result_[this->selected_scan_index_]; const WiFiScanResult &scan = this->scan_result_[0];
if (bssid == scan.get_bssid() && channel == scan.get_channel()) { if (bssid == scan.get_bssid() && channel == scan.get_channel()) {
return; // No change, nothing to save return; // No change, nothing to save
} }

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

@@ -349,7 +349,6 @@ class WiFiComponent : public Component {
void reset_selected_ap_to_first_if_invalid_() { void reset_selected_ap_to_first_if_invalid_() {
if (this->selected_sta_index_ < 0 || this->selected_sta_index_ >= this->sta_.size()) { if (this->selected_sta_index_ < 0 || this->selected_sta_index_ >= this->sta_.size()) {
this->selected_sta_index_ = this->sta_.empty() ? -1 : 0; this->selected_sta_index_ = this->sta_.empty() ? -1 : 0;
this->selected_scan_index_ = -1;
} }
} }
@@ -436,9 +435,6 @@ class WiFiComponent : public Component {
// Index into sta_ array for the currently selected AP configuration (-1 = none selected) // Index into sta_ array for the currently selected AP configuration (-1 = none selected)
// Used to access password, manual_ip, priority, EAP settings, and hidden flag // Used to access password, manual_ip, priority, EAP settings, and hidden flag
int8_t selected_sta_index_{-1}; int8_t selected_sta_index_{-1};
// Index into scan_result_ array for the currently selected scan result (-1 = no scan data)
// Used to access scanned SSID, BSSID, and channel. Also used for fast connect (synthetic scan result)
int8_t selected_scan_index_{-1};
#if USE_NETWORK_IPV6 #if USE_NETWORK_IPV6
uint8_t num_ipv6_addresses_{0}; uint8_t num_ipv6_addresses_{0};
#endif /* USE_NETWORK_IPV6 */ #endif /* USE_NETWORK_IPV6 */