fdsf
Fork of nRF51822 by
Diff: source/nRF5xGattClient.cpp
- Revision:
- 563:9c4b96f7be8d
- Parent:
- 561:613dbbdeed27
- Child:
- 565:cf03471a4ec4
diff -r 0d32ae12429e -r 9c4b96f7be8d source/nRF5xGattClient.cpp --- a/source/nRF5xGattClient.cpp Mon Jan 11 10:19:15 2016 +0000 +++ b/source/nRF5xGattClient.cpp Mon Jan 11 10:19:16 2016 +0000 @@ -18,10 +18,11 @@ nRF5xGattClient & nRF5xGattClient::getInstance(void) { - if (gattClientInstance == NULL) { - gattClientInstance = new nRF5xGattClient(); + static nRF5xGattClient* nRFGattClientSingleton = NULL; + if (nRFGattClientSingleton == NULL) { + nRFGattClientSingleton = new nRF5xGattClient(); } - return (nRF5xGattClient &) *gattClientInstance; + return *nRFGattClientSingleton; } #if !defined(TARGET_MCU_NRF51_16K_S110) && !defined(TARGET_MCU_NRF51_32K_S110) @@ -32,6 +33,27 @@ const UUID &matchingServiceUUIDIn, const UUID &matchingCharacteristicUUIDIn) { - return discovery.launch(connectionHandle, sc, cc, matchingServiceUUIDIn, matchingCharacteristicUUIDIn); + return _discovery.launch(connectionHandle, sc, cc, matchingServiceUUIDIn, matchingCharacteristicUUIDIn); } + +ble_error_t nRF5xGattClient::discoverCharacteristicDescriptors( + const DiscoveredCharacteristic& characteristic, + const CharacteristicDescriptorDiscovery::DiscoveryCallback_t& discoveryCallback, + const CharacteristicDescriptorDiscovery::TerminationCallback_t& terminationCallback) +{ + return _characteristicDescriptorDiscoverer.launch( + characteristic, + discoveryCallback, + terminationCallback + ); +} + +bool nRF5xGattClient::isCharacteristicDescriptorsDiscoveryActive(const DiscoveredCharacteristic& characteristic) const { + return _characteristicDescriptorDiscoverer.isActive(characteristic); +} + +void nRF5xGattClient::terminateCharacteristicDescriptorsDiscovery(const DiscoveredCharacteristic& characteristic) { + return _characteristicDescriptorDiscoverer.requestTerminate(characteristic); +} + #endif \ No newline at end of file