github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-20 11:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add _MS suffix to scan dwell time constants

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-23 13:14:02 -10:00
parent a64cdd644f
commit 0a96a6626a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/wifi/wifi_component_esp8266.cpp
+9 -9
View File
@@ -668,18 +668,18 @@ bool WiFiComponent::wifi_scan_start_(bool passive) {
// nearby APs, not do a thorough survey. This also reduces off-channel time
// which can cause Beacon Timeout disconnects on some APs.
// Roaming times match the ESP32 IDF scan defaults.
static constexpr uint32_t SCAN_PASSIVE_DEFAULT = 500;
static constexpr uint32_t SCAN_PASSIVE_ROAMING = 300;
static constexpr uint32_t SCAN_ACTIVE_MIN_DEFAULT = 400;
static constexpr uint32_t SCAN_ACTIVE_MAX_DEFAULT = 500;
static constexpr uint32_t SCAN_ACTIVE_MIN_ROAMING = 100;
static constexpr uint32_t SCAN_ACTIVE_MAX_ROAMING = 300;
static constexpr uint32_t SCAN_PASSIVE_DEFAULT_MS = 500;
static constexpr uint32_t SCAN_PASSIVE_ROAMING_MS = 300;
static constexpr uint32_t SCAN_ACTIVE_MIN_DEFAULT_MS = 400;
static constexpr uint32_t SCAN_ACTIVE_MAX_DEFAULT_MS = 500;
static constexpr uint32_t SCAN_ACTIVE_MIN_ROAMING_MS = 100;
static constexpr uint32_t SCAN_ACTIVE_MAX_ROAMING_MS = 300;
bool roaming = this->roaming_state_ == RoamingState::SCANNING;
if (passive) {
config.scan_time.passive = roaming ? SCAN_PASSIVE_ROAMING : SCAN_PASSIVE_DEFAULT;
config.scan_time.passive = roaming ? SCAN_PASSIVE_ROAMING_MS : SCAN_PASSIVE_DEFAULT_MS;
} else {
config.scan_time.active.min = roaming ? SCAN_ACTIVE_MIN_ROAMING : SCAN_ACTIVE_MIN_DEFAULT;
config.scan_time.active.max = roaming ? SCAN_ACTIVE_MAX_ROAMING : SCAN_ACTIVE_MAX_DEFAULT;
config.scan_time.active.min = roaming ? SCAN_ACTIVE_MIN_ROAMING_MS : SCAN_ACTIVE_MIN_DEFAULT_MS;
config.scan_time.active.max = roaming ? SCAN_ACTIVE_MAX_ROAMING_MS : SCAN_ACTIVE_MAX_DEFAULT_MS;
}
#endif
bool ret = wifi_station_scan(&config, &WiFiComponent::s_wifi_scan_done_callback);