Merge pull request arduino-libraries#146 from facchinm/writeWithoutResponse

Paolo Calao · web-flow · commit be365c9fc0ad · 2020-12-18T10:43:29.000+01:00
Overload writeValue to allow forced write without response
diff --git a/src/BLECharacteristic.cpp b/src/BLECharacteristic.cpp
@@ -234,65 +234,65 @@ int BLECharacteristic::readValue(int32_t& value)
   return readValue((uint8_t*)&value, sizeof(value));
 }
 
-int BLECharacteristic::writeValue(const uint8_t value[], int length)
+int BLECharacteristic::writeValue(const uint8_t value[], int length, bool withResponse)
 {
   if (_local) {
     return _local->writeValue(value, length);
   }
 
   if (_remote) {
-    return _remote->writeValue(value, length);
+    return _remote->writeValue(value, length, withResponse);
   }
 
   return 0;
 }
 
-int BLECharacteristic::writeValue(const void* value, int length)
+int BLECharacteristic::writeValue(const void* value, int length, bool withResponse)
 {
-  return writeValue((const uint8_t*)value, length);
+  return writeValue((const uint8_t*)value, length, withResponse);
 }
 
-int BLECharacteristic::writeValue(const char* value)
+int BLECharacteristic::writeValue(const char* value, bool withResponse)
 {
   if (_local) {
     return _local->writeValue(value);
   }
 
   if (_remote) {
-    return _remote->writeValue(value);
+    return _remote->writeValue(value, withResponse);
   }
 
   return 0;
 }
 
-int BLECharacteristic::writeValue(uint8_t value)
+int BLECharacteristic::writeValue(uint8_t value, bool withResponse)
 {
-  return writeValue((uint8_t*)&value, sizeof(value));
+  return writeValue((uint8_t*)&value, sizeof(value), withResponse);
 }
 
-int BLECharacteristic::writeValue(int8_t value)
+int BLECharacteristic::writeValue(int8_t value, bool withResponse)
 {
-  return writeValue((uint8_t*)&value, sizeof(value));
+  return writeValue((uint8_t*)&value, sizeof(value), withResponse);
 }
 
-int BLECharacteristic::writeValue(uint16_t value)
+int BLECharacteristic::writeValue(uint16_t value, bool withResponse)
 {
-  return writeValue((uint8_t*)&value, sizeof(value));
+  return writeValue((uint8_t*)&value, sizeof(value), withResponse);
 }
 
-int BLECharacteristic::writeValue(int16_t value)
+int BLECharacteristic::writeValue(int16_t value, bool withResponse)
 {
-  return writeValue((uint8_t*)&value, sizeof(value));
+  return writeValue((uint8_t*)&value, sizeof(value), withResponse);
 }
 
-int BLECharacteristic::writeValue(uint32_t value)
+int BLECharacteristic::writeValue(uint32_t value, bool withResponse)
 {
-  return writeValue((uint8_t*)&value, sizeof(value));
+  return writeValue((uint8_t*)&value, sizeof(value), withResponse);
 }
 
-int BLECharacteristic::writeValue(int32_t value)
+int BLECharacteristic::writeValue(int32_t value, bool withResponse)
 {
-  return writeValue((uint8_t*)&value, sizeof(value));
+  return writeValue((uint8_t*)&value, sizeof(value), withResponse);
 }
 
 int BLECharacteristic::broadcast()
diff --git a/src/BLECharacteristic.h b/src/BLECharacteristic.h
@@ -68,15 +68,15 @@ class BLECharacteristic  {
   int readValue(uint32_t& value);
   int readValue(int32_t& value);
 
-  int writeValue(const uint8_t value[], int length);
-  int writeValue(const void* value, int length);
-  int writeValue(const char* value);
-  int writeValue(uint8_t value);
-  int writeValue(int8_t value);
-  int writeValue(uint16_t value);
-  int writeValue(int16_t value);
-  int writeValue(uint32_t value);
-  int writeValue(int32_t value);
+  int writeValue(const uint8_t value[], int length, bool withResponse = true);
+  int writeValue(const void* value, int length, bool withResponse = true);
+  int writeValue(const char* value, bool withResponse = true);
+  int writeValue(uint8_t value, bool withResponse = true);
+  int writeValue(int8_t value, bool withResponse = true);
+  int writeValue(uint16_t value, bool withResponse = true);
+  int writeValue(int16_t value, bool withResponse = true);
+  int writeValue(uint32_t value, bool withResponse = true);
+  int writeValue(int32_t value, bool withResponse = true);
 
   // deprecated, use writeValue(...)
   int setValue(const uint8_t value[], int length) { return writeValue(value, length); }
diff --git a/src/remote/BLERemoteCharacteristic.cpp b/src/remote/BLERemoteCharacteristic.cpp
@@ -85,7 +85,7 @@ uint8_t BLERemoteCharacteristic::operator[] (int offset) const
   return 0;
 }
 
