Revision 742:861ed7eb186d, committed 2015-07-21

Comitter:

rgrover1

Date:

Tue Jul 21 13:25:38 2015 +0100

Parent:

741:d6dceefb844e

Child:

743:f49820e3e8ce

Commit message:

Synchronized with git rev 7d961c15
Author: Rohit Grover
Merge branch 'master' of https://github.com/adfernandes/BLE_API into adfernandes-master

Changed in this revision

--- 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; /* default implementation; override this API if this capability is supported. */
+        return 0; /* Requesting action from porter(s): 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; /* default implementation; override this API if this capability is supported. */
+        return 0; /* Requesting action from porter(s): override this API if this capability is supported. */
     }
 
     /**
      * @return Maximum Advertising interval in milliseconds.
      */
     virtual uint16_t getMaxAdvertisingInterval(void) const {
-        return 0xFFFF; /* default implementation; override this API if this capability is supported. */
+        return 0xFFFF; /* Requesting action from porter(s): override this API if this capability is supported. */
     }
 
     virtual ble_error_t stopAdvertising(void) {
@@ -410,7 +410,7 @@
         (void)valueArrayPP;
         (void)countP;
 
-        *countP = 0; /* default implementation; override this API if this capability is supported. */
+        *countP = 0; /* Requesting action from porter(s): 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,12 +138,11 @@
     virtual ble_error_t discoverServices(Gap::Handle_t                        connectionHandle,
                                          ServiceDiscovery::ServiceCallback_t  callback,
                                          const UUID                          &matchingServiceUUID = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN)) {
-        /* 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. */
+        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. */
     }
 
     /**
@@ -187,7 +186,7 @@
      * Is service-discovery currently active?
      */
     virtual bool isServiceDiscoveryActive(void) const {
-        return false; /* default implementation; override this API if this capability is supported. */
+        return false; /* Requesting action from porter(s): override this API if this capability is supported. */
     }
 
     /**
@@ -195,7 +194,7 @@
      * invocation of the TerminationCallback if service-discovery is active.
      */
     virtual void terminateServiceDiscovery(void) {
-        /* default implementation; override this API if this capability is supported. */
+        /* Requesting action from porter(s): override this API if this capability is supported. */
     }
 
     /* Initiate a Gatt Client read procedure by attribute-handle. */
@@ -262,7 +261,7 @@
     virtual void onServiceDiscoveryTermination(ServiceDiscovery::TerminationCallback_t callback) {
         (void)callback; /* avoid compiler warnings about ununsed variables */
 
-        /* default implementation; override this API if this capability is supported. */
+        /* Requesting action from porter(s): 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; /* default implementation; override this API if this capability is supported. */
+        return false; /* Requesting action from porter(s): override this API if this capability is supported. */
     }
 
     /*