Gymtrack / nRF51822_1

SG RFID nRF51822 fork

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 70:d57285f18f65, committed 2014-11-21

Comitter:
rgrover1
Date:
Fri Nov 21 10:00:40 2014 +0000
Parent:
69:61da91a52bd6
Child:
71:f11b3e313843
Commit message:
Synchronized with git rev 3eda3f6f
Author: Rohit Grover
GAP_ADV_PARAMS_INTERVAL_MAX and other such constants have moved into GapAdvertisingParams

Changed in this revision

nRF51Gap.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/nRF51Gap.cpp	Tue Nov 04 10:42:27 2014 +0000
+++ b/nRF51Gap.cpp	Fri Nov 21 10:00:40 2014 +0000
@@ -134,13 +134,13 @@
     /* Check interval range */
     if (params.getAdvertisingType() == GapAdvertisingParams::ADV_NON_CONNECTABLE_UNDIRECTED) {
         /* Min delay is slightly longer for unconnectable devices */
-        if ((params.getInterval() < GAP_ADV_PARAMS_INTERVAL_MIN_NONCON) ||
-            (params.getInterval() > GAP_ADV_PARAMS_INTERVAL_MAX)) {
+        if ((params.getInterval() < GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MIN_NONCON) ||
+            (params.getInterval() > GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MAX)) {
             return BLE_ERROR_PARAM_OUT_OF_RANGE;
         }
     } else {
-        if ((params.getInterval() < GAP_ADV_PARAMS_INTERVAL_MIN) ||
-            (params.getInterval() > GAP_ADV_PARAMS_INTERVAL_MAX)) {
+        if ((params.getInterval() < GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MIN) ||
+            (params.getInterval() > GapAdvertisingParams::GAP_ADV_PARAMS_INTERVAL_MAX)) {
             return BLE_ERROR_PARAM_OUT_OF_RANGE;
         }
     }
@@ -154,7 +154,7 @@
 
     /* Check timeout for other advertising types */
     if ((params.getAdvertisingType() != GapAdvertisingParams::ADV_CONNECTABLE_DIRECTED) &&
-        (params.getTimeout() > GAP_ADV_PARAMS_TIMEOUT_MAX)) {
+        (params.getTimeout() > GapAdvertisingParams::GAP_ADV_PARAMS_TIMEOUT_MAX)) {
         return BLE_ERROR_PARAM_OUT_OF_RANGE;
     }
 
@@ -372,4 +372,4 @@
     } else {
         return BLE_ERROR_PARAM_OUT_OF_RANGE;
     }
-}
+}
\ No newline at end of file