fix types

offspring · offspring · commit f22ad2ed6633 · 2024-08-26T17:07:46.000-04:00
diff --git a/src/BLEAdvertisingData.cpp b/src/BLEAdvertisingData.cpp
@@ -35,6 +35,7 @@ BLEAdvertisingData::BLEAdvertisingData() :
   _hasManufacturerCompanyId(false),
   _advertisedServiceUuid(NULL),
   _advertisedServiceUuidLength(0),
+  _serviceDataUuid(0),
   _serviceData(NULL),
   _serviceDataLength(0)
 {
@@ -59,7 +60,7 @@ int BLEAdvertisingData::remainingLength() const
   return _remainingLength;
 }
 
-int BLEAdvertisingData::availableForWrite()
+int BLEAdvertisingData::availableForWrite() const
 {
   int available = (_remainingLength - AD_FIELD_OVERHEAD);
   if (available < 0) available = 0;
@@ -103,7 +104,9 @@ void BLEAdvertisingData::copy(const BLEAdvertisingData& adv)
 
 BLEAdvertisingData& BLEAdvertisingData::operator=(const BLEAdvertisingData &other) 
 {
-  copy(other);
+  if (this != &other) {
+    copy(other);
+  }
   return *this;
 }
 
diff --git a/src/BLEAdvertisingData.h b/src/BLEAdvertisingData.h
@@ -56,7 +56,7 @@ class BLEAdvertisingData {
   BLEAdvertisingData(); 
   virtual ~BLEAdvertisingData();
 
-  int availableForWrite(); 
+  int availableForWrite() const;
   void clear();
   void copy(const BLEAdvertisingData& adv);
   BLEAdvertisingData& operator=(const BLEAdvertisingData &other);
diff --git a/src/BLECharacteristic.cpp b/src/BLECharacteristic.cpp
@@ -469,25 +469,25 @@ bool BLECharacteristic::canSubscribe()
   return false;
 }
 
-bool BLECharacteristic::subscribe()
+int BLECharacteristic::subscribe()
 {
   if (_remote) {
     return _remote->writeCccd((properties() & BLEIndicate) ? 0x0002 : 0x0001);
   }
 
-  return false;
+  return 0;
 }
 
 bool BLECharacteristic::canUnsubscribe()
 {
   return canSubscribe();
 }
 
-bool BLECharacteristic::unsubscribe()
+int BLECharacteristic::unsubscribe()
 {
   if (_remote) {
     return _remote->writeCccd(0x0000);
   }
 
-  return false;
+  return 0;
 }
diff --git a/src/BLECharacteristic.h b/src/BLECharacteristic.h
@@ -105,9 +105,9 @@ class BLECharacteristic  {
   bool read();
   bool canWrite();
   bool canSubscribe();
-  bool subscribe();
+  int subscribe();
   bool canUnsubscribe();
-  bool unsubscribe();
+  int unsubscribe();
 
 protected:
   friend class BLELocalCharacteristic;
diff --git a/src/BLEStringCharacteristic.cpp b/src/BLEStringCharacteristic.cpp
@@ -19,7 +19,7 @@
 
 #include "BLEStringCharacteristic.h"
 
-BLEStringCharacteristic::BLEStringCharacteristic(const char* uuid, unsigned char properties, int valueSize) :
+BLEStringCharacteristic::BLEStringCharacteristic(const char* uuid, uint16_t properties, int valueSize) :
   BLECharacteristic(uuid, properties, valueSize)
 {
 }
diff --git a/src/BLEStringCharacteristic.h b/src/BLEStringCharacteristic.h
@@ -27,7 +27,7 @@
 class BLEStringCharacteristic : public BLECharacteristic
 {
 public:
-  BLEStringCharacteristic(const char* uuid, unsigned char properties, int valueSize);
+  BLEStringCharacteristic(const char* uuid, uint16_t properties, int valueSize);
 
   int writeValue(const String& value);
   int setValue(const String& value) { return writeValue(value); }
diff --git a/src/remote/BLERemoteCharacteristic.cpp b/src/remote/BLERemoteCharacteristic.cpp
@@ -89,7 +89,7 @@ uint8_t BLERemoteCharacteristic::operator[] (int offset) const
 int BLERemoteCharacteristic::writeValue(const uint8_t value[], int length, bool withResponse)
 {
   if (!ATT.connected(_connectionHandle)) {
-    return false;
+    return 0;
   }
 
   uint16_t maxLength = ATT.mtu(_connectionHandle) - 3;
@@ -193,7 +193,7 @@ bool BLERemoteCharacteristic::read()
   return true;
 }
 
-bool BLERemoteCharacteristic::writeCccd(uint16_t value)
+int BLERemoteCharacteristic::writeCccd(uint16_t value)
 {
   int numDescriptors = descriptorCount();
 
@@ -212,7 +212,7 @@ bool BLERemoteCharacteristic::writeCccd(uint16_t value)
     return cccd.writeValue((uint8_t*)&value, sizeof(value));
   }
 
-  return false;
+  return 0;
 }
 
 uint16_t BLERemoteCharacteristic::valueHandle() const
@@ -244,7 +244,7 @@ void BLERemoteCharacteristic::addDescriptor(BLERemoteDescriptor* descriptor)
   _descriptors.add(descriptor);
 }
 
-void BLERemoteCharacteristic::writeValue(BLEDevice device, const uint8_t value[], int length)
+void BLERemoteCharacteristic::writeValue(const BLEDevice& device, const uint8_t value[], int length)
 {
   _valueLength = length;
   _value = (uint8_t*)realloc(_value, _valueLength);
diff --git a/src/remote/BLERemoteCharacteristic.h b/src/remote/BLERemoteCharacteristic.h
@@ -46,7 +46,7 @@ class BLERemoteCharacteristic : public BLERemoteAttribute {
   bool updatedValueRead();
 
   bool read();
-  bool writeCccd(uint16_t value);
+  int writeCccd(uint16_t value);
 
   unsigned int descriptorCount() const;
   BLERemoteDescriptor* descriptor(unsigned int index) const;
@@ -61,7 +61,7 @@ class BLERemoteCharacteristic : public BLERemoteAttribute {
 
   void addDescriptor(BLERemoteDescriptor* descriptor);
 
-  void writeValue(BLEDevice device, const uint8_t value[], int length);
+  void writeValue(const BLEDevice& device, const uint8_t value[], int length);
 
 private:
   uint16_t _connectionHandle;
diff --git a/src/remote/BLERemoteDescriptor.cpp b/src/remote/BLERemoteDescriptor.cpp
@@ -60,7 +60,7 @@ uint8_t BLERemoteDescriptor::operator[] (int offset) const
 int BLERemoteDescriptor::writeValue(const uint8_t value[], int length)
 {
   if (!ATT.connected(_connectionHandle)) {
-    return false;
+    return 0;
   }
 
   uint16_t maxLength = ATT.mtu(_connectionHandle) - 3;
diff --git a/src/utility/GAP.cpp b/src/utility/GAP.cpp
@@ -84,7 +84,7 @@ void GAPClass::stopAdvertise()
 
 int GAPClass::scan(bool withDuplicates)
 {
-  HCI.leSetScanEnable(false, true);
+  HCI.leSetScanEnable(0x00, 0x01);
 
   // active scan, 20 ms scan interval (N * 0.625), 20 ms scan window (N * 0.625), public own address type, no filter
   /*
@@ -94,19 +94,19 @@ int GAPClass::scan(bool withDuplicates)
     - The scan window can only be less than or equal to the scan interval
   */
   if (HCI.leSetScanParameters(0x01, 0x0020, 0x0020, 0x00, 0x00) != 0) {
-    return false;
+    return 0;
   }
 
   _scanning = true;
 
-  if (HCI.leSetScanEnable(true, !withDuplicates) != 0) {
+  if (HCI.leSetScanEnable(0x01, withDuplicates ? 0x00 : 0x01) != 0) {
     return 0;
   }
 
   return 1;
 }
 
-int GAPClass::scanForName(String name, bool withDuplicates)
+int GAPClass::scanForName(const String& name, bool withDuplicates)
 {
   _scanNameFilter    = name;
   _scanUuidFilter    = "";
@@ -115,7 +115,7 @@ int GAPClass::scanForName(String name, bool withDuplicates)
   return scan(withDuplicates);
 }
 
-int GAPClass::scanForUuid(String uuid, bool withDuplicates)
+int GAPClass::scanForUuid(const String& uuid, bool withDuplicates)
 {
   _scanNameFilter    = "";
   _scanUuidFilter    = uuid;
@@ -124,7 +124,7 @@ int GAPClass::scanForUuid(String uuid, bool withDuplicates)
   return scan(withDuplicates);
 }
 
-int GAPClass::scanForAddress(String address, bool withDuplicates)
+int GAPClass::scanForAddress(const String& address, bool withDuplicates)
 {
   _scanNameFilter    = "";
   _scanUuidFilter    = "";
@@ -135,7 +135,7 @@ int GAPClass::scanForAddress(String address, bool withDuplicates)
 
 void GAPClass::stopScan()
 {
-  HCI.leSetScanEnable(false, false);
+  HCI.leSetScanEnable(0x00, 0x00);
 
   _scanning = false;
 
diff --git a/src/utility/GAP.h b/src/utility/GAP.h
@@ -34,9 +34,9 @@ class GAPClass {
   virtual void stopAdvertise();
 
   virtual int scan(bool withDuplicates);
-  virtual int scanForName(String name, bool withDuplicates);
-  virtual int scanForUuid(String uuid, bool withDuplicates);
-  virtual int scanForAddress(String address, bool withDuplicates);
+  virtual int scanForName(const String& name, bool withDuplicates);
+  virtual int scanForUuid(const String& uuid, bool withDuplicates);
+  virtual int scanForAddress(const String& address, bool withDuplicates);
   virtual void stopScan();
   virtual BLEDevice available();
 
diff --git a/src/utility/HCITransport.h b/src/utility/HCITransport.h
@@ -22,8 +22,10 @@
 
 #include <Arduino.h>
 
-class HCITransportInterface {
-public:
+struct HCITransportInterface {
+
+  virtual ~HCITransportInterface() {};
+
   virtual int begin() = 0;
   virtual void end() = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ BLEAdvertisingData::BLEAdvertisingData() :`
`35`	`35`	`_hasManufacturerCompanyId(false),`
`36`	`36`	`_advertisedServiceUuid(NULL),`
`37`	`37`	`_advertisedServiceUuidLength(0),`
	`38`	`+ _serviceDataUuid(0),`
`38`	`39`	`_serviceData(NULL),`
`39`	`40`	`_serviceDataLength(0)`
`40`	`41`	`{`
`@@ -59,7 +60,7 @@ int BLEAdvertisingData::remainingLength() const`
`59`	`60`	`return _remainingLength;`
`60`	`61`	`}`
`61`	`62`
`62`		`-int BLEAdvertisingData::availableForWrite()`
	`63`	`+int BLEAdvertisingData::availableForWrite() const`
`63`	`64`	`{`
`64`	`65`	`int available = (_remainingLength - AD_FIELD_OVERHEAD);`
`65`	`66`	`if (available < 0) available = 0;`
`@@ -103,7 +104,9 @@ void BLEAdvertisingData::copy(const BLEAdvertisingData& adv)`
`103`	`104`
`104`	`105`	`BLEAdvertisingData& BLEAdvertisingData::operator=(const BLEAdvertisingData &other)`
`105`	`106`	`{`
`106`		`- copy(other);`
	`107`	`+ if (this != &other) {`
	`108`	`+ copy(other);`
	`109`	`+ }`
`107`	`110`	`return *this;`
`108`	`111`	`}`
`109`	`112`
Original file line number	Diff line number	Diff line change
`@@ -469,25 +469,25 @@ bool BLECharacteristic::canSubscribe()`
`469`	`469`	`return false;`
`470`	`470`	`}`
`471`	`471`
`472`		`-bool BLECharacteristic::subscribe()`
	`472`	`+int BLECharacteristic::subscribe()`
`473`	`473`	`{`
`474`	`474`	`if (_remote) {`
`475`	`475`	`return _remote->writeCccd((properties() & BLEIndicate) ? 0x0002 : 0x0001);`
`476`	`476`	`}`
`477`	`477`
`478`		`- return false;`
	`478`	`+ return 0;`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`bool BLECharacteristic::canUnsubscribe()`
`482`	`482`	`{`
`483`	`483`	`return canSubscribe();`
`484`	`484`	`}`
`485`	`485`
`486`		`-bool BLECharacteristic::unsubscribe()`
	`486`	`+int BLECharacteristic::unsubscribe()`
`487`	`487`	`{`
`488`	`488`	`if (_remote) {`
`489`	`489`	`return _remote->writeCccd(0x0000);`
`490`	`490`	`}`
`491`	`491`
`492`		`- return false;`
	`492`	`+ return 0;`
`493`	`493`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`#include "BLEStringCharacteristic.h"`
`21`	`21`
`22`		`-BLEStringCharacteristic::BLEStringCharacteristic(const char* uuid, unsigned char properties, int valueSize) :`
	`22`	`+BLEStringCharacteristic::BLEStringCharacteristic(const char* uuid, uint16_t properties, int valueSize) :`
`23`	`23`	`BLECharacteristic(uuid, properties, valueSize)`
`24`	`24`	`{`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`class BLEStringCharacteristic : public BLECharacteristic`
`28`	`28`	`{`
`29`	`29`	`public:`
`30`		`- BLEStringCharacteristic(const char* uuid, unsigned char properties, int valueSize);`
	`30`	`+ BLEStringCharacteristic(const char* uuid, uint16_t properties, int valueSize);`
`31`	`31`
`32`	`32`	`int writeValue(const String& value);`
`33`	`33`	`int setValue(const String& value) { return writeValue(value); }`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ uint8_t BLERemoteCharacteristic::operator[] (int offset) const`
`89`	`89`	`int BLERemoteCharacteristic::writeValue(const uint8_t value[], int length, bool withResponse)`
`90`	`90`	`{`
`91`	`91`	`if (!ATT.connected(_connectionHandle)) {`
`92`		`- return false;`
	`92`	`+ return 0;`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`uint16_t maxLength = ATT.mtu(_connectionHandle) - 3;`
`@@ -193,7 +193,7 @@ bool BLERemoteCharacteristic::read()`
`193`	`193`	`return true;`
`194`	`194`	`}`
`195`	`195`
`196`		`-bool BLERemoteCharacteristic::writeCccd(uint16_t value)`
	`196`	`+int BLERemoteCharacteristic::writeCccd(uint16_t value)`
`197`	`197`	`{`
`198`	`198`	`int numDescriptors = descriptorCount();`
`199`	`199`
`@@ -212,7 +212,7 @@ bool BLERemoteCharacteristic::writeCccd(uint16_t value)`
`212`	`212`	`return cccd.writeValue((uint8_t*)&value, sizeof(value));`
`213`	`213`	`}`
`214`	`214`
`215`		`- return false;`
	`215`	`+ return 0;`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`uint16_t BLERemoteCharacteristic::valueHandle() const`
`@@ -244,7 +244,7 @@ void BLERemoteCharacteristic::addDescriptor(BLERemoteDescriptor* descriptor)`
`244`	`244`	`_descriptors.add(descriptor);`
`245`	`245`	`}`
`246`	`246`
`247`		`-void BLERemoteCharacteristic::writeValue(BLEDevice device, const uint8_t value[], int length)`
	`247`	`+void BLERemoteCharacteristic::writeValue(const BLEDevice& device, const uint8_t value[], int length)`
`248`	`248`	`{`
`249`	`249`	`_valueLength = length;`
`250`	`250`	`_value = (uint8_t*)realloc(_value, _valueLength);`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ uint8_t BLERemoteDescriptor::operator[] (int offset) const`
`60`	`60`	`int BLERemoteDescriptor::writeValue(const uint8_t value[], int length)`
`61`	`61`	`{`
`62`	`62`	`if (!ATT.connected(_connectionHandle)) {`
`63`		`- return false;`
	`63`	`+ return 0;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`uint16_t maxLength = ATT.mtu(_connectionHandle) - 3;`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void GAPClass::stopAdvertise()`
`84`	`84`
`85`	`85`	`int GAPClass::scan(bool withDuplicates)`
`86`	`86`	`{`
`87`		`- HCI.leSetScanEnable(false, true);`
	`87`	`+ HCI.leSetScanEnable(0x00, 0x01);`
`88`	`88`
`89`	`89`	`// active scan, 20 ms scan interval (N * 0.625), 20 ms scan window (N * 0.625), public own address type, no filter`
`90`	`90`	`/*`
`@@ -94,19 +94,19 @@ int GAPClass::scan(bool withDuplicates)`
`94`	`94`	`- The scan window can only be less than or equal to the scan interval`
`95`	`95`	`*/`
`96`	`96`	`if (HCI.leSetScanParameters(0x01, 0x0020, 0x0020, 0x00, 0x00) != 0) {`
`97`		`- return false;`
	`97`	`+ return 0;`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`_scanning = true;`
`101`	`101`
`102`		`- if (HCI.leSetScanEnable(true, !withDuplicates) != 0) {`
	`102`	`+ if (HCI.leSetScanEnable(0x01, withDuplicates ? 0x00 : 0x01) != 0) {`
`103`	`103`	`return 0;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`return 1;`
`107`	`107`	`}`
`108`	`108`
`109`		`-int GAPClass::scanForName(String name, bool withDuplicates)`
	`109`	`+int GAPClass::scanForName(const String& name, bool withDuplicates)`
`110`	`110`	`{`
`111`	`111`	`_scanNameFilter = name;`
`112`	`112`	`_scanUuidFilter = "";`
`@@ -115,7 +115,7 @@ int GAPClass::scanForName(String name, bool withDuplicates)`
`115`	`115`	`return scan(withDuplicates);`
`116`	`116`	`}`
`117`	`117`
`118`		`-int GAPClass::scanForUuid(String uuid, bool withDuplicates)`
	`118`	`+int GAPClass::scanForUuid(const String& uuid, bool withDuplicates)`
`119`	`119`	`{`
`120`	`120`	`_scanNameFilter = "";`
`121`	`121`	`_scanUuidFilter = uuid;`
`@@ -124,7 +124,7 @@ int GAPClass::scanForUuid(String uuid, bool withDuplicates)`
`124`	`124`	`return scan(withDuplicates);`
`125`	`125`	`}`
`126`	`126`
`127`		`-int GAPClass::scanForAddress(String address, bool withDuplicates)`
	`127`	`+int GAPClass::scanForAddress(const String& address, bool withDuplicates)`
`128`	`128`	`{`
`129`	`129`	`_scanNameFilter = "";`
`130`	`130`	`_scanUuidFilter = "";`
`@@ -135,7 +135,7 @@ int GAPClass::scanForAddress(String address, bool withDuplicates)`
`135`	`135`
`136`	`136`	`void GAPClass::stopScan()`
`137`	`137`	`{`
`138`		`- HCI.leSetScanEnable(false, false);`
	`138`	`+ HCI.leSetScanEnable(0x00, 0x00);`
`139`	`139`
`140`	`140`	`_scanning = false;`
`141`	`141`