Commit458ae5e

committed

Fix BLECharacteristic::readValue(...) triggering a read request after a notification/indication was received

1 parent631f807 commit458ae5eCopy full SHA for 458ae5e

File tree

+16

-5

lines changed

+16

-5

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -170,10 +170,9 @@ int BLECharacteristic::readValue(uint8_t value[], int length)`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`if (_remote) {`
`173`		`-// trigger a read if the value hasn't been updated via`
`174`		`-// indication or notification, and the characteristic is`
`175`		`-// readable`
`176`		`-if (!valueUpdated() &&canRead()) {`
	`173`	`+// trigger a read if the updated value (notification/indication)`
	`174`	`+// has already been read and the characteristic is readable`
	`175`	`+if (_remote->updatedValueRead() &&canRead()) {`
`177`	`176`	`if (!read()) {`
`178`	`177`	`// read failed`
`179`	`178`	`return0;`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ BLERemoteCharacteristic::BLERemoteCharacteristic(const uint8_t uuid[], uint8_t u`
`33`	`33`	`_value(NULL),`
`34`	`34`	`_valueLength(0),`
`35`	`35`	`_valueUpdated(false),`
	`36`	`+ _updatedValueRead(true),`
`36`	`37`	`_valueUpdatedEventHandler(NULL)`
`37`	`38`	`{`
`38`	`39`	`}`
`@@ -148,6 +149,15 @@ bool BLERemoteCharacteristic::valueUpdated()`
`148`	`149`	`return result;`
`149`	`150`	`}`
`150`	`151`
	`152`	`+boolBLERemoteCharacteristic::updatedValueRead()`
	`153`	`+{`
	`154`	`+bool result = _updatedValueRead;`
	`155`	`+`
	`156`	`+ _updatedValueRead =true;`
	`157`	`+`
	`158`	`+return result;`
	`159`	`+}`
	`160`	`+`
`151`	`161`	`boolBLERemoteCharacteristic::read()`
`152`	`162`	`{`
`153`	`163`	`if (!ATT.connected(_connectionHandle)) {`
`@@ -177,7 +187,6 @@ bool BLERemoteCharacteristic::read()`
`177`	`187`	`returnfalse;`
`178`	`188`	`}`
`179`	`189`
`180`		`- _valueUpdated =true;`
`181`	`190`	`memcpy(_value, &resp[1], _valueLength);`
`182`	`191`
`183`	`192`	`returntrue;`
`@@ -245,6 +254,7 @@ void BLERemoteCharacteristic::writeValue(BLEDevice device, const uint8_t value[]`
`245`	`254`	`}`
`246`	`255`
`247`	`256`	`_valueUpdated =true;`
	`257`	`+ _updatedValueRead =false;`
`248`	`258`	`memcpy(_value, value, _valueLength);`
`249`	`259`
`250`	`260`	`if (_valueUpdatedEventHandler) {`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ class BLERemoteCharacteristic : public BLERemoteAttribute {`
`42`	`42`	`intwriteValue(constchar* value);`
`43`	`43`
`44`	`44`	`boolvalueUpdated();`
	`45`	`+boolupdatedValueRead();`
`45`	`46`
`46`	`47`	`boolread();`
`47`	`48`	`boolwriteCccd(uint16_t value);`
`@@ -71,6 +72,7 @@ class BLERemoteCharacteristic : public BLERemoteAttribute {`
`71`	`72`	`int _valueLength;`
`72`	`73`
`73`	`74`	`bool _valueUpdated;`
	`75`	`+bool _updatedValueRead;`
`74`	`76`
`75`	`77`	`BLELinkedList<BLERemoteDescriptor*> _descriptors;`
`76`	`78`

Comments

(0)