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 267:b310cade274e, committed 2015-06-19

Comitter:
rgrover1
Date:
Fri Jun 19 15:55:24 2015 +0100
Parent:
266:372234aa31e9
Child:
268:3a0047106213
Commit message:
Synchronized with git rev 1671d2f1
Author: Rohit Grover
add support for Connection Parameters to connect()

Changed in this revision

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/nRF51Gap.cpp	Fri Jun 19 15:55:24 2015 +0100
+++ b/nRF51Gap.cpp	Fri Jun 19 15:55:24 2015 +0100
@@ -206,7 +206,10 @@
     return BLE_ERROR_NONE;
 }
 
-ble_error_t nRF51Gap::connect(const Address_t peerAddr, Gap::AddressType_t peerAddrType, const GapScanningParams &scanParamsIn)
+ble_error_t nRF51Gap::connect(const Address_t            peerAddr,
+                              Gap::AddressType_t         peerAddrType,
+                              const GapScanningParams&   scanParamsIn,
+                              const ConnectionParams_t&  connectionParams)
 {
     ble_gap_addr_t addr;
     addr.addr_type = peerAddrType;
@@ -220,11 +223,12 @@
         .window      = scanParamsIn.getWindow(),   /**< Scan window between 0x0004 and 0x4000 in 0.625ms units (2.5ms to 10.24s). */
         .timeout     = scanParamsIn.getTimeout(),  /**< Scan timeout between 0x0001 and 0xFFFF in seconds, 0x0000 disables timeout. */
     };
+
     ble_gap_conn_params_t connParams = {
-        .min_conn_interval = 30,
-        .max_conn_interval = 100,
-        .slave_latency     = 0,
-        .conn_sup_timeout  = 400,
+        .min_conn_interval = connectionParams.minConnectionInterval,
+        .max_conn_interval = connectionParams.maxConnectionInterval,
+        .slave_latency     = connectionParams.slaveLatency,
+        .conn_sup_timeout  = connectionParams.connectionSupervisionTimeout,
     };
 
     uint32_t rc = sd_ble_gap_connect(&addr, &scanParams, &connParams);

--- a/nRF51Gap.h	Fri Jun 19 15:55:24 2015 +0100
+++ b/nRF51Gap.h	Fri Jun 19 15:55:24 2015 +0100
@@ -51,7 +51,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 GapScanningParams &scanParams);
+    virtual ble_error_t connect(const Address_t, Gap::AddressType_t peerAddrType, const GapScanningParams &scanParams, const ConnectionParams_t& connectionParams);
     virtual ble_error_t disconnect(DisconnectionReason_t reason);
 
     virtual ble_error_t purgeAllBondingState(void) {return btle_purgeAllBondingState();}