Change public API types to use non-stdint types

as per https://www.arduino.cc/en/Reference/HomePage

Author: sandeepmistry

libraries/CurieBle/src/BLECentral.cpp

@@ -36,17 +36,17 @@ BLECentral::operator bool() const {
     return (memcmp(&_address, &zero, sizeof(_address)) != 0);
 }
 
-boolean_t
+bool
 BLECentral::operator==(const BLECentral& rhs) const {
     return (memcmp(&_address, &rhs._address, sizeof(_address)) == 0);
 }
 
-boolean_t
+bool
 BLECentral::operator!=(const BLECentral& rhs) const {
     return !(*this == rhs);
 }
 
-boolean_t
+bool
 BLECentral::connected() {
     poll();
 

libraries/CurieBle/src/BLECentral.h

@@ -33,7 +33,7 @@ class BLECentral {
          *
          * @return boolean_t true if the central is connected, otherwise false
          */
-        boolean_t connected(void);
+        bool connected(void);
 
         /**
          * Get the address of the Central in string form
@@ -55,8 +55,8 @@ class BLECentral {
         void poll(void);
 
         operator bool(void) const;
-        boolean_t operator==(const BLECentral& rhs) const;
-        boolean_t operator!=(const BLECentral& rhs) const;
+        bool operator==(const BLECentral& rhs) const;
+        bool operator!=(const BLECentral& rhs) const;
 
     protected:
         BLECentral(BLEPeripheral* peripheral);

libraries/CurieBle/src/BLECharacteristic.cpp

@@ -24,8 +24,8 @@
 #define BLE_CCCD_INDICATE_EN_MASK 0x2
 
 BLECharacteristic::BLECharacteristic(const char* uuid,
-                      const uint8_t properties,
-                      const uint16_t maxLength) :
+                      const unsigned char properties,
+                      const unsigned short maxLength) :
     BLEAttribute(uuid, BLETypeCharacteristic),
     _properties(properties),
     _data_len(0),
@@ -42,21 +42,21 @@ BLECharacteristic::BLECharacteristic(const char* uuid,
 }
 
 BLECharacteristic::BLECharacteristic(const char* uuid,
-                      const uint8_t properties,
+                      const unsigned char properties,
                       const char* value) :
     BLECharacteristic(uuid, properties, strlen(value))
 {
     setValue((const uint8_t*)value, strlen(value));
 }
 
-uint8_t
+unsigned char
 BLECharacteristic::properties() const
 {
     return _properties;
 }
 
 BleStatus
-BLECharacteristic::setValue(const uint8_t value[], uint16_t length)
+BLECharacteristic::setValue(const unsigned char value[], uint16_t length)
 {
     BleStatus status;
 
@@ -82,7 +82,7 @@ BLECharacteristic::setValue(const uint8_t value[], uint16_t length)
 }
 
 void
-BLECharacteristic::setValue(BLECentral& central, const uint8_t* value, uint16_t length)
+BLECharacteristic::setValue(BLECentral& central, const unsigned char* value, unsigned short length)
 {
     _setValue(value, length);
 
@@ -93,31 +93,31 @@ BLECharacteristic::setValue(BLECentral& central, const uint8_t* value, uint16_t
     }
 }
 
-uint16_t
+unsigned short
 BLECharacteristic::valueSize() const
 {
     return _max_len;
 }
 
-const uint8_t*
+const unsigned char*
 BLECharacteristic::value() const
 {
     return _data;
 }
 
-uint16_t
+unsigned short
 BLECharacteristic::valueLength() const
 {
     return _data_len;
 }
 
-uint8_t
+unsigned char
 BLECharacteristic::operator[] (int offset) const
 {
     return _data[offset];
 }
 
-boolean_t
+bool
 BLECharacteristic::written()
 {
     boolean_t written = _written;
@@ -127,7 +127,7 @@ BLECharacteristic::written()
     return written;
 }
 
-boolean_t
+bool
 BLECharacteristic::subscribed()
 {
     return (_cccd_value & (BLE_CCCD_NOTIFY_EN_MASK | BLE_CCCD_INDICATE_EN_MASK));

libraries/CurieBle/src/BLECharacteristic.h

@@ -67,8 +67,8 @@ class BLECharacteristic : public BLEAttribute {
      * @param maxLength    Maximum data length required for characteristic value (<= BLE_MAX_ATTR_DATA_LEN)
      */
     BLECharacteristic(const char* uuid,
-                      const uint8_t properties,
-                      const uint16_t maxLength);
+                      const unsigned char properties,
+                      const unsigned short maxLength);
 
     /**
      * Constructor for BLE Characteristic
@@ -78,7 +78,7 @@ class BLECharacteristic : public BLEAttribute {
      * @param value        String value for characteristic (string length (<= BLE_MAX_ATTR_DATA_LEN))
      */
     BLECharacteristic(const char* uuid,
-                      const uint8_t properties,
+                      const unsigned char properties,
                       const char* value);
 
     /**
@@ -90,51 +90,51 @@ class BLECharacteristic : public BLEAttribute {
      *
      * @return BleStatus indicating success or error
      */
-    BleStatus setValue(const uint8_t value[], uint16_t length);
+    BleStatus setValue(const unsigned char value[], unsigned short length);
 
     /**
      * Get the property mask of the Characteristic
      *
      * @return uint8_t property mask of the Characteristic
      */
-    uint8_t properties(void) const;
+    unsigned char properties(void) const;
 
     /**
      * Get the size of the Characteristic
      *
-     * @return uint16_t size of characateristic in bytes
+     * @return unsigned size of characateristic in bytes
      */
-    uint16_t valueSize(void) const;
+    unsigned short valueSize(void) const;
 
     /**
      * Get data pointer to the value of the Characteristic
      *
-     * @return const uint8_t* pointer to the value of the Characteristic
+     * @return const unsigned char* pointer to the value of the Characteristic
      */
-    const uint8_t* value(void) const;
+    const unsigned char* value(void) const;
 
     /**
      * Get the length of the value of the Characteristic
      *
-     * @return uint16_t size of characateristic value in bytes
+     * @return unsigned short size of characateristic value in bytes
      */
-    uint16_t valueLength() const;
+    unsigned short valueLength() const;
 
-    uint8_t operator[] (int offset) const;
+    unsigned char operator[] (int offset) const;
 
     /**
      * Has the value of the Characteristic been written by a central
      *
-     * @return boolean_t true is central has updated characteristic value, otherwise false
+     * @return bool true is central has updated characteristic value, otherwise false
      */
-    boolean_t written(void);
+    bool written(void);
 
     /**
      * Is a central listening for notifications or indications of the Characteristic
      *
-     * @return boolean_t true is central is subscribed, otherwise false
+     * @return bool true is central is subscribed, otherwise false
      */
-    boolean_t subscribed(void);
+    bool subscribed(void);
 
     /**
      * Provide a function to be called when events related to this Characteristic are raised
@@ -163,11 +163,12 @@ class BLECharacteristic : public BLEAttribute {
     void _setValue(const uint8_t value[], uint16_t length);
 
 private:
-    uint8_t _properties;
-    uint16_t _max_len;
-    uint8_t  _data[BLE_MAX_ATTR_DATA_LEN];
-    uint16_t _data_len;
-    boolean_t _written;
+    unsigned char _properties;
+    unsigned short _max_len;
+    unsigned char  _data[BLE_MAX_ATTR_DATA_LEN];
+    unsigned short _data_len;
+    bool _written;
+
     uint16_t _cccd_value;
     uint16_t _value_handle;
     uint16_t _cccd_handle;

libraries/CurieBle/src/BLEDescriptor.cpp

@@ -21,7 +21,7 @@
 
 #include "internal/ble_client.h"
 
-BLEDescriptor::BLEDescriptor(const char* uuid, const uint8_t value[], uint16_t valueLength) :
+BLEDescriptor::BLEDescriptor(const char* uuid, const unsigned char value[], unsigned short valueLength) :
     BLEAttribute(uuid, BLETypeDescriptor)
 {
     if (valueLength > BLE_MAX_ATTR_DATA_LEN) {
@@ -37,19 +37,19 @@ BLEDescriptor::BLEDescriptor(const char* uuid, const char* value) :
 {
 }
 
-const uint8_t*
+const unsigned char*
 BLEDescriptor::BLEDescriptor::value() const
 {
     return _data;
 }
 
-uint16_t
+unsigned short
 BLEDescriptor::valueLength() const
 {
     return _data_len;
 }
 
-uint8_t
+unsigned char
 BLEDescriptor::operator[] (int offset) const
 {
     return _data[offset];

libraries/CurieBle/src/BLEDescriptor.h

@@ -34,7 +34,7 @@ class BLEDescriptor : public BLEAttribute {
      * @param value       Value of descriptor, as a byte array.  Data is stored in internal copy.
      * @param valueLength Data length required for descriptor value (<= BLE_MAX_ATTR_DATA_LEN)
      */
-    BLEDescriptor(const char* uuid, const uint8_t value[], uint16_t valueLength);
+    BLEDescriptor(const char* uuid, const unsigned char value[], unsigned short valueLength);
 
     /**
      * Constructor for BLE Descriptor
@@ -48,19 +48,19 @@ class BLEDescriptor : public BLEAttribute {
     /**
      * Get data pointer to the value of the Descriptor
      *
-     * @return const uint8_t* pointer to the value of the Descriptor
+     * @return const unsigned char* pointer to the value of the Descriptor
      */
-    const uint8_t* value(void) const;
+    const unsigned char* value(void) const;
 
     /**
      * Get the length of the value of the Descriptor
      *
-     * @return uint16_t size of Descriptor value in bytes
+     * @return unsigned short size of Descriptor value in bytes
      */
-    uint16_t valueLength(void) const;
+    unsigned short valueLength(void) const;
 
 
-    uint8_t operator[] (int offset) const;
+    unsigned char operator[] (int offset) const;
 
 protected:
     BleStatus add(uint16_t serviceHandle);

libraries/CurieBle/src/BLEPeripheral.h

@@ -98,7 +98,7 @@ class BLEPeripheral {
      *
      * @note This method must be called before the begin method
      */
-    BleStatus setAppearance(const uint16_t appearance);
+    BleStatus setAppearance(const unsigned short appearance);
 
     /**
      * Add an attribute to the BLE Peripheral Device