Diff: public/ServiceDiscovery.h

Revision:

458:5546ebd25359

Parent:

457:6ebc9bbde90b

Child:

459:a83b41d87755

diff -r 6ebc9bbde90b -r 5546ebd25359 public/ServiceDiscovery.h
--- a/public/ServiceDiscovery.h	Fri Jun 19 15:51:58 2015 +0100
+++ b/public/ServiceDiscovery.h	Fri Jun 19 15:51:58 2015 +0100
@@ -28,14 +28,14 @@
      */
     class DiscoveredService {
     public:
-        void setup(ShortUUIDBytes_t uuidIn, GattAttribute::Handle_t startHandleIn, GattAttribute::Handle_t endHandleIn) {
+        void setup(UUID::ShortUUIDBytes_t uuidIn, GattAttribute::Handle_t startHandleIn, GattAttribute::Handle_t endHandleIn) {
             uuid        = uuidIn;
             startHandle = startHandleIn;
             endHandle   = endHandleIn;
         }
 
     public:
-        const ShortUUIDBytes_t& getShortUUID(void) const {
+        const UUID::ShortUUIDBytes_t& getShortUUID(void) const {
             return uuid;
         }
 
@@ -55,7 +55,7 @@
         DiscoveredService(const DiscoveredService &);
 
     private:
-        ShortUUIDBytes_t        uuid;        /**< UUID of the service.  */
+        UUID::ShortUUIDBytes_t  uuid;        /**< UUID of the service.  */
         GattAttribute::Handle_t startHandle; /**< Service Handle Range. */
         GattAttribute::Handle_t endHandle;   /**< Service Handle Range. */
     };
@@ -98,7 +98,7 @@
             uint8_t auth_signed_wr :1; /**< Writing the value with Signed Write Command permitted. */
         };
 
-        void setup(ShortUUIDBytes_t uuidIn, Properties_t propsIn, GattAttribute::Handle_t declHandleIn, GattAttribute::Handle_t valueHandleIn) {
+        void setup(UUID::ShortUUIDBytes_t uuidIn, Properties_t propsIn, GattAttribute::Handle_t declHandleIn, GattAttribute::Handle_t valueHandleIn) {
             uuid        = uuidIn;
             props       = propsIn;
             declHandle  = declHandleIn;
@@ -106,7 +106,7 @@
         }
 
     public:
-        const ShortUUIDBytes_t& getShortUUID(void) const {
+        const UUID::ShortUUIDBytes_t& getShortUUID(void) const {
             return uuid;
         }
 
@@ -127,7 +127,7 @@
         }
 
     private:
-        ShortUUIDBytes_t        uuid;
+        UUID::ShortUUIDBytes_t  uuid;
         Properties_t            props;
         GattAttribute::Handle_t declHandle;
         GattAttribute::Handle_t valueHandle;
@@ -142,8 +142,8 @@
     static ble_error_t launch(Gap::Handle_t             connectionHandle,
                               ServiceCallback_t         sc = NULL,
                               CharacteristicCallback_t  cc = NULL,
-                              const UUID               &matchingServiceUUID = ShortUUIDBytes_t(BLE_UUID_UNKNOWN),
-                              const UUID               &matchingCharacteristicUUIDIn = ShortUUIDBytes_t(BLE_UUID_UNKNOWN));
+                              const UUID               &matchingServiceUUID = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN),
+                              const UUID               &matchingCharacteristicUUIDIn = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN));
 
     static void        terminate(void);