sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-17 23:35:47 +00:00
Code Issues Releases Wiki Activity

Revert "[esp32_ble] Store custom GAP device name in flash"

Browse Source 
This reverts commit 70d947fab9.
This commit is contained in:
J. Nick Koston
2025-11-05 21:28:17 -06:00
parent 39b63ae87e
commit 6c09b16b38
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,8 +261,8 @@ bool ESP32BLE::ble_setup_() {
#endif #endif
std::string name; std::string name;
if (this->name_ != nullptr) { if (this->name_.has_value()) {
name = this->name_; name = this->name_.value();
if (App.is_name_add_mac_suffix_enabled()) { if (App.is_name_add_mac_suffix_enabled()) {
// MAC address suffix length (last 6 characters of 12-char MAC address string) // 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;

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

@@ -112,7 +112,7 @@ class ESP32BLE : public Component {
void loop() override; void loop() override;
void dump_config() override; void dump_config() override;
float get_setup_priority() const override; float get_setup_priority() const override;
void set_name(const char *name) { this->name_ = name; } void set_name(const std::string &name) { this->name_ = name; }
#ifdef USE_ESP32_BLE_ADVERTISING #ifdef USE_ESP32_BLE_ADVERTISING
void advertising_start(); void advertising_start();
@@ -192,8 +192,8 @@ class ESP32BLE : public Component {
esphome::LockFreeQueue<BLEEvent, MAX_BLE_QUEUE_SIZE> ble_events_; esphome::LockFreeQueue<BLEEvent, MAX_BLE_QUEUE_SIZE> ble_events_;
esphome::EventPool<BLEEvent, MAX_BLE_QUEUE_SIZE> ble_event_pool_; esphome::EventPool<BLEEvent, MAX_BLE_QUEUE_SIZE> ble_event_pool_;
// Pointer to compile-time string literal or nullptr (4 bytes on 32-bit) // optional<string> (typically 16+ bytes on 32-bit, aligned to 4 bytes)
const char *name_{nullptr}; optional<std::string> name_;
// 4-byte aligned members // 4-byte aligned members
#ifdef USE_ESP32_BLE_ADVERTISING #ifdef USE_ESP32_BLE_ADVERTISING