Rob Kluin / nRF51822

config changes

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 581:1dd90ec7527b, committed 2016-01-11

Comitter:
vcoubard
Date:
Mon Jan 11 10:19:27 2016 +0000
Parent:
580:00846a4bbc8c
Child:
582:37fd3190598e
Commit message:
Synchronized with git rev 5a6f8cde
Author: Rohit Grover
replace a few instances of Gap::AddressType_t with BLEProtocol::AddressType_t

Changed in this revision

source/nRF5xGap.cpp Show annotated file Show diff for this revision Revisions of this file
source/nRF5xGap.h Show annotated file Show diff for this revision Revisions of this file 
--- a/source/nRF5xGap.cpp	Mon Jan 11 10:19:26 2016 +0000
+++ b/source/nRF5xGap.cpp	Mon Jan 11 10:19:27 2016 +0000
@@ -211,10 +211,10 @@
     return BLE_ERROR_NONE;
 }
 
-ble_error_t nRF5xGap::connect(const Address_t           peerAddr,
-                              Gap::AddressType_t        peerAddrType,
-                              const ConnectionParams_t *connectionParams,
-                              const GapScanningParams  *scanParamsIn)
+ble_error_t nRF5xGap::connect(const Address_t             peerAddr,
+                              BLEProtocol::AddressType_t  peerAddrType,
+                              const ConnectionParams_t   *connectionParams,
+                              const GapScanningParams    *scanParamsIn)
 {
     ble_gap_addr_t addr;
     addr.addr_type = peerAddrType;

--- a/source/nRF5xGap.h	Mon Jan 11 10:19:26 2016 +0000
+++ b/source/nRF5xGap.h	Mon Jan 11 10:19:27 2016 +0000
@@ -59,7 +59,7 @@
 
     virtual ble_error_t startAdvertising(const GapAdvertisingParams &);
     virtual ble_error_t stopAdvertising(void);
-    virtual ble_error_t connect(const Address_t, Gap::AddressType_t peerAddrType, const ConnectionParams_t *connectionParams, const GapScanningParams *scanParams);
+    virtual ble_error_t connect(const Address_t, BLEProtocol::AddressType_t peerAddrType, const ConnectionParams_t *connectionParams, const GapScanningParams *scanParams);
     virtual ble_error_t disconnect(Handle_t connectionHandle, DisconnectionReason_t reason);
     virtual ble_error_t disconnect(DisconnectionReason_t reason);