Diff: btle/btle_gattc.cpp

Revision:

197:de757ae3358b

Parent:

196:70f1b8354d57

Child:

198:a69d3d4797e8

diff -r 70f1b8354d57 -r de757ae3358b 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
@@ -54,7 +54,7 @@
     uint8_t                srvCount;                           /**< Number of services at the peers GATT database.*/
     // uint8_t                currCharInd;                       /**< Index of the current characteristic being discovered. This is intended for internal use during service discovery.*/
     uint8_t                currSrvInd;                        /**< Index of the current service being discovered. This is intended for internal use during service discovery.*/
-    bool                   discoveryInProgress;               /**< Variable to indicate if there is a service discovery in progress. */
+    bool                   serviceDiscoveryInProgress; /**< Variable to indicate if there is a service discovery in progress. */
 } ble_db_discovery_t;
 
 static ble_db_discovery_t  discoveryStatus;
@@ -62,7 +62,7 @@
 void launchServiceDiscovery(Gap::Handle_t connectionHandle)
 {
     // printf("connectionHandle %u\r\n", connectionHandle);
-    discoveryStatus.discoveryInProgress = true;
+    discoveryStatus.serviceDiscoveryInProgress = true;
     printf("launch service discovery returned %u\r\n", sd_ble_gattc_primary_services_discover(connectionHandle, SRV_DISC_START_HANDLE, NULL));
 }
 
@@ -87,13 +87,13 @@
                 }
 
                 case BLE_GATT_STATUS_ATTERR_ATTRIBUTE_NOT_FOUND: {
-                    discoveryStatus.discoveryInProgress = false;
+                    discoveryStatus.serviceDiscoveryInProgress = false;
                     printf("end of service discovery\r\n");
                     break;
                 }
 
                 default: {
-                    discoveryStatus.discoveryInProgress = false;
+                    discoveryStatus.serviceDiscoveryInProgress = false;
                     printf("gatt failure status: %u\r\n", p_ble_evt->evt.gattc_evt.gatt_status);
                     break;
                 }
@@ -110,7 +110,7 @@
         }
     }
 
-    if (!discoveryStatus.discoveryInProgress) {
+    if (!discoveryStatus.serviceDiscoveryInProgress) {
         return;
     }