shunpei kataoka / nRF51822

Fork of nRF51822 by Shuta Nakamae

Files at this revision

API Documentation at this revision

Comitter:
vcoubard
Date:
Mon Jan 11 10:19:05 2016 +0000
Parent:
546:1e147322b2b5
Child:
548:920e941cbe1e
Commit message:
Synchronized with git rev c778aa8a
Author: Vincent Coubard
Rename characteristic descriptors discovery activity and termination function

Changed in this revision

source/nRF5xGattClient.cpp Show annotated file Show diff for this revision Revisions of this file
source/nRF5xGattClient.h Show annotated file Show diff for this revision Revisions of this file
--- a/source/nRF5xGattClient.cpp	Mon Jan 11 10:19:05 2016 +0000
+++ b/source/nRF5xGattClient.cpp	Mon Jan 11 10:19:05 2016 +0000
@@ -48,11 +48,11 @@
     );
 }
 
-bool nRF5xGattClient::isCharacteristicDiscoveryActive(const DiscoveredCharacteristic& characteristic) const {
+bool nRF5xGattClient::isCharacteristicDescriptorsDiscoveryActive(const DiscoveredCharacteristic& characteristic) const {
     return characteristicDescriptorDiscoverer.isActive(characteristic);   
 }
 
-void nRF5xGattClient::terminateCharacteristicDiscovery(const DiscoveredCharacteristic& characteristic) { 
+void nRF5xGattClient::terminateCharacteristicDescriptorsDiscovery(const DiscoveredCharacteristic& characteristic) { 
     return characteristicDescriptorDiscoverer.requestTerminate(characteristic);
 }
 
--- a/source/nRF5xGattClient.h	Mon Jan 11 10:19:05 2016 +0000
+++ b/source/nRF5xGattClient.h	Mon Jan 11 10:19:05 2016 +0000
@@ -120,13 +120,13 @@
      * @brief Implementation of GattClient::isCharacteristicDiscoveryActive 
      * @see GattClient::isCharacteristicDiscoveryActive 
      */
-    virtual bool isCharacteristicDiscoveryActive(const DiscoveredCharacteristic& characteristic) const;
+    virtual bool isCharacteristicDescriptorsDiscoveryActive(const DiscoveredCharacteristic& characteristic) const;
 
     /**
      * @brief Implementation of GattClient::terminateCharacteristicDiscovery 
      * @see GattClient::terminateCharacteristicDiscovery 
      */
-    virtual void terminateCharacteristicDiscovery(const DiscoveredCharacteristic& characteristic);
+    virtual void terminateCharacteristicDescriptorsDiscovery(const DiscoveredCharacteristic& characteristic);
 
     virtual ble_error_t read(Gap::Handle_t connHandle, GattAttribute::Handle_t attributeHandle, uint16_t offset) const {
         uint32_t rc = sd_ble_gattc_read(connHandle, attributeHandle, offset);