Rob Kluin / nRF51822

config changes

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 409:f307fc7ba42e, committed 2015-08-10

Comitter:
rgrover1
Date:
Mon Aug 10 15:18:44 2015 +0100
Parent:
408:a9ed252089c4
Child:
410:b1d564ca6094
Commit message:
Synchronized with git rev 781dcbdc
Author: Joshua Slater
changed getInterval to getIntervalInAdvUnits to support changes in GapAdvertisingParams.h

Changed in this revision

source/nRF5xGap.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/source/nRF5xGap.cpp	Fri Aug 07 15:57:08 2015 +0100
+++ b/source/nRF5xGap.cpp	Mon Aug 10 15:18:44 2015 +0100
@@ -143,13 +143,13 @@
     /* Check interval range */
     if (params.getAdvertisingType() == GapAdvertisingParams::ADV_NON_CONNECTABLE_UNDIRECTED) {
         /* Min delay is slightly longer for unconnectable devices */
-        if ((params.getInterval() < GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MIN_NONCON) ||
-            (params.getInterval() > GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MAX)) {
+        if ((params.getIntervalInAdvUnits() < GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MIN_NONCON) ||
+            (params.getIntervalInAdvUnits() > GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MAX)) {
             return BLE_ERROR_PARAM_OUT_OF_RANGE;
         }
     } else {
-        if ((params.getInterval() < GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MIN) ||
-            (params.getInterval() > GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MAX)) {
+        if ((params.getIntervalInAdvUnits() < GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MIN) ||
+            (params.getIntervalInAdvUnits() > GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MAX)) {
             return BLE_ERROR_PARAM_OUT_OF_RANGE;
         }
     }
@@ -174,7 +174,7 @@
     adv_para.p_peer_addr = NULL;                         // Undirected advertisement
     adv_para.fp          = BLE_GAP_ADV_FP_ANY;
     adv_para.p_whitelist = NULL;
-    adv_para.interval    = params.getInterval();         // advertising interval (in units of 0.625 ms)
+    adv_para.interval    = params.getIntervalInAdvUnits();         // advertising interval (in units of 0.625 ms)
     adv_para.timeout     = params.getTimeout();
 
     ASSERT(ERROR_NONE == sd_ble_gap_adv_start(&adv_para), BLE_ERROR_PARAM_OUT_OF_RANGE);