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

Merge branch 'esp32_ble_no_vector' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-14 22:14:18 -05:00
parent 3aa6901861 1fa33253f8
commit 792f9392a1
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
esphome/components/esp32_ble/ble_event.h
View File

@@ -3,7 +3,9 @@
#ifdef USE_ESP32 #ifdef USE_ESP32
#include <cstddef> // for offsetof #include <cstddef> // for offsetof
#include <cstring> // for memcpy
#include <vector> #include <vector>
#include <memory> // for std::unique_ptr
#include <esp_gap_ble_api.h> #include <esp_gap_ble_api.h>
#include <esp_gattc_api.h> #include <esp_gattc_api.h>
@@ -145,16 +147,18 @@ class BLEEvent {
} }
if (this->type_ == GATTC) { if (this->type_ == GATTC) {
delete this->event_.gattc.gattc_param; delete this->event_.gattc.gattc_param;
delete this->event_.gattc.data; delete[] this->event_.gattc.data;
this->event_.gattc.gattc_param = nullptr; this->event_.gattc.gattc_param = nullptr;
this->event_.gattc.data = nullptr; this->event_.gattc.data = nullptr;
this->event_.gattc.data_len = 0;
return; return;
} }
if (this->type_ == GATTS) { if (this->type_ == GATTS) {
delete this->event_.gatts.gatts_param; delete this->event_.gatts.gatts_param;
delete this->event_.gatts.data; delete[] this->event_.gatts.data;
this->event_.gatts.gatts_param = nullptr; this->event_.gatts.gatts_param = nullptr;
this->event_.gatts.data = nullptr; this->event_.gatts.data = nullptr;
this->event_.gatts.data_len = 0;
} }
} }
@@ -209,17 +213,19 @@ class BLEEvent {
esp_gattc_cb_event_t gattc_event; esp_gattc_cb_event_t gattc_event;
esp_gatt_if_t gattc_if; esp_gatt_if_t gattc_if;
esp_ble_gattc_cb_param_t *gattc_param; // Heap-allocated esp_ble_gattc_cb_param_t *gattc_param; // Heap-allocated
std::vector<uint8_t> *data; // Heap-allocated uint8_t *data; // Heap-allocated raw buffer (manually managed)
} gattc; // 16 bytes (pointers only) uint16_t data_len; // Track size separately
} gattc;
// NOLINTNEXTLINE(readability-identifier-naming) // NOLINTNEXTLINE(readability-identifier-naming)
struct gatts_event { struct gatts_event {
esp_gatts_cb_event_t gatts_event; esp_gatts_cb_event_t gatts_event;
esp_gatt_if_t gatts_if; esp_gatt_if_t gatts_if;
esp_ble_gatts_cb_param_t *gatts_param; // Heap-allocated esp_ble_gatts_cb_param_t *gatts_param; // Heap-allocated
std::vector<uint8_t> *data; // Heap-allocated uint8_t *data; // Heap-allocated raw buffer (manually managed)
} gatts; // 16 bytes (pointers only) uint16_t data_len; // Track size separately
} event_; // 80 bytes } gatts;
} event_; // 80 bytes
ble_event_t type_; ble_event_t type_;
@@ -319,6 +325,7 @@ class BLEEvent {
if (p == nullptr) { if (p == nullptr) {
this->event_.gattc.gattc_param = nullptr; this->event_.gattc.gattc_param = nullptr;
this->event_.gattc.data = nullptr; this->event_.gattc.data = nullptr;
this->event_.gattc.data_len = 0;
return; // Invalid event, but we can't log in header file return; // Invalid event, but we can't log in header file
} }
@@ -336,16 +343,21 @@ class BLEEvent {
// We must copy this data to ensure it remains valid when the event is processed later. // We must copy this data to ensure it remains valid when the event is processed later.
switch (e) { switch (e) {
case ESP_GATTC_NOTIFY_EVT: case ESP_GATTC_NOTIFY_EVT:
this->event_.gattc.data = new std::vector<uint8_t>(p->notify.value, p->notify.value + p->notify.value_len); this->event_.gattc.data_len = p->notify.value_len;
this->event_.gattc.gattc_param->notify.value = this->event_.gattc.data->data(); this->event_.gattc.data = new uint8_t[p->notify.value_len];
memcpy(this->event_.gattc.data, p->notify.value, p->notify.value_len);
this->event_.gattc.gattc_param->notify.value = this->event_.gattc.data;
break; break;
case ESP_GATTC_READ_CHAR_EVT: case ESP_GATTC_READ_CHAR_EVT:
case ESP_GATTC_READ_DESCR_EVT: case ESP_GATTC_READ_DESCR_EVT:
this->event_.gattc.data = new std::vector<uint8_t>(p->read.value, p->read.value + p->read.value_len); this->event_.gattc.data_len = p->read.value_len;
this->event_.gattc.gattc_param->read.value = this->event_.gattc.data->data(); this->event_.gattc.data = new uint8_t[p->read.value_len];
memcpy(this->event_.gattc.data, p->read.value, p->read.value_len);
this->event_.gattc.gattc_param->read.value = this->event_.gattc.data;
break; break;
default: default:
this->event_.gattc.data = nullptr; this->event_.gattc.data = nullptr;
this->event_.gattc.data_len = 0;
break; break;
} }
} }
@@ -358,6 +370,7 @@ class BLEEvent {
if (p == nullptr) { if (p == nullptr) {
this->event_.gatts.gatts_param = nullptr; this->event_.gatts.gatts_param = nullptr;
this->event_.gatts.data = nullptr; this->event_.gatts.data = nullptr;
this->event_.gatts.data_len = 0;
return; // Invalid event, but we can't log in header file return; // Invalid event, but we can't log in header file
} }
@@ -375,11 +388,14 @@ class BLEEvent {
// We must copy this data to ensure it remains valid when the event is processed later. // We must copy this data to ensure it remains valid when the event is processed later.
switch (e) { switch (e) {
case ESP_GATTS_WRITE_EVT: case ESP_GATTS_WRITE_EVT:
this->event_.gatts.data = new std::vector<uint8_t>(p->write.value, p->write.value + p->write.len); this->event_.gatts.data_len = p->write.len;
this->event_.gatts.gatts_param->write.value = this->event_.gatts.data->data(); this->event_.gatts.data = new uint8_t[p->write.len];
memcpy(this->event_.gatts.data, p->write.value, p->write.len);
this->event_.gatts.gatts_param->write.value = this->event_.gatts.data;
break; break;
default: default:
this->event_.gatts.data = nullptr; this->event_.gatts.data = nullptr;
this->event_.gatts.data_len = 0;
break; break;
} }
} }