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

Merge branch 'esp32_ble_client_namespace' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-06 10:56:28 -10:00
parent 341d2febd6 cb4d3d37cf
commit 28c4460f8b
8 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/esp32_ble_client/ble_characteristic.cpp
View File

@@ -6,8 +6,7 @@
#ifdef USE_ESP32 #ifdef USE_ESP32
namespace esphome { namespace esphome::esp32_ble_client {
namespace esp32_ble_client {
static const char *const TAG = "esp32_ble_client"; static const char *const TAG = "esp32_ble_client";
@@ -93,7 +92,6 @@ esp_err_t BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size)
return write_value(new_val, new_val_size, ESP_GATT_WRITE_TYPE_NO_RSP); return write_value(new_val, new_val_size, ESP_GATT_WRITE_TYPE_NO_RSP);
} }
} // namespace esp32_ble_client } // namespace esphome::esp32_ble_client
} // namespace esphome
#endif // USE_ESP32 #endif // USE_ESP32

6
esphome/components/esp32_ble_client/ble_characteristic.h
View File

@@ -8,8 +8,7 @@
#include <vector> #include <vector>
namespace esphome { namespace esphome::esp32_ble_client {
namespace esp32_ble_client {
namespace espbt = esphome::esp32_ble_tracker; namespace espbt = esphome::esp32_ble_tracker;
@@ -33,7 +32,6 @@ class BLECharacteristic {
BLEService *service; BLEService *service;
}; };
} // namespace esp32_ble_client } // namespace esphome::esp32_ble_client
} // namespace esphome
#endif // USE_ESP32 #endif // USE_ESP32

6
esphome/components/esp32_ble_client/ble_client_base.cpp
View File

@@ -8,8 +8,7 @@
#include <esp_gap_ble_api.h> #include <esp_gap_ble_api.h>
#include <esp_gatt_defs.h> #include <esp_gatt_defs.h>
namespace esphome { namespace esphome::esp32_ble_client {
namespace esp32_ble_client {
static const char *const TAG = "esp32_ble_client"; static const char *const TAG = "esp32_ble_client";
@@ -660,7 +659,6 @@ BLEDescriptor *BLEClientBase::get_descriptor(uint16_t handle) {
return nullptr; return nullptr;
} }
} // namespace esp32_ble_client } // namespace esphome::esp32_ble_client
} // namespace esphome
#endif // USE_ESP32 #endif // USE_ESP32

6
esphome/components/esp32_ble_client/ble_client_base.h
View File

@@ -16,8 +16,7 @@
#include <esp_gatt_common_api.h> #include <esp_gatt_common_api.h>
#include <esp_gattc_api.h> #include <esp_gattc_api.h>
namespace esphome { namespace esphome::esp32_ble_client {
namespace esp32_ble_client {
namespace espbt = esphome::esp32_ble_tracker; namespace espbt = esphome::esp32_ble_tracker;
@@ -133,7 +132,6 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
void log_gattc_warning_(const char *operation, esp_err_t err); void log_gattc_warning_(const char *operation, esp_err_t err);
}; };
} // namespace esp32_ble_client } // namespace esphome::esp32_ble_client
} // namespace esphome
#endif // USE_ESP32 #endif // USE_ESP32

6
esphome/components/esp32_ble_client/ble_descriptor.h
View File

@@ -4,8 +4,7 @@
#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h" #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
namespace esphome { namespace esphome::esp32_ble_client {
namespace esp32_ble_client {
namespace espbt = esphome::esp32_ble_tracker; namespace espbt = esphome::esp32_ble_tracker;
@@ -19,7 +18,6 @@ class BLEDescriptor {
BLECharacteristic *characteristic; BLECharacteristic *characteristic;
}; };
} // namespace esp32_ble_client } // namespace esphome::esp32_ble_client
} // namespace esphome
#endif // USE_ESP32 #endif // USE_ESP32

6
esphome/components/esp32_ble_client/ble_service.cpp
View File

@@ -5,8 +5,7 @@
#ifdef USE_ESP32 #ifdef USE_ESP32
namespace esphome { namespace esphome::esp32_ble_client {
namespace esp32_ble_client {
static const char *const TAG = "esp32_ble_client"; static const char *const TAG = "esp32_ble_client";
@@ -71,7 +70,6 @@ void BLEService::parse_characteristics() {
} }
} }
} // namespace esp32_ble_client } // namespace esphome::esp32_ble_client
} // namespace esphome
#endif // USE_ESP32 #endif // USE_ESP32

6
esphome/components/esp32_ble_client/ble_service.h
View File

@@ -8,8 +8,7 @@
#include <vector> #include <vector>
namespace esphome { namespace esphome::esp32_ble_client {
namespace esp32_ble_client {
namespace espbt = esphome::esp32_ble_tracker; namespace espbt = esphome::esp32_ble_tracker;
@@ -30,7 +29,6 @@ class BLEService {
BLECharacteristic *get_characteristic(uint16_t uuid); BLECharacteristic *get_characteristic(uint16_t uuid);
}; };
} // namespace esp32_ble_client } // namespace esphome::esp32_ble_client
} // namespace esphome
#endif // USE_ESP32 #endif // USE_ESP32

2
requirements.txt
View File

@@ -12,7 +12,7 @@ platformio==6.1.18 # When updating platformio, also update /docker/Dockerfile
esptool==5.0.2 esptool==5.0.2
click==8.1.7 click==8.1.7
esphome-dashboard==20250514.0 esphome-dashboard==20250514.0
aioesphomeapi==37.2.5 aioesphomeapi==38.0.0
zeroconf==0.147.0 zeroconf==0.147.0
puremagic==1.30 puremagic==1.30
ruamel.yaml==0.18.14 # dashboard_import ruamel.yaml==0.18.14 # dashboard_import