Commit 05de017

romansavrulinme-no-dev

authored and

committed

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

* BLEServer::disconnect() * Invoke Read callback first, to make data update possible before read

1 parent e1548e9 commit 05de017Copy full SHA for 05de017

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -378,6 +378,10 @@ void BLECharacteristic::handleGATTServerEvent(`
`378`	`378`	`}`
`379`	`379`	`} else { // read.is_long == false`
`380`	`380`
	`381`	`+ if (m_pCallbacks != nullptr) { // If is.long is false then this is the first (or only) request to read data, so invoke the callback`
	`382`	`+ m_pCallbacks->onRead(this); // Invoke the read callback.`
	`383`	`+ }`
	`384`	`+`
`381`	`385`	`std::string value = m_value.getValue();`
`382`	`386`
`383`	`387`	`if (value.length() + 1 > maxOffset) {`
`@@ -392,10 +396,6 @@ void BLECharacteristic::handleGATTServerEvent(`
`392`	`396`	`rsp.attr_value.offset = 0;`
`393`	`397`	`memcpy(rsp.attr_value.value, value.data(), rsp.attr_value.len);`
`394`	`398`	`}`
`395`		`-`
`396`		`- if (m_pCallbacks != nullptr) { // If is.long is false then this is the first (or only) request to read data, so invoke the callback`
`397`		`- m_pCallbacks->onRead(this); // Invoke the read callback.`
`398`		`- }`
`399`	`399`	`}`
`400`	`400`	`rsp.attr_value.handle = param->read.handle;`
`401`	`401`	`rsp.attr_value.auth_req = ESP_GATT_AUTH_REQ_NONE;`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -412,4 +412,9 @@ void BLEServer::updateConnParams(esp_bd_addr_t remote_bda, uint16_t minInterval,`
`412`	`412`	`conn_params.timeout = timeout; // timeout = 400*10ms = 4000ms`
`413`	`413`	`esp_ble_gap_update_conn_params(&conn_params);`
`414`	`414`	`}`
	`415`	`+`
	`416`	`+void BLEServer::disconnect(uint16_t connId) {`
	`417`	`+ esp_ble_gatts_close(m_gatts_if, connId);`
	`418`	`+}`
	`419`	`+`
`415`	`420`	`#endif // CONFIG_BT_ENABLED`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ class BLEServer {`
`72`	`72`	`BLEService* getServiceByUUID(const char* uuid);`
`73`	`73`	`BLEService* getServiceByUUID(BLEUUID uuid);`
`74`	`74`	`bool connect(BLEAddress address);`
	`75`	`+ void disconnect(uint16_t connId);`
`75`	`76`	`uint16_t m_appId;`
`76`	`77`	`void updateConnParams(esp_bd_addr_t remote_bda, uint16_t minInterval, uint16_t maxInterval, uint16_t latency, uint16_t timeout);`
`77`	`78`

Comments

(0)