Revision 618:6eb60aaf0724, committed 2016-04-08

Comitter:

vcoubard

Date:

Fri Apr 08 11:05:50 2016 +0100

Parent:

617:a7c074f5f875

Child:

619:0ca9d4d12d1f

Commit message:

Synchronized with git rev 1ec9f30f
Author: Vincent Coubard
version v2.5.1

Changed in this revision

--- a/module.json	Fri Apr 08 11:05:49 2016 +0100
+++ b/module.json	Fri Apr 08 11:05:50 2016 +0100
@@ -1,36 +1,36 @@
-{
-  "name": "ble-nrf51822",
-  "version": "2.5.0",
-  "description": "Nordic stack and drivers for the mbed BLE API.",
-  "keywords": [
-    "Bluetooth",
-    "BLE",
-    "mbed",
-    "mbed-official"
-  ],
-  "author": "Rohit Grover",
-  "repository": {
-    "url": "git@github.com:ARMmbed/ble-nRF51822.git",
-    "type": "git"
-  },
-  "homepage": "https://developer.mbed.org/teams/Nordic-Semiconductor/",
-  "licenses": [
-    {
-      "url": "https://spdx.org/licenses/Apache-2.0",
-      "type": "Apache-2.0"
-    },
-    {
-      "type": "LicenseRef-softdevice_nrf51822_licence_agreement.txt"
-    }
-  ],
-  "dependencies": {
-    "ble": "^2.3.0",
-    "nrf51-sdk": "^2.1.0"
-  },
-  "extraIncludes": [
-    "source/btle",
-    "source/btle/custom",
-    "source/common"
-  ],
-  "targetDependencies": {}
+{
+  "name": "ble-nrf51822",
+  "version": "2.5.1",
+  "description": "Nordic stack and drivers for the mbed BLE API.",
+  "keywords": [
+    "Bluetooth",
+    "BLE",
+    "mbed",
+    "mbed-official"
+  ],
+  "author": "Rohit Grover",
+  "repository": {
+    "url": "git@github.com:ARMmbed/ble-nRF51822.git",
+    "type": "git"
+  },
+  "homepage": "https://developer.mbed.org/teams/Nordic-Semiconductor/",
+  "licenses": [
+    {
+      "url": "https://spdx.org/licenses/Apache-2.0",
+      "type": "Apache-2.0"
+    },
+    {
+      "type": "LicenseRef-softdevice_nrf51822_licence_agreement.txt"
+    }
+  ],
+  "dependencies": {
+    "ble": "^2.3.0",
+    "nrf51-sdk": "^2.1.0"
+  },
+  "extraIncludes": [
+    "source/btle",
+    "source/btle/custom",
+    "source/common"
+  ],
+  "targetDependencies": {}
 }
\ No newline at end of file

--- a/source/btle/btle.cpp	Fri Apr 08 11:05:49 2016 +0100
+++ b/source/btle/btle.cpp	Fri Apr 08 11:05:50 2016 +0100
@@ -191,11 +191,8 @@
 
             // Close all pending discoveries for this connection
             nRF5xGattClient& gattClient = ble.getGattClient();
-#if  defined(TARGET_MCU_NRF51_16K_S110) || defined(TARGET_MCU_NRF51_32K_S110)
-#else
             gattClient.characteristicDescriptorDiscoverer().terminate(handle, BLE_ERROR_INVALID_STATE);
             gattClient.discovery().terminate(handle);
-#endif
 
             gap.processDisconnectionEvent(handle, reason);
             break;