Amit Gandhi / nRF51822_KJL

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

Files at this revision

API Documentation at this revision

Revision 625:19a7a530044b, committed 2016-04-08

Comitter:
vcoubard
Date:
Fri Apr 08 11:05:59 2016 +0100
Parent:
624:7b179235b1f3
Child:
626:d78e56dca882
Commit message:
Synchronized with git rev 7583927f
Author: Vincent Coubard
Merge pull request #109 from fermiumlabs/develop

Fix for compilation errors with S110 softdevice in btle.cpp

Changed in this revision

source/btle/btle.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/source/btle/btle.cpp	Fri Apr 08 11:05:58 2016 +0100
+++ b/source/btle/btle.cpp	Fri Apr 08 11:05:59 2016 +0100
@@ -189,10 +189,12 @@
                     break;
             }
 
+#if !defined(TARGET_MCU_NRF51_16K_S110) && !defined(TARGET_MCU_NRF51_32K_S110)
             // Close all pending discoveries for this connection
             nRF5xGattClient& gattClient = ble.getGattClient();
             gattClient.characteristicDescriptorDiscoverer().terminate(handle, BLE_ERROR_INVALID_STATE);
             gattClient.discovery().terminate(handle);
+#endif
 
             gap.processDisconnectionEvent(handle, reason);
             break;