Andrew Fox / BLE_API

add "LE Device Address" 0x1B to advertising data types

Fork of BLE_API by Bluetooth Low Energy

Files at this revision

API Documentation at this revision

Revision 767:d6a79c77d1c3, committed 2015-08-07

Comitter:
rgrover1
Date:
Fri Aug 07 15:53:50 2015 +0100
Parent:
766:03f1a26f132f
Child:
768:8914bea92690
Commit message:
Synchronized with git rev e65471d6
Author: Joshua Slater
Fixed bugs with Gap:: and GapAdvertisingParams

Changed in this revision

ble/Gap.h Show annotated file Show diff for this revision Revisions of this file
source/GapScanningParams.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/ble/Gap.h	Fri Aug 07 15:53:50 2015 +0100
+++ b/ble/Gap.h	Fri Aug 07 15:53:50 2015 +0100
@@ -464,7 +464,7 @@
         } else if (interval < getMinAdvertisingInterval()) {
             interval = getMinAdvertisingInterval();
         }
-        _advParams.setInterval(MSEC_TO_ADVERTISEMENT_DURATION_UNITS(interval));
+        _advParams.setInterval(GapAdvertisingParams::MSEC_TO_ADVERTISEMENT_DURATION_UNITS(interval));
     }
 
     /**

--- a/source/GapScanningParams.cpp	Fri Aug 07 15:53:50 2015 +0100
+++ b/source/GapScanningParams.cpp	Fri Aug 07 15:53:50 2015 +0100
@@ -18,8 +18,8 @@
 #include "ble/GapScanningParams.h"
 
 GapScanningParams::GapScanningParams(uint16_t interval, uint16_t window, uint16_t timeout, bool activeScanning) :
-    _interval(Gap::MSEC_TO_SCAN_DURATION_UNITS(interval)),
-    _window(Gap::MSEC_TO_SCAN_DURATION_UNITS(window)),
+    _interval(MSEC_TO_SCAN_DURATION_UNITS(interval)),
+    _window(MSEC_TO_SCAN_DURATION_UNITS(window)),
     _timeout(timeout),
     _activeScanning(activeScanning) {
     /* stay within limits */
@@ -40,7 +40,7 @@
 ble_error_t
 GapScanningParams::setInterval(uint16_t newIntervalInMS)
 {
-    uint16_t newInterval = Gap::MSEC_TO_SCAN_DURATION_UNITS(newIntervalInMS);
+    uint16_t newInterval = MSEC_TO_SCAN_DURATION_UNITS(newIntervalInMS);
     if ((newInterval >= SCAN_INTERVAL_MIN) && (newInterval < SCAN_INTERVAL_MAX)) {
         _interval = newInterval;
         return BLE_ERROR_NONE;
@@ -52,7 +52,7 @@
 ble_error_t
 GapScanningParams::setWindow(uint16_t newWindowInMS)
 {
-    uint16_t newWindow = Gap::MSEC_TO_SCAN_DURATION_UNITS(newWindowInMS);
+    uint16_t newWindow = MSEC_TO_SCAN_DURATION_UNITS(newWindowInMS);
     if ((newWindow >= SCAN_WINDOW_MIN) && (newWindow < SCAN_WINDOW_MAX)) {
         _window   = newWindow;
         return BLE_ERROR_NONE;