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

reduce complexity

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-06 16:28:54 -06:00
parent f4d2b000da
commit 645820304f
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -343,7 +343,7 @@ void WiFiComponent::clear_sta() {
this->selected_sta_index_ = -1; this->selected_sta_index_ = -1;
} }
WiFiAP WiFiComponent::build_selected_ap_() const { void WiFiComponent::start_connecting_to_selected_(bool two) {
WiFiAP params; WiFiAP params;
if (const WiFiAP *config = this->get_selected_sta_()) { if (const WiFiAP *config = this->get_selected_sta_()) {
@@ -384,7 +384,7 @@ WiFiAP WiFiComponent::build_selected_ap_() const {
} }
} }
return params; this->start_connecting(params, two);
} }
bool WiFiComponent::sync_selected_sta_to_best_scan_result_() { bool WiFiComponent::sync_selected_sta_to_best_scan_result_() {
@@ -708,7 +708,7 @@ void WiFiComponent::check_scanning_finished() {
// SYNCHRONIZATION POINT: Establish link between scan_result_[0] and selected_sta_index_ // SYNCHRONIZATION POINT: Establish link between scan_result_[0] and selected_sta_index_
// After sorting, scan_result_[0] contains the best network. Now find which sta_[i] config // After sorting, scan_result_[0] contains the best network. Now find which sta_[i] config
// matches that network and record it in selected_sta_index_. This keeps the two indices // matches that network and record it in selected_sta_index_. This keeps the two indices
// synchronized so build_selected_ap_() can safely use both to build connection parameters. // synchronized so start_connecting_to_selected_() can safely use both to build connection parameters.
if (!this->sync_selected_sta_to_best_scan_result_()) { if (!this->sync_selected_sta_to_best_scan_result_()) {
ESP_LOGW(TAG, "No matching network found"); ESP_LOGW(TAG, "No matching network found");
this->retry_connect(); this->retry_connect();

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

@@ -339,7 +339,7 @@ class WiFiComponent : public Component {
#endif // USE_WIFI_AP #endif // USE_WIFI_AP
void print_connect_params_(); void print_connect_params_();
WiFiAP build_selected_ap_() const; void start_connecting_to_selected_(bool two);
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()) {
@@ -372,11 +372,6 @@ class WiFiComponent : public Component {
// Returns true if match found, false otherwise // Returns true if match found, false otherwise
bool sync_selected_sta_to_best_scan_result_(); bool sync_selected_sta_to_best_scan_result_();
void start_connecting_to_selected_(bool two) {
WiFiAP connection_params = this->build_selected_ap_();
this->start_connecting(connection_params, two);
}
#ifdef USE_WIFI_FAST_CONNECT #ifdef USE_WIFI_FAST_CONNECT
// Reset state for next fast connect AP attempt // Reset state for next fast connect AP attempt
// Clears old scan data so the new AP is tried with config only (SSID without specific BSSID/channel) // Clears old scan data so the new AP is tried with config only (SSID without specific BSSID/channel)