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

sandeepmistry · sandeepmistry · commit 458ae5eee2ab · 2019-09-05T13:29:42.000-04:00
diff --git a/src/BLECharacteristic.cpp b/src/BLECharacteristic.cpp
@@ -170,10 +170,9 @@ int BLECharacteristic::readValue(uint8_t value[], int length)
   }
 
   if (_remote) {
-    // trigger a read if the value hasn't been updated via
-    // indication or notification, and the characteristic is
-    // readable
-    if (!valueUpdated() && canRead()) {
+    // trigger a read if the updated value (notification/indication)
+    // has already been read and the characteristic is readable
+    if (_remote->updatedValueRead() && canRead()) {
       if (!read()) {
         // read failed
         return 0;
diff --git a/src/remote/BLERemoteCharacteristic.cpp b/src/remote/BLERemoteCharacteristic.cpp
@@ -33,6 +33,7 @@ BLERemoteCharacteristic::BLERemoteCharacteristic(const uint8_t uuid[], uint8_t u
   _value(NULL),
   _valueLength(0),
   _valueUpdated(false),
+  _updatedValueRead(true),
   _valueUpdatedEventHandler(NULL)
 {
 }
@@ -148,6 +149,15 @@ bool BLERemoteCharacteristic::valueUpdated()
   return result;
 }
 
+bool BLERemoteCharacteristic::updatedValueRead()
+{
+  bool result = _updatedValueRead;
+
+  _updatedValueRead = true;
+
+  return result;
+}
+
 bool BLERemoteCharacteristic::read()
 {
   if (!ATT.connected(_connectionHandle)) {
@@ -177,7 +187,6 @@ bool BLERemoteCharacteristic::read()
     return false;
   }
 
-  _valueUpdated = true;
   memcpy(_value, &resp[1], _valueLength); 
 
   return true;
@@ -245,6 +254,7 @@ void BLERemoteCharacteristic::writeValue(BLEDevice device, const uint8_t value[]
   }
 
   _valueUpdated = true;
+  _updatedValueRead = false;
   memcpy(_value, value, _valueLength);
 
   if (_valueUpdatedEventHandler) {
diff --git a/src/remote/BLERemoteCharacteristic.h b/src/remote/BLERemoteCharacteristic.h
@@ -42,6 +42,7 @@ class BLERemoteCharacteristic : public BLERemoteAttribute {
   int writeValue(const char* value);
 
   bool valueUpdated();
+  bool updatedValueRead();
 
   bool read();
   bool writeCccd(uint16_t value);
@@ -71,6 +72,7 @@ class BLERemoteCharacteristic : public BLERemoteAttribute {
   int _valueLength;
 
   bool _valueUpdated;
+  bool _updatedValueRead;
 
   BLELinkedList<BLERemoteDescriptor*> _descriptors;
 

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`	`+bool BLERemoteCharacteristic::updatedValueRead()`
	`153`	`+{`
	`154`	`+ bool result = _updatedValueRead;`
	`155`	`+`
	`156`	`+ _updatedValueRead = true;`
	`157`	`+`
	`158`	`+ return result;`
	`159`	`+}`
	`160`	`+`
`151`	`161`	`bool BLERemoteCharacteristic::read()`
`152`	`162`	`{`
`153`	`163`	`if (!ATT.connected(_connectionHandle)) {`
`@@ -177,7 +187,6 @@ bool BLERemoteCharacteristic::read()`
`177`	`187`	`return false;`
`178`	`188`	`}`
`179`	`189`
`180`		`- _valueUpdated = true;`
`181`	`190`	`memcpy(_value, &resp[1], _valueLength);`
`182`	`191`
`183`	`192`	`return true;`
`@@ -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) {`