Merge pull request #9748 from desmond-blue/fix_Cordio_ATTS_callback

0xc0170 · web-flow · commit 23c494b60a21 · 2019-02-19T15:42:06.000+01:00
BLE:Cordio: ATTS setting for write cback should use bitwise or
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioGattServer.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioGattServer.cpp
@@ -294,7 +294,7 @@ ble_error_t GattServer::insert_characteristic_value_attribute(
         attribute_it->settings = ATTS_SET_READ_CBACK;
     }
     if (properties & WRITABLE_PROPERTIES) {
-        attribute_it->settings = ATTS_SET_WRITE_CBACK;
+        attribute_it->settings |= ATTS_SET_WRITE_CBACK;
     }
     if (value_attribute.getUUID().shortOrLong() == UUID::UUID_TYPE_LONG) {
         attribute_it->settings |= ATTS_SET_UUID_128;

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ ble_error_t GattServer::insert_characteristic_value_attribute(`
`294`	`294`	`attribute_it->settings = ATTS_SET_READ_CBACK;`
`295`	`295`	`}`
`296`	`296`	`if (properties & WRITABLE_PROPERTIES) {`
`297`		`- attribute_it->settings = ATTS_SET_WRITE_CBACK;`
	`297`	`+ attribute_it->settings \|= ATTS_SET_WRITE_CBACK;`
`298`	`298`	`}`
`299`	`299`	`if (value_attribute.getUUID().shortOrLong() == UUID::UUID_TYPE_LONG) {`
`300`	`300`	`attribute_it->settings \|= ATTS_SET_UUID_128;`