Jackson Lv / nRF51822

Nano RGB LED mesh

Dependencies:   nrf51-sdk

Dependents:   BLENano_Mesh

Fork of nRF51822 by Nordic Semiconductor

source/nRF5xGattClient.cpp@449:fd09f590751b, 2015-11-02 (annotated)

Committer:
rgrover1
Date:
Mon Nov 02 09:05:09 2015 +0000
Revision:
449:fd09f590751b
Parent:
445:8328a7d1eac2
Child:
453:38a41862ab4c
Synchronized with git rev eab6631c

Author: Jean-Philippe Brucker

Update S110 detection macros again



The mbed SDK actually prefixes all labels from targets.py with "TARGET_".

Update our detection macros accordingly.

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 449:fd09f590751b 25 #if !defined(TARGET_MCU_NRF51_16K_S110) && !defined(TARGET_MCU_NRF51_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