jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BLE Library onRead Callback fix and Client disconnect feature (#2913)

Browse Source 
* BLEServer::disconnect()

* Invoke Read callback first, to make data update possible before read
This commit is contained in:
Roman Savrulin 2019-07-09 19:35:07 +03:00 committed by Me No Dev
parent e1548e9b7e
commit 05de017bd5
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/BLE/src/BLECharacteristic.cpp
View File

@ -378,6 +378,10 @@ void BLECharacteristic::handleGATTServerEvent(
} }
} else { // read.is_long == false } else { // read.is_long == false
if (m_pCallbacks != nullptr) { // If is.long is false then this is the first (or only) request to read data, so invoke the callback
m_pCallbacks->onRead(this); // Invoke the read callback.
}
std::string value = m_value.getValue(); std::string value = m_value.getValue();
if (value.length() + 1 > maxOffset) { if (value.length() + 1 > maxOffset) {
@ -392,10 +396,6 @@ void BLECharacteristic::handleGATTServerEvent(
rsp.attr_value.offset = 0; rsp.attr_value.offset = 0;
memcpy(rsp.attr_value.value, value.data(), rsp.attr_value.len); memcpy(rsp.attr_value.value, value.data(), rsp.attr_value.len);
} }
if (m_pCallbacks != nullptr) { // If is.long is false then this is the first (or only) request to read data, so invoke the callback
m_pCallbacks->onRead(this); // Invoke the read callback.
}
} }
rsp.attr_value.handle = param->read.handle; rsp.attr_value.handle = param->read.handle;
rsp.attr_value.auth_req = ESP_GATT_AUTH_REQ_NONE; rsp.attr_value.auth_req = ESP_GATT_AUTH_REQ_NONE;

5
libraries/BLE/src/BLEServer.cpp
View File

@ -412,4 +412,9 @@ void BLEServer::updateConnParams(esp_bd_addr_t remote_bda, uint16_t minInterval,
conn_params.timeout = timeout; // timeout = 400*10ms = 4000ms conn_params.timeout = timeout; // timeout = 400*10ms = 4000ms
esp_ble_gap_update_conn_params(&conn_params); esp_ble_gap_update_conn_params(&conn_params);
} }
void BLEServer::disconnect(uint16_t connId) {
esp_ble_gatts_close(m_gatts_if, connId);
}
#endif // CONFIG_BT_ENABLED #endif // CONFIG_BT_ENABLED

1
libraries/BLE/src/BLEServer.h
View File

@ -72,6 +72,7 @@ public:
BLEService* getServiceByUUID(const char* uuid); BLEService* getServiceByUUID(const char* uuid);
BLEService* getServiceByUUID(BLEUUID uuid); BLEService* getServiceByUUID(BLEUUID uuid);
bool connect(BLEAddress address); bool connect(BLEAddress address);
void disconnect(uint16_t connId);
uint16_t m_appId; uint16_t m_appId;
void updateConnParams(esp_bd_addr_t remote_bda, uint16_t minInterval, uint16_t maxInterval, uint16_t latency, uint16_t timeout); void updateConnParams(esp_bd_addr_t remote_bda, uint16_t minInterval, uint16_t maxInterval, uint16_t latency, uint16_t timeout);