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

Fix #4046 Details below: (#4086)

Browse Source 
Informed by the discussion in the bug and the code in 'that other branch'
the fix was clear.  Just set a flag if we start handling a write, and
use that flag to guard the long write complete call.
This commit is contained in:
Kevin Hester 2020-09-30 05:27:35 -07:00 committed by GitHub
parent b551310c37
commit 2fd3d042b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,19 +219,22 @@ void BLECharacteristic::handleGATTServerEvent(
// - uint8_t exec_write_flag - Either ESP_GATT_PREP_WRITE_EXEC or ESP_GATT_PREP_WRITE_CANCEL // - uint8_t exec_write_flag - Either ESP_GATT_PREP_WRITE_EXEC or ESP_GATT_PREP_WRITE_CANCEL
// //
case ESP_GATTS_EXEC_WRITE_EVT: { case ESP_GATTS_EXEC_WRITE_EVT: {
if (param->exec_write.exec_write_flag == ESP_GATT_PREP_WRITE_EXEC) { if(m_writeEvt){
m_value.commit(); m_writeEvt = false;
m_pCallbacks->onWrite(this); // Invoke the onWrite callback handler. if (param->exec_write.exec_write_flag == ESP_GATT_PREP_WRITE_EXEC) {
} else { m_value.commit();
m_value.cancel(); m_pCallbacks->onWrite(this); // Invoke the onWrite callback handler.
} } else {
// ??? m_value.cancel();
esp_err_t errRc = ::esp_ble_gatts_send_response( }
gatts_if, // ???
param->write.conn_id, esp_err_t errRc = ::esp_ble_gatts_send_response(
param->write.trans_id, ESP_GATT_OK, nullptr); gatts_if,
if (errRc != ESP_OK) { param->write.conn_id,
log_e("esp_ble_gatts_send_response: rc=%d %s", errRc, GeneralUtils::errorToString(errRc)); param->write.trans_id, ESP_GATT_OK, nullptr);
if (errRc != ESP_OK) {
log_e("esp_ble_gatts_send_response: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
}
} }
break; break;
} // ESP_GATTS_EXEC_WRITE_EVT } // ESP_GATTS_EXEC_WRITE_EVT
@ -277,6 +280,7 @@ void BLECharacteristic::handleGATTServerEvent(
if (param->write.handle == m_handle) { if (param->write.handle == m_handle) {
if (param->write.is_prep) { if (param->write.is_prep) {
m_value.addPart(param->write.value, param->write.len); m_value.addPart(param->write.value, param->write.len);
m_writeEvt = true;
} else { } else {
setValue(param->write.value, param->write.len); setValue(param->write.value, param->write.len);
} }

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

@ -107,6 +107,7 @@ private:
BLEService* m_pService; BLEService* m_pService;
BLEValue m_value; BLEValue m_value;
esp_gatt_perm_t m_permissions = ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE; esp_gatt_perm_t m_permissions = ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE;
bool m_writeEvt = false; // If we have started a long write, this tells the commit code that we were the target
void handleGATTServerEvent( void handleGATTServerEvent(
esp_gatts_cb_event_t event, esp_gatts_cb_event_t event,