-int BLERemoteCharacteristic::writeValue(const uint8_t value[], int length)
+int BLERemoteCharacteristic::writeValue(const uint8_t value[], int length, bool withResponse)
 {
   if (!ATT.connected(_connectionHandle)) {
     return false;
@@ -104,7 +104,7 @@ int BLERemoteCharacteristic::writeValue(const uint8_t value[], int length)
     return 0;
   }
 
-  if (_properties & BLEWrite) {
+  if ((_properties & BLEWrite) && withResponse) {
     uint8_t resp[4];
     int respLength = ATT.writeReq(_connectionHandle, _valueHandle, value, length, resp);
 
@@ -133,9 +133,9 @@ int BLERemoteCharacteristic::writeValue(const uint8_t value[], int length)
   return 0;
 }
 
-int BLERemoteCharacteristic::writeValue(const char* value)
+int BLERemoteCharacteristic::writeValue(const char* value, bool withResponse)
 {
-  return writeValue((uint8_t*)value, strlen(value));
+  return writeValue((uint8_t*)value, strlen(value), withResponse);
 }
 
 bool BLERemoteCharacteristic::valueUpdated()
diff --git a/src/remote/BLERemoteCharacteristic.h b/src/remote/BLERemoteCharacteristic.h
@@ -38,8 +38,8 @@ class BLERemoteCharacteristic : public BLERemoteAttribute {
   int valueLength() const;
   uint8_t operator[] (int offset) const;
 
-  int writeValue(const uint8_t value[], int length);
-  int writeValue(const char* value);
+  int writeValue(const uint8_t value[], int length, bool withResponse = true);
+  int writeValue(const char* value, bool withResponse = true);
 
   bool valueUpdated();
   bool updatedValueRead();

Original file line number	Diff line number	Diff line change
`@@ -234,65 +234,65 @@ int BLECharacteristic::readValue(int32_t& value)`
`234`	`234`	`return readValue((uint8_t*)&value, sizeof(value));`
`235`	`235`	`}`
`236`	`236`
`237`		`-int BLECharacteristic::writeValue(const uint8_t value[], int length)`
	`237`	`+int BLECharacteristic::writeValue(const uint8_t value[], int length, bool withResponse)`
`238`	`238`	`{`
`239`	`239`	`if (_local) {`
`240`	`240`	`return _local->writeValue(value, length);`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`if (_remote) {`
`244`		`- return _remote->writeValue(value, length);`
	`244`	`+ return _remote->writeValue(value, length, withResponse);`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`return 0;`
`248`	`248`	`}`
`249`	`249`
`250`		`-int BLECharacteristic::writeValue(const void* value, int length)`
	`250`	`+int BLECharacteristic::writeValue(const void* value, int length, bool withResponse)`
`251`	`251`	`{`
`252`		`- return writeValue((const uint8_t*)value, length);`
	`252`	`+ return writeValue((const uint8_t*)value, length, withResponse);`
`253`	`253`	`}`
`254`	`254`
`255`		`-int BLECharacteristic::writeValue(const char* value)`
	`255`	`+int BLECharacteristic::writeValue(const char* value, bool withResponse)`
`256`	`256`	`{`
`257`	`257`	`if (_local) {`
`258`	`258`	`return _local->writeValue(value);`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`if (_remote) {`
`262`		`- return _remote->writeValue(value);`
	`262`	`+ return _remote->writeValue(value, withResponse);`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`return 0;`
`266`	`266`	`}`
`267`	`267`
`268`		`-int BLECharacteristic::writeValue(uint8_t value)`
	`268`	`+int BLECharacteristic::writeValue(uint8_t value, bool withResponse)`
`269`	`269`	`{`
`270`		`- return writeValue((uint8_t*)&value, sizeof(value));`
	`270`	`+ return writeValue((uint8_t*)&value, sizeof(value), withResponse);`
`271`	`271`	`}`
`272`	`272`
`273`		`-int BLECharacteristic::writeValue(int8_t value)`
	`273`	`+int BLECharacteristic::writeValue(int8_t value, bool withResponse)`
`274`	`274`	`{`
`275`		`- return writeValue((uint8_t*)&value, sizeof(value));`
	`275`	`+ return writeValue((uint8_t*)&value, sizeof(value), withResponse);`
`276`	`276`	`}`
`277`	`277`
`278`		`-int BLECharacteristic::writeValue(uint16_t value)`
	`278`	`+int BLECharacteristic::writeValue(uint16_t value, bool withResponse)`
`279`	`279`	`{`
`280`		`- return writeValue((uint8_t*)&value, sizeof(value));`
	`280`	`+ return writeValue((uint8_t*)&value, sizeof(value), withResponse);`
`281`	`281`	`}`
`282`	`282`
`283`		`-int BLECharacteristic::writeValue(int16_t value)`
	`283`	`+int BLECharacteristic::writeValue(int16_t value, bool withResponse)`
`284`	`284`	`{`
`285`		`- return writeValue((uint8_t*)&value, sizeof(value));`
	`285`	`+ return writeValue((uint8_t*)&value, sizeof(value), withResponse);`
`286`	`286`	`}`
`287`	`287`
`288`		`-int BLECharacteristic::writeValue(uint32_t value)`
	`288`	`+int BLECharacteristic::writeValue(uint32_t value, bool withResponse)`
`289`	`289`	`{`
`290`		`- return writeValue((uint8_t*)&value, sizeof(value));`
	`290`	`+ return writeValue((uint8_t*)&value, sizeof(value), withResponse);`
`291`	`291`	`}`
`292`	`292`
`293`		`-int BLECharacteristic::writeValue(int32_t value)`
	`293`	`+int BLECharacteristic::writeValue(int32_t value, bool withResponse)`
`294`	`294`	`{`
`295`		`- return writeValue((uint8_t*)&value, sizeof(value));`
	`295`	`+ return writeValue((uint8_t*)&value, sizeof(value), withResponse);`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`int BLECharacteristic::broadcast()`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ uint8_t BLERemoteCharacteristic::operator[] (int offset) const`
`85`	`85`	`return 0;`
`86`	`86`	`}`
`87`	`87`
`88`		`-int BLERemoteCharacteristic::writeValue(const uint8_t value[], int length)`
	`88`	`+int BLERemoteCharacteristic::writeValue(const uint8_t value[], int length, bool withResponse)`
`89`	`89`	`{`
`90`	`90`	`if (!ATT.connected(_connectionHandle)) {`
`91`	`91`	`return false;`
`@@ -104,7 +104,7 @@ int BLERemoteCharacteristic::writeValue(const uint8_t value[], int length)`
`104`	`104`	`return 0;`
`105`	`105`	`}`
`106`	`106`
`107`		`- if (_properties & BLEWrite) {`
	`107`	`+ if ((_properties & BLEWrite) && withResponse) {`
`108`	`108`	`uint8_t resp[4];`
`109`	`109`	`int respLength = ATT.writeReq(_connectionHandle, _valueHandle, value, length, resp);`
`110`	`110`
`@@ -133,9 +133,9 @@ int BLERemoteCharacteristic::writeValue(const uint8_t value[], int length)`
`133`	`133`	`return 0;`
`134`	`134`	`}`
`135`	`135`
`136`		`-int BLERemoteCharacteristic::writeValue(const char* value)`
	`136`	`+int BLERemoteCharacteristic::writeValue(const char* value, bool withResponse)`
`137`	`137`	`{`
`138`		`- return writeValue((uint8_t*)value, strlen(value));`
	`138`	`+ return writeValue((uint8_t*)value, strlen(value), withResponse);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`bool BLERemoteCharacteristic::valueUpdated()`