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

dry

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-06 17:06:04 -06:00
parent 2e1fd30ea0
commit 90feecb7bf
1 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,16 +347,6 @@ void WiFiComponent::clear_sta() {
this->selected_sta_index_ = -1;
}
// Helper to copy base config settings (password, manual_ip, priority, EAP) from source to dest
static void copy_wifi_ap_base_config(WiFiAP &dest, const WiFiAP &source) {
dest.set_password(source.get_password());
dest.set_manual_ip(source.get_manual_ip());
dest.set_priority(source.get_priority());
#ifdef USE_WIFI_WPA2_EAP
dest.set_eap(source.get_eap());
#endif
}
WiFiAP WiFiComponent::build_wifi_ap_from_selected_() const {
const WiFiAP *config = this->get_selected_sta_();
if (!config) {
@@ -364,9 +354,8 @@ WiFiAP WiFiComponent::build_wifi_ap_from_selected_() const {
return {};
}
WiFiAP params;
// Copy config data that's never overridden (password, manual IP, priority, EAP)
copy_wifi_ap_base_config(params, *config);
// Start with a copy of the entire config
WiFiAP params = *config;
// SYNCHRONIZATION: selected_sta_index_ and scan_result_[0] are kept in sync:
// - wifi_scan_done() sorts all scan results by priority/RSSI (best first)
@@ -374,22 +363,20 @@ WiFiAP WiFiComponent::build_wifi_ap_from_selected_() const {
// - Sets selected_sta_index_ = i to record that matching config
// Therefore scan_result_[0] is guaranteed to match sta_[selected_sta_index_]
if (!this->scan_result_.empty()) {
// Use scan data - network is visible (hidden defaults to false)
// Override with scan data - network is visible (hidden defaults to false)
const WiFiScanResult &scan = this->scan_result_[0];
params.set_hidden(false);
params.set_ssid(scan.get_ssid());
params.set_bssid(scan.get_bssid());
params.set_channel(scan.get_channel());
} else {
// Use config settings
params.set_ssid(config->get_ssid());
const auto hidden = config->get_hidden();
params.set_hidden(hidden);
} else if (config->get_hidden()) {
// For hidden networks, clear BSSID and channel even if set in config
// There might be multiple hidden networks with same SSID but we can't know which is correct
// Rely on probe-req with just SSID. Empty channel triggers ALL_CHANNEL_SCAN.
params.set_bssid(hidden ? optional<bssid_t>{} : config->get_bssid());
params.set_channel(hidden ? optional<uint8_t>{} : config->get_channel());
params.set_bssid(optional<bssid_t>{});
params.set_channel(optional<uint8_t>{});
}
return params;
}
@@ -919,18 +906,15 @@ bool WiFiComponent::load_fast_connect_settings_(WiFiAP &params) {
// Set selected index for future operations (save, retry, etc)
this->selected_sta_index_ = fast_connect_save.ap_index;
// Build WiFiAP directly from saved settings + config
const WiFiAP &config = this->sta_[fast_connect_save.ap_index];
// Copy config data that's never overridden (password, manual IP, priority, EAP)
copy_wifi_ap_base_config(params, config);
// Copy entire config, then override with fast connect data
params = this->sta_[fast_connect_save.ap_index];
// Use saved BSSID/channel from fast connect, SSID from config
params.set_ssid(config.get_ssid());
// Override with saved BSSID/channel from fast connect (SSID/password/hidden/etc already copied)
bssid_t bssid{};
std::copy(fast_connect_save.bssid, fast_connect_save.bssid + 6, bssid.begin());
params.set_bssid(bssid);
params.set_channel(fast_connect_save.channel);
// hidden defaults to false (network was found before, so not hidden)
// Network was found before, so not hidden (already false in default-constructed WiFiAP)
ESP_LOGD(TAG, "Loaded fast_connect settings");
return true;