No changes

Fork of nRF51822 by Nordic Semiconductor

Committer:
rgrover1
Date:
Fri Sep 25 15:26:40 2015 +0100
Revision:
430:db7edc9ad0bc
Parent:
429:bff56e081b6e
Child:
434:95f196557042
Synchronized with git rev c9a77b82
Author: Rohit Grover
Release 0.4.6
=============

Enhancements
~~~~~~~~~~~~

* Add connection handle to GATT callback parameters. This paves the way for
applications requiring multiple concurrent connections: read/write/HVX
callbacks will be able to distinguish between peripherals by comparing per-
device connection handles.

* nRFGattClient: move the allocation of the singleton to within the
getInstance() method. This saves memory when nRFGattClient isn't
instantiated.

* Disable GattClient features when using S110 SoftDevice. This is controlled
by the pre-processor macros: MCU_NORDIC_16K_S110 or MCU_NORDIC_16K_S110.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
rgrover1 388:db85a09c27ef 1 /* mbed Microcontroller Library
rgrover1 388:db85a09c27ef 2 * Copyright (c) 2006-2013 ARM Limited
rgrover1 388:db85a09c27ef 3 *
rgrover1 388:db85a09c27ef 4 * Licensed under the Apache License, Version 2.0 (the "License");
rgrover1 388:db85a09c27ef 5 * you may not use this file except in compliance with the License.
rgrover1 388:db85a09c27ef 6 * You may obtain a copy of the License at
rgrover1 388:db85a09c27ef 7 *
rgrover1 388:db85a09c27ef 8 * http://www.apache.org/licenses/LICENSE-2.0
rgrover1 388:db85a09c27ef 9 *
rgrover1 388:db85a09c27ef 10 * Unless required by applicable law or agreed to in writing, software
rgrover1 388:db85a09c27ef 11 * distributed under the License is distributed on an "AS IS" BASIS,
rgrover1 388:db85a09c27ef 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
rgrover1 388:db85a09c27ef 13 * See the License for the specific language governing permissions and
rgrover1 388:db85a09c27ef 14 * limitations under the License.
rgrover1 388:db85a09c27ef 15 */
rgrover1 388:db85a09c27ef 16
rgrover1 388:db85a09c27ef 17 #include "nRF5xGattClient.h"
rgrover1 388:db85a09c27ef 18
rgrover1 388:db85a09c27ef 19 nRF5xGattClient &
rgrover1 388:db85a09c27ef 20 nRF5xGattClient::getInstance(void) {
rgrover1 430:db7edc9ad0bc 21 static nRF5xGattClient nRFGattClientSingleton;
rgrover1 388:db85a09c27ef 22 return nRFGattClientSingleton;
rgrover1 388:db85a09c27ef 23 }
rgrover1 388:db85a09c27ef 24
rgrover1 430:db7edc9ad0bc 25 #if !defined(MCU_NORDIC_16K_S110) && !defined(MCU_NORDIC_32K_S110)
rgrover1 388:db85a09c27ef 26 ble_error_t
rgrover1 388:db85a09c27ef 27 nRF5xGattClient::launchServiceDiscovery(Gap::Handle_t connectionHandle,
rgrover1 388:db85a09c27ef 28 ServiceDiscovery::ServiceCallback_t sc,
rgrover1 388:db85a09c27ef 29 ServiceDiscovery::CharacteristicCallback_t cc,
rgrover1 388:db85a09c27ef 30 const UUID &matchingServiceUUIDIn,
rgrover1 388:db85a09c27ef 31 const UUID &matchingCharacteristicUUIDIn)
rgrover1 388:db85a09c27ef 32 {
rgrover1 388:db85a09c27ef 33 return discovery.launch(connectionHandle, sc, cc, matchingServiceUUIDIn, matchingCharacteristicUUIDIn);
rgrover1 430:db7edc9ad0bc 34 }
rgrover1 430:db7edc9ad0bc 35 #endif