Shuta Nakamae / nRF51822

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of nRF51822 by Nordic Semiconductor

Diff: btle/btle_gattc.cpp

Revision:
199:c2c831c55f3d
Parent:
198:a69d3d4797e8
Child:
200:be560f1834c0
diff -r a69d3d4797e8 -r c2c831c55f3d btle/btle_gattc.cpp
--- a/btle/btle_gattc.cpp	Fri Jun 19 15:55:16 2015 +0100
+++ b/btle/btle_gattc.cpp	Fri Jun 19 15:55:16 2015 +0100
@@ -109,11 +109,7 @@
         }
     }
 
-    if (!discoveryStatus.serviceDiscoveryInProgress) {
-        return;
-    }
-
-    while (discoveryStatus.currSrvInd < discoveryStatus.srvCount) {
+    while (discoveryStatus.serviceDiscoveryInProgress && (discoveryStatus.currSrvInd < discoveryStatus.srvCount)) {
         printf("%x [%u %u]\r\n",
             p_ble_evt->evt.gattc_evt.params.prim_srvc_disc_rsp.services[discoveryStatus.currSrvInd].uuid.uuid,
             p_ble_evt->evt.gattc_evt.params.prim_srvc_disc_rsp.services[discoveryStatus.currSrvInd].handle_range.start_handle,
@@ -128,7 +124,7 @@
 
         discoveryStatus.currSrvInd++;
     }
-    if (discoveryStatus.srvCount > 0) {
+    if (discoveryStatus.serviceDiscoveryInProgress && (discoveryStatus.srvCount > 0)) {
         printf("services discover returned %u\r\n",
             sd_ble_gattc_primary_services_discover(p_ble_evt->evt.gattc_evt.conn_handle,
                                                    p_ble_evt->evt.gattc_evt.params.prim_srvc_disc_rsp.services[discoveryStatus.currSrvInd -1].handle_range.end_handle,