sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-06 05:12:21 +01:00
Code Issues Releases Wiki Activity

Merge branch 'integration' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-02 15:57:31 -10:00
parent 5d6a152c45 aafa1190ce
commit be701c58e1
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
esphome/core/application.h
View File

@@ -101,12 +101,9 @@ class Application {
arch_init(); arch_init();
this->name_add_mac_suffix_ = name_add_mac_suffix; this->name_add_mac_suffix_ = name_add_mac_suffix;
if (name_add_mac_suffix) { if (name_add_mac_suffix) {
this->name_ = name + "-" + get_mac_address().substr(6); const std::string mac_suffix = get_mac_address().substr(6);
if (friendly_name.empty()) { this->name_ = name + "-" + mac_suffix;
this->friendly_name_ = ""; this->friendly_name_ = friendly_name.empty() ? "" : friendly_name + " " + mac_suffix;
} else {
this->friendly_name_ = friendly_name + " " + get_mac_address().substr(6);
}
} else { } else {
this->name_ = name; this->name_ = name;
this->friendly_name_ = friendly_name; this->friendly_name_ = friendly_name;