sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-08 00:31:58 +00:00
Code Issues Releases Wiki Activity

Merge branch 'wifi_logging_cleanup' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-05 22:29:04 -10:00
parent 44ecdeb3b6 63713cac57
commit 04cc713b0c
1 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -368,7 +368,6 @@ void WiFiComponent::start_initial_connection_() {
WiFiAP params = this->build_params_for_current_phase_();
this->start_connecting(params);
} else {
ESP_LOGI(TAG, "Starting scan");
this->start_scanning();
}
}
@@ -420,11 +419,7 @@ void WiFiComponent::setup() {
}
void WiFiComponent::start() {
char mac_s[18];
ESP_LOGCONFIG(TAG,
"Starting\n"
" Local MAC: %s",
get_mac_address_pretty_into_buffer(mac_s));
ESP_LOGCONFIG(TAG, "Starting");
this->last_connected_ = millis();
uint32_t hash = this->has_sta() ? App.get_config_version_hash() : 88491487UL;
@@ -927,14 +922,6 @@ void WiFiComponent::start_connecting(const WiFiAP &ap) {
}
const LogString *get_signal_bars(int8_t rssi) {
// Check for disconnected sentinel value first
if (rssi == WIFI_RSSI_DISCONNECTED) {
// MULTIPLICATION SIGN
// Unicode: U+00D7, UTF-8: C3 97
return LOG_STR("\033[0;31m" // red
"\xc3\x97\xc3\x97\xc3\x97\xc3\x97"
"\033[0m");
}
// LOWER ONE QUARTER BLOCK
// Unicode: U+2582, UTF-8: E2 96 82
// LOWER HALF BLOCK
@@ -978,16 +965,12 @@ const LogString *get_signal_bars(int8_t rssi) {
}
void WiFiComponent::print_connect_params_() {
if (this->is_disabled() || !this->is_connected()) {
return;
}
bssid_t bssid = wifi_bssid();
char bssid_s[18];
format_mac_addr_upper(bssid.data(), bssid_s);
char mac_s[18];
ESP_LOGCONFIG(TAG, " Local MAC: %s", get_mac_address_pretty_into_buffer(mac_s));
if (this->is_disabled()) {
ESP_LOGCONFIG(TAG, " Disabled");
return;
}
// Use stack buffers for IP address formatting to avoid heap allocations
char ip_buf[network::IP_ADDRESS_BUFFER_SIZE];
for (auto &ip : wifi_sta_ip_addresses()) {
@@ -1259,10 +1242,15 @@ void WiFiComponent::check_scanning_finished() {
}
void WiFiComponent::dump_config() {
char mac_s[18];
ESP_LOGCONFIG(TAG,
"WiFi:\n"
" Local MAC: %s\n"
" Connected: %s",
YESNO(this->is_connected()));
get_mac_address_pretty_into_buffer(mac_s), YESNO(this->is_connected()));
if (this->is_disabled()) {
ESP_LOGCONFIG(TAG, " Disabled");
}
this->print_connect_params_();
}
@@ -1293,8 +1281,6 @@ void WiFiComponent::check_connecting_finished(uint32_t now) {
// the first connection as a failure.
this->error_from_callback_ = false;
this->print_connect_params_();
if (this->has_ap()) {
#ifdef USE_CAPTIVE_PORTAL
if (this->is_captive_portal_active_()) {
@@ -1312,6 +1298,7 @@ void WiFiComponent::check_connecting_finished(uint32_t now) {
this->state_ = WIFI_COMPONENT_STATE_STA_CONNECTED;
this->num_retried_ = 0;
this->print_connect_params_();
// Reset roaming state on successful connection
this->roaming_last_check_ = now;