sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-29 22:24:26 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-13 11:41:35 -10:00
parent 71bf274214 9fb254fdc2
commit 494ffb8c48
7 changed files with 74 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/esp32_ble/ble.cpp
View File

@@ -214,10 +214,10 @@ bool ESP32BLE::ble_setup_() {
name = this->name_.value();
if (App.is_name_add_mac_suffix_enabled()) {
// MAC address suffix length (last 6 characters of 12-char MAC address string)
constexpr size_t MAC_ADDRESS_SUFFIX_LEN = 6;
constexpr size_t mac_address_suffix_len = 6;
const std::string mac_addr = get_mac_address();
const char *mac_suffix_ptr = mac_addr.c_str() + MAC_ADDRESS_SUFFIX_LEN;
name = make_name_with_suffix(name, '-', mac_suffix_ptr, MAC_ADDRESS_SUFFIX_LEN);
const char *mac_suffix_ptr = mac_addr.c_str() + mac_address_suffix_len;
name = make_name_with_suffix(name, '-', mac_suffix_ptr, mac_address_suffix_len);
}
} else {
name = App.get_name();

4
esphome/components/ethernet/ethernet_component.cpp
View File

@@ -692,8 +692,8 @@ void EthernetComponent::set_manual_ip(const ManualIP &manual_ip) { this->manual_
std::string EthernetComponent::get_use_address() const {
if (this->use_address_.empty()) {
// ".local" suffix length for mDNS hostnames
constexpr size_t MDNS_LOCAL_SUFFIX_LEN = 5;
return make_name_with_suffix(App.get_name(), '.', "local", MDNS_LOCAL_SUFFIX_LEN);
constexpr size_t mdns_local_suffix_len = 5;
return make_name_with_suffix(App.get_name(), '.', "local", mdns_local_suffix_len);
}
return this->use_address_;
}

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

@@ -268,8 +268,8 @@ network::IPAddress WiFiComponent::get_dns_address(int num) {
std::string WiFiComponent::get_use_address() const {
if (this->use_address_.empty()) {
// ".local" suffix length for mDNS hostnames
constexpr size_t MDNS_LOCAL_SUFFIX_LEN = 5;
return make_name_with_suffix(App.get_name(), '.', "local", MDNS_LOCAL_SUFFIX_LEN);
constexpr size_t mdns_local_suffix_len = 5;
return make_name_with_suffix(App.get_name(), '.', "local", mdns_local_suffix_len);
}
return this->use_address_;
}