Revision 741:d6dceefb844e, committed 2015-07-21

Comitter:

rgrover1

Date:

Tue Jul 21 13:25:38 2015 +0100

Parent:

740:8d52f0f8efd9

Child:

742:861ed7eb186d

Commit message:

Synchronized with git rev da20f2e2
Author: Andrew Fernandes
Change DiscoveredCharacteristic API to return long or short UUIDs.

Changed in this revision

--- a/ble/DiscoveredCharacteristic.h	Tue Jul 21 13:25:38 2015 +0100
+++ b/ble/DiscoveredCharacteristic.h	Tue Jul 21 13:25:38 2015 +0100
@@ -140,8 +140,8 @@
     }
 
 public:
-    UUID::ShortUUIDBytes_t getShortUUID(void) const {
-        return uuid.getShortUUID();
+    const UUID& getUUID(void) const {
+        return uuid;
     }
 
     const Properties_t& getProperties(void) const {

--- a/ble/Gap.h	Tue Jul 21 13:25:38 2015 +0100
+++ b/ble/Gap.h	Tue Jul 21 13:25:38 2015 +0100
@@ -178,21 +178,21 @@
      * @return Minimum Advertising interval in milliseconds.
      */
     virtual uint16_t getMinAdvertisingInterval(void) const {
-        return 0; /* Requesting action from porter(s): override this API if this capability is supported. */
+        return 0; /* default implementation; override this API if this capability is supported. */
     }
 
     /**
      * @return Minimum Advertising interval in milliseconds for non-connectible mode.
      */
     virtual uint16_t getMinNonConnectableAdvertisingInterval(void) const {
-        return 0; /* Requesting action from porter(s): override this API if this capability is supported. */
+        return 0; /* default implementation; override this API if this capability is supported. */
     }
 
     /**
      * @return Maximum Advertising interval in milliseconds.
      */
     virtual uint16_t getMaxAdvertisingInterval(void) const {
-        return 0xFFFF; /* Requesting action from porter(s): override this API if this capability is supported. */
+        return 0xFFFF; /* default implementation; override this API if this capability is supported. */
     }
 
     virtual ble_error_t stopAdvertising(void) {
@@ -410,7 +410,7 @@
         (void)valueArrayPP;
         (void)countP;
 
-        *countP = 0; /* Requesting action from porter(s): override this API if this capability is supported. */
+        *countP = 0; /* default implementation; override this API if this capability is supported. */
     }
 
 protected:

--- a/ble/GattClient.h	Tue Jul 21 13:25:38 2015 +0100
+++ b/ble/GattClient.h	Tue Jul 21 13:25:38 2015 +0100
@@ -138,11 +138,12 @@
     virtual ble_error_t discoverServices(Gap::Handle_t                        connectionHandle,
                                          ServiceDiscovery::ServiceCallback_t  callback,
                                          const UUID                          &matchingServiceUUID = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN)) {
-        return launchServiceDiscovery(connectionHandle, callback, NULL, matchingServiceUUID); /* We take advantage of the property
-                                                                * that providing NULL for the characteristic callback will result in
-                                                                * characteristic discovery being skipped for each matching
-                                                                * service. This allows for an inexpensive method to discover only
-                                                                * services. Porter(s) are free to override this. */
+        /* avoid compiler warnings about unused variables */
+        (void)connectionHandle;
+        (void)callback;
+        (void)matchingServiceUUID;
+
+        return BLE_ERROR_NOT_IMPLEMENTED; /* Requesting action from porter(s): override this API if this capability is supported. */
     }
 
     /**
@@ -186,7 +187,7 @@
      * Is service-discovery currently active?
      */
     virtual bool isServiceDiscoveryActive(void) const {
-        return false; /* Requesting action from porter(s): override this API if this capability is supported. */
+        return false; /* default implementation; override this API if this capability is supported. */
     }
 
     /**
@@ -194,7 +195,7 @@
      * invocation of the TerminationCallback if service-discovery is active.
      */
     virtual void terminateServiceDiscovery(void) {
-        /* Requesting action from porter(s): override this API if this capability is supported. */
+        /* default implementation; override this API if this capability is supported. */
     }
 
     /* Initiate a Gatt Client read procedure by attribute-handle. */
@@ -261,7 +262,7 @@
     virtual void onServiceDiscoveryTermination(ServiceDiscovery::TerminationCallback_t callback) {
         (void)callback; /* avoid compiler warnings about ununsed variables */
 
-        /* Requesting action from porter(s): override this API if this capability is supported. */
+        /* default implementation; override this API if this capability is supported. */
     }
 
     /**

--- a/ble/GattServer.h	Tue Jul 21 13:25:38 2015 +0100
+++ b/ble/GattServer.h	Tue Jul 21 13:25:38 2015 +0100
@@ -220,7 +220,7 @@
      * onDataRead(). It should be overridden to return true as applicable.
      */
     virtual bool isOnDataReadAvailable() const {
-        return false; /* Requesting action from porter(s): override this API if this capability is supported. */
+        return false; /* default implementation; override this API if this capability is supported. */
     }
 
     /*