Wang Xinglu / BLE_API

High level Bluetooth Low Energy API and radio abstraction layer

Dependencies:   nRF51822

Dependents:   LinkNode_LIS3DH

Fork of BLE_API by Bluetooth Low Energy

Files at this revision

API Documentation at this revision

Revision 48:ec0c28e62abf, committed 2014-05-23

Comitter:
Rohit Grover
Date:
Fri May 23 17:28:44 2014 +0100
Parent:
47:33f605e109a2
Child:
49:03a51f0006f8
Commit message:
mark BLEDevice::setAdvertisingData() as deprecated

Changed in this revision

hw/BLEDevice.h Show annotated file Show diff for this revision Revisions of this file 
--- a/hw/BLEDevice.h	Fri May 23 17:05:53 2014 +0100
+++ b/hw/BLEDevice.h	Fri May 23 17:28:44 2014 +0100
@@ -52,10 +52,6 @@
      */
     ble_error_t setAddress(Gap::addr_type_t type, const uint8_t address[6]);
 
-    ble_error_t setAdvertisingData(const GapAdvertisingData &ADStructures,
-                                   const GapAdvertisingData &scanResponse);
-    ble_error_t setAdvertisingData(const GapAdvertisingData &ADStructures);
-
     /**
      * @param[in] advType
      *              The GAP advertising mode to use for this device. Valid
@@ -139,6 +135,10 @@
      * DEPRECATED
      */
 public:
+    ble_error_t setAdvertisingData(const GapAdvertisingData &ADStructures,
+                                   const GapAdvertisingData &scanResponse);
+    ble_error_t setAdvertisingData(const GapAdvertisingData &ADStructures);
+
     ble_error_t startAdvertising(const GapAdvertisingParams &advParams);
 };
 
@@ -174,18 +174,6 @@
     return transport->getGap().setAddress(type, address);
 }
 
-inline ble_error_t
-BLEDevice::setAdvertisingData(const GapAdvertisingData &ADStructures,
-                              const GapAdvertisingData &scanResponse) {
-    return transport->getGap().setAdvertisingData(ADStructures, scanResponse);
-}
-
-inline ble_error_t
-BLEDevice::setAdvertisingData(const GapAdvertisingData &ADStructures) {
-    GapAdvertisingData scanResponse;
-    return transport->getGap().setAdvertisingData(ADStructures, scanResponse);
-}
-
 inline void
 BLEDevice::setAdvertisingType(GapAdvertisingParams::AdvertisingType advType) {
     advParams.setAdvertisingType(advType);
@@ -221,7 +209,22 @@
     return transport->getGap().disconnect();
 }
 
-/* DEPRECATED */
+/*
+ * ALL OF THE FOLLOWING METHODS ARE DEPRECATED
+ */
+
+inline ble_error_t
+BLEDevice::setAdvertisingData(const GapAdvertisingData &ADStructures,
+                              const GapAdvertisingData &scanResponse) {
+    return transport->getGap().setAdvertisingData(ADStructures, scanResponse);
+}
+
+inline ble_error_t
+BLEDevice::setAdvertisingData(const GapAdvertisingData &ADStructures) {
+    GapAdvertisingData scanResponse;
+    return transport->getGap().setAdvertisingData(ADStructures, scanResponse);
+}
+
 inline ble_error_t
 BLEDevice::startAdvertising(const GapAdvertisingParams &_advParams) {
     return transport->getGap().startAdvertising(_advParams);