Revision 333:098598ba075d, committed 2015-04-15

Comitter:

rgrover1

Date:

Wed Apr 15 09:05:10 2015 +0100

Parent:

332:1dc2f80b4710

Child:

334:6bc1223306b9

Commit message:

Synchronized with git rev 721fc94b
Author: Rohit Grover
getting rid of deprecated APIs: setAdvertisingData() and startAdvertising()

Changed in this revision

--- a/public/BLEDevice.h	Wed Apr 15 09:05:10 2015 +0100
+++ b/public/BLEDevice.h	Wed Apr 15 09:05:10 2015 +0100
@@ -406,15 +406,6 @@
      * eventually result in a call to the target's setAdvertisingData() before
      * the server begins advertising. This flag marks the status of the pending update.*/
     bool                 needToSetAdvPayload;
-
-    /**
-     * 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);
 };
 
 /* BLEDevice methods. Most of these simply forward the calls to the underlying
@@ -729,30 +720,4 @@
     transport->getPermittedTxPowerValues(valueArrayPP, countP);
 }
 
-/*
- * ALL OF THE FOLLOWING METHODS ARE DEPRECATED
- */
-
-inline ble_error_t
-BLEDevice::setAdvertisingData(const GapAdvertisingData &ADStructures, const GapAdvertisingData &scanResponse)
-{
-    needToSetAdvPayload = false;
-    return transport->getGap().setAdvertisingData(ADStructures, scanResponse);
-}
-
-inline ble_error_t
-BLEDevice::setAdvertisingData(const GapAdvertisingData &ADStructures)
-{
-    GapAdvertisingData scanResponse;
-
-    needToSetAdvPayload = false;
-    return transport->getGap().setAdvertisingData(ADStructures, scanResponse);
-}
-
-inline ble_error_t
-BLEDevice::startAdvertising(const GapAdvertisingParams &_advParams)
-{
-    return transport->getGap().startAdvertising(_advParams);
-}
-
 #endif // ifndef __BLE_DEVICE__
\ No newline at end of file