Diff: btle/btle_gattc.cpp

Revision:

219:681be3608738

Parent:

218:6812c045735a

Child:

220:ee888228a03e

diff -r 6812c045735a -r 681be3608738 btle/btle_gattc.cpp
--- a/btle/btle_gattc.cpp	Fri Jun 19 15:55:18 2015 +0100
+++ b/btle/btle_gattc.cpp	Fri Jun 19 15:55:18 2015 +0100
@@ -175,32 +175,15 @@
 
                     unsigned charIndex = 0;
                     for (; charIndex < discoveryStatus.charCount; charIndex++) {
-                        printf("%x [%u]\r\n", p_ble_evt->evt.gattc_evt.params.char_disc_rsp.chars[charIndex].uuid.uuid,
-                               p_ble_evt->evt.gattc_evt.params.char_disc_rsp.chars[charIndex].handle_value);
-
                         discoveryStatus.characteristics[charIndex].
                             setup(p_ble_evt->evt.gattc_evt.params.char_disc_rsp.chars[charIndex].uuid.uuid,
                                   p_ble_evt->evt.gattc_evt.params.char_disc_rsp.chars[charIndex].char_props,
                                   p_ble_evt->evt.gattc_evt.params.char_disc_rsp.chars[charIndex].handle_decl,
                                   p_ble_evt->evt.gattc_evt.params.char_disc_rsp.chars[charIndex].handle_value);
                     }
-
-                    Gap::Handle_t startHandle = p_ble_evt->evt.gattc_evt.params.char_disc_rsp.chars[charIndex - 1].handle_value + 1;
-                    Gap::Handle_t endHandle   = discoveryStatus.services[discoveryStatus.currSrvInd].endHandle;
-
-                    if (startHandle < endHandle) {
-                        ble_gattc_handle_range_t handleRange = {
-                            .start_handle = startHandle,
-                            .end_handle   = endHandle
-                        };
-                        printf("restarting char discovery from %u to %u\r\n", handleRange.start_handle, handleRange.end_handle);
-                        printf("char discovery returned %u\r\n", sd_ble_gattc_characteristics_discover(p_ble_evt->evt.gattc_evt.conn_handle, &handleRange));
-                        break;
-                    }
+                    break;
                 }
 
-                /* NOTE: fallthrough */
-
                 case BLE_GATT_STATUS_ATTERR_ATTRIBUTE_NOT_FOUND: {
                     discoveryStatus.terminateCharacteristicDiscovery();
                     break;
@@ -214,6 +197,29 @@
         }
     }
 
+    while (discoveryStatus.characteristicDiscoveryInProgress && (discoveryStatus.currCharInd < discoveryStatus.charCount)) {
+        printf("%x [%u]\r\n",
+            discoveryStatus.characteristics[discoveryStatus.currCharInd].uuid,
+            discoveryStatus.characteristics[discoveryStatus.currCharInd].valueHandle);
+        discoveryStatus.currCharInd++;
+    }
+
+    if (discoveryStatus.characteristicDiscoveryInProgress) {
+        Gap::Handle_t startHandle = discoveryStatus.characteristics[discoveryStatus.currCharInd - 1].valueHandle + 1;
+        Gap::Handle_t endHandle   = discoveryStatus.services[discoveryStatus.currSrvInd].endHandle;
+
+        if (startHandle < endHandle) {
+            ble_gattc_handle_range_t handleRange = {
+                .start_handle = startHandle,
+                .end_handle   = endHandle
+            };
+            printf("restarting char discovery from %u to %u\r\n", handleRange.start_handle, handleRange.end_handle);
+            printf("char discovery returned %u\r\n", sd_ble_gattc_characteristics_discover(discoveryStatus.connHandle, &handleRange));
+        } else {
+           discoveryStatus.terminateCharacteristicDiscovery();
+        }
+    }
+
     while (discoveryStatus.serviceDiscoveryInProgress && (discoveryStatus.currSrvInd < discoveryStatus.srvCount)) {
         printf("%x [%u %u]\r\n",
             discoveryStatus.services[discoveryStatus.currSrvInd].uuid,