Attempting to publish a tree

Dependencies:   nrf51-sdk

Dependents:   microbit-dal

Fork of nRF51822 by Lancaster University

Committer:
LancasterUniversity
Date:
Wed Apr 06 22:38:43 2016 +0100
Revision:
615:65ea2acfc6a2
Parent:
592:f9574772b816
Child:
616:a8f9b022d8fd
Synchronized with git rev 60a7c0c0
Author: Rohit Grover
bring in the latest changes for BLE::init() where we allow <object, member> tuples for init callback.

Who changed what in which revision?

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