sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-13 15:23:49 +01:00
Code Issues Releases Wiki Activity

cleaner

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-12 11:19:58 -10:00
parent 6f2c7c0e5d
commit 26ebfa4906
2 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,32 +182,26 @@ bool ESP32BLE::ble_setup_() {
} }
#ifdef ESPHOME_ESP32_BLE_GAP_EVENT_HANDLER_COUNT #ifdef ESPHOME_ESP32_BLE_GAP_EVENT_HANDLER_COUNT
if (!this->gap_event_handlers_.empty()) { err = esp_ble_gap_register_callback(ESP32BLE::gap_event_handler);
err = esp_ble_gap_register_callback(ESP32BLE::gap_event_handler); if (err != ESP_OK) {
if (err != ESP_OK) { ESP_LOGE(TAG, "esp_ble_gap_register_callback failed: %d", err);
ESP_LOGE(TAG, "esp_ble_gap_register_callback failed: %d", err); return false;
return false;
}
} }
#endif #endif
#if defined(USE_ESP32_BLE_SERVER) && defined(ESPHOME_ESP32_BLE_GATTS_EVENT_HANDLER_COUNT) #if defined(USE_ESP32_BLE_SERVER) && defined(ESPHOME_ESP32_BLE_GATTS_EVENT_HANDLER_COUNT)
if (!this->gatts_event_handlers_.empty()) { err = esp_ble_gatts_register_callback(ESP32BLE::gatts_event_handler);
err = esp_ble_gatts_register_callback(ESP32BLE::gatts_event_handler); if (err != ESP_OK) {
if (err != ESP_OK) { ESP_LOGE(TAG, "esp_ble_gatts_register_callback failed: %d", err);
ESP_LOGE(TAG, "esp_ble_gatts_register_callback failed: %d", err); return false;
return false;
}
} }
#endif #endif
#if defined(USE_ESP32_BLE_CLIENT) && defined(ESPHOME_ESP32_BLE_GATTC_EVENT_HANDLER_COUNT) #if defined(USE_ESP32_BLE_CLIENT) && defined(ESPHOME_ESP32_BLE_GATTC_EVENT_HANDLER_COUNT)
if (!this->gattc_event_handlers_.empty()) { err = esp_ble_gattc_register_callback(ESP32BLE::gattc_event_handler);
err = esp_ble_gattc_register_callback(ESP32BLE::gattc_event_handler); if (err != ESP_OK) {
if (err != ESP_OK) { ESP_LOGE(TAG, "esp_ble_gattc_register_callback failed: %d", err);
ESP_LOGE(TAG, "esp_ble_gattc_register_callback failed: %d", err); return false;
return false;
}
} }
#endif #endif

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

@@ -125,35 +125,25 @@ class ESP32BLE : public Component {
void advertising_register_raw_advertisement_callback(std::function<void(bool)> &&callback); void advertising_register_raw_advertisement_callback(std::function<void(bool)> &&callback);
#endif #endif
void register_gap_event_handler(GAPEventHandler *handler) {
#ifdef ESPHOME_ESP32_BLE_GAP_EVENT_HANDLER_COUNT #ifdef ESPHOME_ESP32_BLE_GAP_EVENT_HANDLER_COUNT
this->gap_event_handlers_.push_back(handler); void register_gap_event_handler(GAPEventHandler *handler) { this->gap_event_handlers_.push_back(handler); }
#endif #endif
}
void register_gap_scan_event_handler(GAPScanEventHandler *handler) {
#ifdef ESPHOME_ESP32_BLE_GAP_SCAN_EVENT_HANDLER_COUNT #ifdef ESPHOME_ESP32_BLE_GAP_SCAN_EVENT_HANDLER_COUNT
void register_gap_scan_event_handler(GAPScanEventHandler *handler) {
this->gap_scan_event_handlers_.push_back(handler); this->gap_scan_event_handlers_.push_back(handler);
#endif
}
#ifdef USE_ESP32_BLE_CLIENT
void register_gattc_event_handler(GATTcEventHandler *handler) {
#ifdef ESPHOME_ESP32_BLE_GATTC_EVENT_HANDLER_COUNT
this->gattc_event_handlers_.push_back(handler);
#endif
} }
#endif #endif
#ifdef USE_ESP32_BLE_SERVER #if defined(USE_ESP32_BLE_CLIENT) && defined(ESPHOME_ESP32_BLE_GATTC_EVENT_HANDLER_COUNT)
void register_gatts_event_handler(GATTsEventHandler *handler) { void register_gattc_event_handler(GATTcEventHandler *handler) { this->gattc_event_handlers_.push_back(handler); }
#ifdef ESPHOME_ESP32_BLE_GATTS_EVENT_HANDLER_COUNT
this->gatts_event_handlers_.push_back(handler);
#endif #endif
} #if defined(USE_ESP32_BLE_SERVER) && defined(ESPHOME_ESP32_BLE_GATTS_EVENT_HANDLER_COUNT)
void register_gatts_event_handler(GATTsEventHandler *handler) { this->gatts_event_handlers_.push_back(handler); }
#endif #endif
void register_ble_status_event_handler(BLEStatusEventHandler *handler) {
#ifdef ESPHOME_ESP32_BLE_BLE_STATUS_EVENT_HANDLER_COUNT #ifdef ESPHOME_ESP32_BLE_BLE_STATUS_EVENT_HANDLER_COUNT
void register_ble_status_event_handler(BLEStatusEventHandler *handler) {
this->ble_status_event_handlers_.push_back(handler); this->ble_status_event_handlers_.push_back(handler);
#endif
} }
#endif
void set_enable_on_boot(bool enable_on_boot) { this->enable_on_boot_ = enable_on_boot; } void set_enable_on_boot(bool enable_on_boot) { this->enable_on_boot_ = enable_on_boot; }
protected: protected: