Discover Services 1800 and 1801 by pass parameter

sgbihu · sgbihu · commit 19b230e21cbe · 2017-04-27T13:22:17.000+08:00
1. Fix Jira 769/git #378. Discover GAP service by parameter. 2. Fix Jira 770/git #379 to show the device name in central when discover GAP service. Changed service BLEDevice.cpp - Modify the API BLEDevice.h - Modify the API BLEDeviceManager.cpp - Add get device name logic BLEProfileManager.cpp - Implement get devicename and dicovery logic BLEProfileManager.h - Add API to get devicename from characteristic BLEServiceImp.cpp - Modify the filter logic BLEServiceImp.h - Modify the API
diff --git a/libraries/CurieBLE/src/BLEDevice.cpp b/libraries/CurieBLE/src/BLEDevice.cpp
@@ -376,9 +376,10 @@ bool BLEDevice::connect()
     return BLEDeviceManager::instance()->connect(*this);
 }
 
-bool BLEDevice::discoverAttributes()
+bool BLEDevice::discoverAttributes(bool discoverGapGatt)
 {
-    return BLEProfileManager::instance()->discoverAllAttributes(this);
+    return BLEProfileManager::instance()->discoverAllAttributes(this, 
+                                                                discoverGapGatt);
 }
 
 bool BLEDevice::discoverAttributesByService(const char* svc_uuid)
diff --git a/libraries/CurieBLE/src/BLEDevice.h b/libraries/CurieBLE/src/BLEDevice.h
@@ -481,7 +481,7 @@ class BLEDevice
     int rssi() const; // returns the RSSI of the peripheral at discovery
 
     bool connect(); // connect to the peripheral
-    bool discoverAttributes(); // discover the peripheral's attributes
+    bool discoverAttributes(bool discoverGapGatt = false); // discover the peripheral's attributes
     bool discoverAttributesByService(const char* svc_uuid);
 
     String deviceName(); // read the device name attribute of the peripheral, and return String value
diff --git a/libraries/CurieBLE/src/internal/BLEDeviceManager.cpp b/libraries/CurieBLE/src/internal/BLEDeviceManager.cpp
@@ -1293,7 +1293,7 @@ String BLEDeviceManager::deviceName(const BLEDevice* device)
     {
         return _device_name;
     }
-    return String("");
+    return BLEProfileManager::instance()->getDeviceName(device);
 }
 
 int BLEDeviceManager::appearance()
diff --git a/libraries/CurieBLE/src/internal/BLEProfileManager.cpp b/libraries/CurieBLE/src/internal/BLEProfileManager.cpp
@@ -593,8 +593,10 @@ void BLEProfileManager::handleDisconnectedPutOffEvent()
     }
 }
 
-bool BLEProfileManager::discoverAllAttributes(BLEDevice* device)
+bool BLEProfileManager::discoverAllAttributes(BLEDevice* device,
+                                              bool discoverGapGatt)
 {
+    _discover_gap_gatt = discoverGapGatt;
     return discoverAttributes(device, NULL);
 }
 
