Goran Mahovlic / nRF51822_BLE_MIDI

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependents:   BLE_MIDI

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 179:10e4c13360d9, committed 2015-06-08

Comitter:
rgrover1
Date:
Mon Jun 08 10:43:29 2015 +0100
Parent:
178:3b34428e80ea
Child:
180:5082f66bb16e
Commit message:
Synchronized with git rev a440201b
Author: Rohit Grover
replace Gap::addr_type_t with Gap::AddressType_t

Changed in this revision

btle/btle.cpp Show annotated file Show diff for this revision Revisions of this file
nRF51Gap.cpp Show annotated file Show diff for this revision Revisions of this file
nRF51Gap.h Show annotated file Show diff for this revision Revisions of this file 
--- a/btle/btle.cpp	Mon May 18 09:53:05 2015 +0100
+++ b/btle/btle.cpp	Mon Jun 08 10:43:29 2015 +0100
@@ -113,8 +113,8 @@
             const ble_gap_addr_t *peer = &p_ble_evt->evt.gap_evt.params.connected.peer_addr;
             const ble_gap_addr_t *own  = &p_ble_evt->evt.gap_evt.params.connected.own_addr;
             nRF51Gap::getInstance().processConnectionEvent(handle,
-                                                           static_cast<Gap::addr_type_t>(peer->addr_type), peer->addr,
-                                                           static_cast<Gap::addr_type_t>(own->addr_type),  own->addr,
+                                                           static_cast<Gap::AddressType_t>(peer->addr_type), peer->addr,
+                                                           static_cast<Gap::AddressType_t>(own->addr_type),  own->addr,
                                                            params);
             break;
         }

--- a/nRF51Gap.cpp	Mon May 18 09:53:05 2015 +0100
+++ b/nRF51Gap.cpp	Mon Jun 08 10:43:29 2015 +0100
@@ -304,7 +304,7 @@
     @endcode
 */
 /**************************************************************************/
-ble_error_t nRF51Gap::setAddress(addr_type_t type, const address_t address)
+ble_error_t nRF51Gap::setAddress(AddressType_t type, const address_t address)
 {
     if (type > ADDR_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE) {
         return BLE_ERROR_PARAM_OUT_OF_RANGE;
@@ -319,7 +319,7 @@
     return BLE_ERROR_NONE;
 }
 
-ble_error_t nRF51Gap::getAddress(addr_type_t *typeP, address_t address)
+ble_error_t nRF51Gap::getAddress(AddressType_t *typeP, address_t address)
 {
     ble_gap_addr_t dev_addr;
     if (sd_ble_gap_address_get(&dev_addr) != NRF_SUCCESS) {
@@ -327,7 +327,7 @@
     }
 
     if (typeP != NULL) {
-        *typeP = static_cast<addr_type_t>(dev_addr.addr_type);
+        *typeP = static_cast<AddressType_t>(dev_addr.addr_type);
     }
     if (address != NULL) {
         memcpy(address, dev_addr.addr, ADDR_LEN);

--- a/nRF51Gap.h	Mon May 18 09:53:05 2015 +0100
+++ b/nRF51Gap.h	Mon Jun 08 10:43:29 2015 +0100
@@ -44,8 +44,8 @@
     }
 
     /* Functions that must be implemented from Gap */
-    virtual ble_error_t setAddress(addr_type_t  type,  const address_t address);
-    virtual ble_error_t getAddress(addr_type_t *typeP, address_t address);
+    virtual ble_error_t setAddress(AddressType_t  type,  const address_t address);
+    virtual ble_error_t getAddress(AddressType_t *typeP, address_t address);
     virtual ble_error_t setAdvertisingData(const GapAdvertisingData &, const GapAdvertisingData &);
 
     virtual uint16_t    getMinAdvertisingInterval(void) const {return ADVERTISEMENT_DURATION_UNITS_TO_MS(BLE_GAP_ADV_INTERVAL_MIN);}