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 446:4fdb01767cff, committed 2015-06-19

Comitter:
rgrover1
Date:
Fri Jun 19 15:51:56 2015 +0100
Parent:
445:c1e8af80a9cd
Child:
447:2f33a6556a3b
Commit message:
Synchronized with git rev 6da31dce
Author: Rohit Grover
consolidated the connect APIs into a single API. Takes pointers instead of references.

Changed in this revision

public/BLEDevice.h Show annotated file Show diff for this revision Revisions of this file
public/Gap.h Show annotated file Show diff for this revision Revisions of this file 
--- a/public/BLEDevice.h	Fri Jun 19 15:51:56 2015 +0100
+++ b/public/BLEDevice.h	Fri Jun 19 15:51:56 2015 +0100
@@ -319,8 +319,16 @@
      */
     ble_error_t stopScan(void);
 
-    ble_error_t connect(const Gap::Address_t peerAddr, Gap::AddressType_t peerAddrType = Gap::ADDR_TYPE_RANDOM_STATIC);
-    ble_error_t connect(const Gap::Address_t peerAddr, Gap::AddressType_t peerAddrType, const GapScanningParams &scanParams);
+    /**
+     * [connect description]
+     * @param  peerAddr     [description]
+     * @param  peerAddrType [description]
+     * @return              [description]
+     */
+    ble_error_t connect(const Gap::Address_t           peerAddr,
+                        Gap::AddressType_t             peerAddrType     = Gap::ADDR_TYPE_RANDOM_STATIC,
+                        const Gap::ConnectionParams_t *connectionParams = NULL,
+                        const GapScanningParams       *scanParams       = NULL);
 
     /**
      * This call initiates the disconnection procedure, and its completion will
@@ -861,26 +869,11 @@
 }
 
 inline ble_error_t
-BLEDevice::connect(const Gap::Address_t peerAddr, Gap::AddressType_t peerAddrType) {
-    Gap::ConnectionParams_t connectionParams = {
-        .minConnectionInterval = 30,
-        .maxConnectionInterval = 100,
-        .slaveLatency = 0,
-        .connectionSupervisionTimeout = 400
-    };
-
-    return transport->getGap().connect(peerAddr, peerAddrType, scanningParams, connectionParams);
-}
-inline ble_error_t
-BLEDevice::connect(const Gap::Address_t peerAddr, Gap::AddressType_t peerAddrType, const GapScanningParams &scanParams) {
-    Gap::ConnectionParams_t connectionParams = {
-        .minConnectionInterval = 30,
-        .maxConnectionInterval = 100,
-        .slaveLatency = 0,
-        .connectionSupervisionTimeout = 400
-    };
-
-    return transport->getGap().connect(peerAddr, peerAddrType, scanParams, connectionParams);
+BLEDevice::connect(const Gap::Address_t           peerAddr,
+                   Gap::AddressType_t             peerAddrType,
+                   const Gap::ConnectionParams_t *connectionParams,
+                   const GapScanningParams       *scanParams) {
+    return transport->getGap().connect(peerAddr, peerAddrType, connectionParams, scanParams);
 }
 
 inline ble_error_t

--- a/public/Gap.h	Fri Jun 19 15:51:56 2015 +0100
+++ b/public/Gap.h	Fri Jun 19 15:51:56 2015 +0100
@@ -177,7 +177,10 @@
     virtual uint16_t    getMinAdvertisingInterval(void) const                                      = 0;
     virtual uint16_t    getMinNonConnectableAdvertisingInterval(void) const                        = 0;
     virtual uint16_t    getMaxAdvertisingInterval(void) const                                      = 0;
-    virtual ble_error_t connect(const Address_t peerAddr, Gap::AddressType_t peerAddrType, const GapScanningParams &scanParams, const ConnectionParams_t& connectionParams) = 0;
+    virtual ble_error_t connect(const Address_t           peerAddr,
+                                Gap::AddressType_t        peerAddrType,
+                                const ConnectionParams_t *connectionParams,
+                                const GapScanningParams  *scanParams) = 0;
     virtual ble_error_t disconnect(DisconnectionReason_t reason)                                   = 0;
     virtual ble_error_t getPreferredConnectionParams(ConnectionParams_t *params)                   = 0;
     virtual ble_error_t setPreferredConnectionParams(const ConnectionParams_t *params)             = 0;