Jonathan Austin
Nordic stack and drivers for the mbed BLE API. Version to work around build bug.
Dependents: microbit_rubber_ducky microbit_mouse_BLE microbit_mouse_BLE_daybreak_version microbit_presenter
Fork of
nRF51822
by 
Nordic Semiconductor
source/nRF5xGattClient.cpp@561:613dbbdeed27, 2016-01-11 (annotated)
- Committer:
- vcoubard
- Date:
- Mon Jan 11 10:19:15 2016 +0000
- Revision:
- 561:613dbbdeed27
- Parent:
- 549:3f782c64d014
- Child:
- 563:9c4b96f7be8d
Synchronized with git rev 7bf81e7e
Author: Andres Amaya Garcia
Improve shutdown to clear BLE API and not just SD
Improve the shutdown functionality, such that a call to ble.shutdown() from
the user application clears the API and nRF5x state and NOT only the
SoftDevice. To achieve this the following changes are introduced:
* Add a protected member cleanup() to nRF5xGap, nRF5xGattClient,
nRF5xGattServer, nRF5xSecurityManager and nRF5xServiceDiscovery.
* Modify the shutdown() implementation in nRF5xn such that it also calls the
static member shutdown() exposed by the BLE API in Gap.h, SecurityManager.h,
GattClient.h and GattServer.h.
* Modify nRF5xGattClient, nRF5xGattServer and nRF5xSecurityManager
classes so that they dynamically create their respective objects only if
needed. Previously the GattClient, GattServer and SecurityManager objects were
declared as static, which means that they were always present even though they
were not always needed. This increases memory consumption unnecessarily.
Furthermore, pointers to the object instances are stored in static members of
the classes as specified by the BLE API base classes. This ensures that
calls to shutdown do not require calls to getInstance() functions that would
otherwise result in undesired memory allocations.
* nRF5xGap object is always needed, so this remains allocated statically. But
the reference in Gap is pointed to this object.
The shutdown procedure is as follows:
1. The user calls ble.shutdown() which executes the code in nRF5xn::shutdown()
1. The SoftDevice is shutdown
1. The static members of Gap.h, SecurityManager.h, GattClient.h and
GattServer.h are called to clean up their own state.
If at any point an error occur during the last step, BLE_ERROR_INVALID_STATE is
returned.
Who changed what in which revision?
| User | Revision | Line number | New contents of line |
|---|---|---|---|
| vcoubard | 542:1bf9c597f44f | 1 | /* mbed Microcontroller Library |
| vcoubard | 542:1bf9c597f44f | 2 | * Copyright (c) 2006-2013 ARM Limited |
| vcoubard | 542:1bf9c597f44f | 3 | * |
| vcoubard | 542:1bf9c597f44f | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| vcoubard | 542:1bf9c597f44f | 5 | * you may not use this file except in compliance with the License. |
| vcoubard | 542:1bf9c597f44f | 6 | * You may obtain a copy of the License at |
| vcoubard | 542:1bf9c597f44f | 7 | * |
| vcoubard | 542:1bf9c597f44f | 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| vcoubard | 542:1bf9c597f44f | 9 | * |
| vcoubard | 542:1bf9c597f44f | 10 | * Unless required by applicable law or agreed to in writing, software |
| vcoubard | 542:1bf9c597f44f | 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| vcoubard | 542:1bf9c597f44f | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| vcoubard | 542:1bf9c597f44f | 13 | * See the License for the specific language governing permissions and |
| vcoubard | 542:1bf9c597f44f | 14 | * limitations under the License. |
| vcoubard | 542:1bf9c597f44f | 15 | */ |
| vcoubard | 542:1bf9c597f44f | 16 | |
| vcoubard | 542:1bf9c597f44f | 17 | #include "nRF5xGattClient.h" |
| vcoubard | 542:1bf9c597f44f | 18 | |
| vcoubard | 542:1bf9c597f44f | 19 | nRF5xGattClient & |
| vcoubard | 542:1bf9c597f44f | 20 | nRF5xGattClient::getInstance(void) { |
| vcoubard | 561:613dbbdeed27 | 21 | if (gattClientInstance == NULL) { |
| vcoubard | 561:613dbbdeed27 | 22 | gattClientInstance = new nRF5xGattClient(); |
| vcoubard | 542:1bf9c597f44f | 23 | } |
| vcoubard | 561:613dbbdeed27 | 24 | return (nRF5xGattClient &) *gattClientInstance; |
| vcoubard | 542:1bf9c597f44f | 25 | } |
| vcoubard | 542:1bf9c597f44f | 26 | |
| vcoubard | 542:1bf9c597f44f | 27 | #if !defined(TARGET_MCU_NRF51_16K_S110) && !defined(TARGET_MCU_NRF51_32K_S110) |
| vcoubard | 542:1bf9c597f44f | 28 | ble_error_t |
| vcoubard | 542:1bf9c597f44f | 29 | nRF5xGattClient::launchServiceDiscovery(Gap::Handle_t connectionHandle, |
| vcoubard | 542:1bf9c597f44f | 30 | ServiceDiscovery::ServiceCallback_t sc, |
| vcoubard | 542:1bf9c597f44f | 31 | ServiceDiscovery::CharacteristicCallback_t cc, |
| vcoubard | 542:1bf9c597f44f | 32 | const UUID &matchingServiceUUIDIn, |
| vcoubard | 542:1bf9c597f44f | 33 | const UUID &matchingCharacteristicUUIDIn) |
| vcoubard | 542:1bf9c597f44f | 34 | { |
| vcoubard | 549:3f782c64d014 | 35 | return discovery.launch(connectionHandle, sc, cc, matchingServiceUUIDIn, matchingCharacteristicUUIDIn); |
| vcoubard | 542:1bf9c597f44f | 36 | } |
| rgrover1 | 430:db7edc9ad0bc | 37 | #endif |