Diff: btle/btle_discovery.cpp

Revision:

255:d228656b0cd1

Parent:

254:c14e1d09f197

Child:

257:6e0ae0f1697b

diff -r c14e1d09f197 -r d228656b0cd1 btle/btle_discovery.cpp
--- a/btle/btle_discovery.cpp	Fri Jun 19 15:55:23 2015 +0100
+++ b/btle/btle_discovery.cpp	Fri Jun 19 15:55:23 2015 +0100
@@ -124,8 +124,9 @@
 NordicServiceDiscovery::progressCharacteristicDiscovery(void)
 {
     while (cDiscoveryActive && (characteristicIndex < numCharacteristics)) {
-        /* THIS IS WHERE THE CALLBACK WILL GO */
-        printf("%x [%u]\r\n", characteristics[characteristicIndex].uuid, characteristics[characteristicIndex].valueHandle);
+        if (characteristicCallback) {
+            characteristicCallback(characteristics[characteristicIndex]);
+        }
 
         characteristicIndex++;
     }
@@ -155,7 +156,7 @@
             serviceCallback(services[serviceIndex]);
         }
 
-        if (true) { /* characteristic discovery is optional. */
+        if (characteristicCallback) { /* characteristic discovery is optional. */
             launchCharacteristicDiscovery(connHandle, services[serviceIndex].startHandle, services[serviceIndex].endHandle);
         } else {
             serviceIndex++; /* Progress service index to keep discovery alive. */