@@ -692,7 +694,7 @@ void BLEProfileManager::setDiscovering(bool discover)
 void BLEProfileManager::singleServiceDiscoverResponseProc(BLEDevice &device, 
                                                           BLEServiceImp* service)
 {
-    bool result = service->discoverAttributes(&device);
+    bool result = service->discoverAttributes(&device, true);
     if (result == true)
     {
         // Record the current discovering service
@@ -786,7 +788,8 @@ bool BLEProfileManager::discoverNextService(BLEDevice &device)
         
         if (NULL == _cur_discover_service)
         {
-            bool result = serviceCurImp->discoverAttributes(&device);
+            bool result = serviceCurImp->discoverAttributes(&device, 
+                                                            _discover_gap_gatt);
             if (result == true)
             {
                 // Record the current discovering service
@@ -890,17 +893,19 @@ void BLEProfileManager::serviceDiscoverComplete(const BLEDevice &bledevice)
         serviceCurImp = node->value;
         if (NULL != serviceCurImp)
         {
-            if (servicePrevImp)  // KW issue: Chk for NULL.
+            if (servicePrevImp)
+            {
                 servicePrevImp->setEndHandle(serviceCurImp->startHandle() - 1);
+                pr_debug(LOG_MODULE_BLE, "Pre: start-%d, end-%d", 
+                         servicePrevImp->startHandle(), 
+                         servicePrevImp->endHandle());
+                pr_debug(LOG_MODULE_BLE, "Curr: start-%d, end-%d", 
+                         serviceCurImp->startHandle(), 
+                         serviceCurImp->endHandle());
+            }
         }
         
-        if (servicePrevImp)
-        {
-            pr_debug(LOG_MODULE_BLE, "Curr: start-%d, end-%d", servicePrevImp->startHandle(), servicePrevImp->endHandle());
-        }
         servicePrevImp = serviceCurImp;
-        if (servicePrevImp)  // KW issue: Chk for NULL.
-            pr_debug(LOG_MODULE_BLE, "Curr: start-%d, end-%d", servicePrevImp->startHandle(), servicePrevImp->endHandle());
         node = node->next;
     }
     return;
@@ -1059,3 +1064,33 @@ unsigned short BLEProfileManager::getAppearance()
     return appearenceChrc.value();
 }
 
+String BLEProfileManager::getDeviceName(const BLEDevice* device)
+{
+    String temp("");
+    char device_name_buff[BLE_MAX_DEVICE_NAME];
+    unsigned short device_name_len;
+    
+    BLEServiceImp* gap_service = service(*device, "1800");
+    if (NULL == gap_service)
+    {
+        return temp;
+    }
+    BLECharacteristicImp* devicename_chrc = gap_service->characteristic("2a00");
+    if (NULL == devicename_chrc)
+    {
+        return temp;
+    }
+    
+    // Read device name
+    if (false == devicename_chrc->read(true))
+    {
+        return temp;
+    }
+    device_name_len = devicename_chrc->valueLength();
+    memcpy(device_name_buff, devicename_chrc->value(), device_name_len);
+    device_name_buff[device_name_len] = '\0';
+    temp = device_name_buff;
+    
+    return temp;
+}
+
diff --git a/libraries/CurieBLE/src/internal/BLEProfileManager.h b/libraries/CurieBLE/src/internal/BLEProfileManager.h
@@ -107,7 +107,9 @@ class BLEProfileManager{
                                  const bt_gatt_attr_t *attr,
                                  bt_gatt_discover_params_t *params);
     
-    bool discoverAllAttributes(BLEDevice* device);
+    // Default not discover the GAP/GATT service
+    bool discoverAllAttributes(BLEDevice* device,
+                               bool discoverGapGatt = false);
     bool discoverAttributesByService(BLEDevice* device, const bt_uuid_t* svc_uuid);
     void handleConnectedEvent(const bt_addr_le_t* deviceAddr);
     void handleDisconnectedEvent(const bt_addr_le_t* deviceAddr);
@@ -131,6 +133,8 @@ class BLEProfileManager{
      */
     void setAppearance(unsigned short appearance);
     unsigned short getAppearance();
+
+    String getDeviceName(const BLEDevice* device);
 protected:
     friend ssize_t profile_write_process(bt_conn_t *conn,
                                      const bt_gatt_attr_t *attr,
@@ -223,6 +227,7 @@ class BLEProfileManager{
     bt_addr_le_t  _discovering_ble_addresses;
     
     bool _start_discover;
+    bool _discover_gap_gatt;
 
     bool _discovering;
     uint64_t _discover_rsp_timestamp;
diff --git a/libraries/CurieBLE/src/internal/BLEServiceImp.cpp b/libraries/CurieBLE/src/internal/BLEServiceImp.cpp
@@ -284,14 +284,19 @@ void BLEServiceImp::setDiscovering(bool enable)
     _discovering = enable;
 }
 
-bool BLEServiceImp::discoverAttributes(BLEDevice* device)
+bool BLEServiceImp::discoverAttributes(BLEDevice* device,
+                                       bool discoverGapGatt)
 {
-    return discoverAttributes(device, _start_handle, _end_handle);
+    return discoverAttributes(device, 
+                              _start_handle, 
+                              _end_handle, 
+                              discoverGapGatt);
 }
 
 bool BLEServiceImp::discoverAttributes(BLEDevice* device, 
                                        uint16_t start_handle, 
-                                       uint16_t end_handle)
+                                       uint16_t end_handle,
+                                       bool discoverGapGatt)
 {
     pr_debug(LOG_MODULE_BLE, "%s-%d", __FUNCTION__, __LINE__);
     int err;
@@ -300,9 +305,10 @@ bool BLEServiceImp::discoverAttributes(BLEDevice* device,
     const bt_uuid_t* service_uuid = bt_uuid();
     
     // Filt out GAP/GATT service
-    if (service_uuid->type == BT_UUID_TYPE_16)
+    if (discoverGapGatt == false && // Don't discover GAP and GATT service
+        service_uuid->type == BT_UUID_TYPE_16)
     {
-        uint16_t uuid_tmp;// = ((bt_uuid_16_t*)service_uuid)->val;
+        uint16_t uuid_tmp;
         
         memcpy(&uuid_tmp, &((bt_uuid_16_t*)service_uuid)->val, sizeof(uuid_tmp));
         if (BT_UUID_GAP_VAL == uuid_tmp ||
@@ -319,6 +325,7 @@ bool BLEServiceImp::discoverAttributes(BLEDevice* device,
         pr_debug(LOG_MODULE_BLE, "Can't find connection\n");
         return false;
     }
+    
     temp = &_discover_params;
     temp->start_handle = start_handle;
     temp->end_handle = end_handle;
@@ -533,7 +540,10 @@ uint8_t BLEServiceImp::characteristicReadRspProc(bt_conn_t *conn,
         {
             if (false == discovering())
             {
-                if (false == discoverAttributes(&bleDevice, chrc_handle + 1, _end_handle))
+                if (false == discoverAttributes(&bleDevice, 
+                                                chrc_handle + 1, 
+                                                _end_handle,
+                                                true))
                 {
                     discoverNextCharacteristic(bleDevice);
                 }
diff --git a/libraries/CurieBLE/src/internal/BLEServiceImp.h b/libraries/CurieBLE/src/internal/BLEServiceImp.h
@@ -69,7 +69,8 @@ class BLEServiceImp: public BLEAttribute{
     inline uint16_t endHandle(){return _end_handle;}
     inline uint16_t startHandle(){return _start_handle;}
     
-    bool discoverAttributes(BLEDevice* device);
+    bool discoverAttributes(BLEDevice* device,
+                            bool discoverGapGatt);
     uint8_t discoverResponseProc(bt_conn_t *conn,
                                  const bt_gatt_attr_t *attr,
                                  bt_gatt_discover_params_t *params);
@@ -95,7 +96,8 @@ class BLEServiceImp: public BLEAttribute{
     bool readCharacteristic(const BLEDevice &bledevice, uint16_t handle);
     bool discoverAttributes(BLEDevice* device, 
                             uint16_t start_handle, 
-                            uint16_t end_handle);
+                            uint16_t end_handle,
+                            bool discoverGapGatt);
     void setDiscovering(bool enable);
 private:
     typedef LinkNode<BLECharacteristicImp *>  BLECharacteristicLinkNodeHeader;

Original file line number	Diff line number	Diff line change
`@@ -376,9 +376,10 @@ bool BLEDevice::connect()`
`376`	`376`	`return BLEDeviceManager::instance()->connect(*this);`
`377`	`377`	`}`
`378`	`378`
`379`		`-bool BLEDevice::discoverAttributes()`
	`379`	`+bool BLEDevice::discoverAttributes(bool discoverGapGatt)`
`380`	`380`	`{`
`381`		`- return BLEProfileManager::instance()->discoverAllAttributes(this);`
	`381`	`+ return BLEProfileManager::instance()->discoverAllAttributes(this,`
	`382`	`+ discoverGapGatt);`
`382`	`383`	`}`
`383`	`384`
`384`	`385`	`bool BLEDevice::discoverAttributesByService(const char* svc_uuid)`
Original file line number	Diff line number	Diff line change
`@@ -1293,7 +1293,7 @@ String BLEDeviceManager::deviceName(const BLEDevice* device)`
`1293`	`1293`	`{`
`1294`	`1294`	`return _device_name;`
`1295`	`1295`	`}`
`1296`		`- return String("");`
	`1296`	`+ return BLEProfileManager::instance()->getDeviceName(device);`
`1297`	`1297`	`}`
`1298`	`1298`
`1299`	`1299`	`int BLEDeviceManager::appearance()`
Original file line number	Diff line number	Diff line change
`@@ -284,14 +284,19 @@ void BLEServiceImp::setDiscovering(bool enable)`
`284`	`284`	`_discovering = enable;`
`285`	`285`	`}`
`286`	`286`
`287`		`-bool BLEServiceImp::discoverAttributes(BLEDevice* device)`
	`287`	`+bool BLEServiceImp::discoverAttributes(BLEDevice* device,`
	`288`	`+ bool discoverGapGatt)`
`288`	`289`	`{`
`289`		`- return discoverAttributes(device, _start_handle, _end_handle);`
	`290`	`+ return discoverAttributes(device,`
	`291`	`+ _start_handle,`
	`292`	`+ _end_handle,`
	`293`	`+ discoverGapGatt);`
`290`	`294`	`}`
`291`	`295`
`292`	`296`	`bool BLEServiceImp::discoverAttributes(BLEDevice* device,`
`293`	`297`	`uint16_t start_handle,`
`294`		`- uint16_t end_handle)`
	`298`	`+ uint16_t end_handle,`
	`299`	`+ bool discoverGapGatt)`
`295`	`300`	`{`
`296`	`301`	`pr_debug(LOG_MODULE_BLE, "%s-%d", __FUNCTION__, __LINE__);`
`297`	`302`	`int err;`
`@@ -300,9 +305,10 @@ bool BLEServiceImp::discoverAttributes(BLEDevice* device,`
`300`	`305`	`const bt_uuid_t* service_uuid = bt_uuid();`
`301`	`306`
`302`	`307`	`// Filt out GAP/GATT service`
`303`		`- if (service_uuid->type == BT_UUID_TYPE_16)`
	`308`	`+ if (discoverGapGatt == false && // Don't discover GAP and GATT service`
	`309`	`+ service_uuid->type == BT_UUID_TYPE_16)`
`304`	`310`	`{`
`305`		`- uint16_t uuid_tmp;// = ((bt_uuid_16_t*)service_uuid)->val;`
	`311`	`+ uint16_t uuid_tmp;`
`306`	`312`
`307`	`313`	`memcpy(&uuid_tmp, &((bt_uuid_16_t*)service_uuid)->val, sizeof(uuid_tmp));`
`308`	`314`	`if (BT_UUID_GAP_VAL == uuid_tmp \|\|`
`@@ -319,6 +325,7 @@ bool BLEServiceImp::discoverAttributes(BLEDevice* device,`
`319`	`325`	`pr_debug(LOG_MODULE_BLE, "Can't find connection\n");`
`320`	`326`	`return false;`
`321`	`327`	`}`
	`328`	`+`
`322`	`329`	`temp = &_discover_params;`
`323`	`330`	`temp->start_handle = start_handle;`
`324`	`331`	`temp->end_handle = end_handle;`
`@@ -533,7 +540,10 @@ uint8_t BLEServiceImp::characteristicReadRspProc(bt_conn_t *conn,`
`533`	`540`	`{`
`534`	`541`	`if (false == discovering())`
`535`	`542`	`{`
`536`		`- if (false == discoverAttributes(&bleDevice, chrc_handle + 1, _end_handle))`
	`543`	`+ if (false == discoverAttributes(&bleDevice,`
	`544`	`+ chrc_handle + 1,`
	`545`	`+ _end_handle,`
	`546`	`+ true))`
`537`	`547`	`{`
`538`	`548`	`discoverNextCharacteristic(bleDevice);`
`539`	`549`	`}`