Wouter van Kleunen / X_NUCLEO_IDB0XA1

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.

Fork of X_NUCLEO_IDB0XA1 by ST

Files at this revision

API Documentation at this revision

Revision 224:d8669b6b3175, committed 2016-04-12

Comitter:
Andrea Palmieri
Date:
Tue Apr 12 18:07:16 2016 +0200
Parent:
223:36df860f7ffc
Child:
225:719cd18d73a6
Commit message:
Fix getter of min/max ADV intervals

Signed-off-by: Andrea Palmieri <andrea.palmieri@st.com>

Changed in this revision

source/BlueNRGGap.cpp Show annotated file Show diff for this revision Revisions of this file
x-nucleo-idb0xa1/BlueNRGGap.h Show annotated file Show diff for this revision Revisions of this file 
--- a/source/BlueNRGGap.cpp	Fri Apr 08 17:42:38 2016 +0200
+++ b/source/BlueNRGGap.cpp	Tue Apr 12 18:07:16 2016 +0200
@@ -1002,64 +1002,6 @@
     return BLE_ERROR_NONE;    
 }
 
-/**************************************************************************/
-/*!
-    @brief  Gets the value of maximum advertising interval in ms
-
-    @returns    uint16_t
-
-    @retval     value of maximum advertising interval in ms
-                
-    @section EXAMPLE
-
-    @code
-
-    @endcode
-*/
-/**************************************************************************/
-uint16_t BlueNRGGap::getMaxAdvertisingInterval(void) const  {
-    return advtInterval;
-} 
-
-
-/**************************************************************************/
-/*!
-    @brief  Gets the value of minimum advertising interval in ms
-
-    @returns    uint16_t
-
-    @retval     value of minimum advertising interval in ms
-                
-    @section EXAMPLE
-
-    @code
-
-    @endcode
-*/
-/**************************************************************************/
-uint16_t BlueNRGGap::getMinAdvertisingInterval(void) const {    
-    return 0;    // minimum Advertising interval is 0
-}
-
-/**************************************************************************/
-/*!
-    @brief  Gets the value of minimum non connectable advertising interval in ms
-
-    @returns    uint16_t
-
-    @retval     value of minimum non connectable advertising interval in ms
-                
-    @section EXAMPLE
-
-    @code
-
-    @endcode
-*/
-/**************************************************************************/
-uint16_t BlueNRGGap::getMinNonConnectableAdvertisingInterval(void) const {     
-    return BLE_GAP_ADV_NONCON_INTERVAL_MIN;    
-}
-
 GapScanningParams* BlueNRGGap::getScanningParams(void)
 {
   return &_scanningParams;

--- a/x-nucleo-idb0xa1/BlueNRGGap.h	Fri Apr 08 17:42:38 2016 +0200
+++ b/x-nucleo-idb0xa1/BlueNRGGap.h	Tue Apr 12 18:07:16 2016 +0200
@@ -45,9 +45,9 @@
 #define BLE_CONN_HANDLE_INVALID 0x0
 #define BDADDR_SIZE 6
 
-#define BLUENRG_GAP_ADV_INTERVAL_MIN (0)
-#define BLUENRG_GAP_ADV_INTERVAL_MAX (0)
-#define BLE_GAP_ADV_NONCON_INTERVAL_MIN (0)
+#define BLUENRG_GAP_ADV_INTERVAL_MIN (0x0020)
+#define BLUENRG_GAP_ADV_INTERVAL_MAX (0x00A0)
+#define BLUENRG_GAP_ADV_NONCON_INTERVAL_MIN (0x4000)
 
 // Scanning and Connection Params used by Central for creating connection
 #define GAP_OBSERVATION_PROC (0x80)
@@ -101,9 +101,9 @@
     virtual ble_error_t startAdvertising(const GapAdvertisingParams &);
     virtual ble_error_t stopAdvertising(void);
     virtual ble_error_t stopScan();
-    virtual uint16_t    getMinAdvertisingInterval(void) const;
-    virtual uint16_t    getMinNonConnectableAdvertisingInterval(void) const;
-    virtual uint16_t    getMaxAdvertisingInterval(void) const;
+    virtual uint16_t    getMinAdvertisingInterval(void) const {return GapAdvertisingParams::ADVERTISEMENT_DURATION_UNITS_TO_MS(BLUENRG_GAP_ADV_INTERVAL_MIN);}
+    virtual uint16_t    getMinNonConnectableAdvertisingInterval(void) const {return GapAdvertisingParams::ADVERTISEMENT_DURATION_UNITS_TO_MS(BLUENRG_GAP_ADV_NONCON_INTERVAL_MIN);}
+    virtual uint16_t    getMaxAdvertisingInterval(void) const {return GapAdvertisingParams::ADVERTISEMENT_DURATION_UNITS_TO_MS(BLUENRG_GAP_ADV_INTERVAL_MAX);}
     virtual ble_error_t disconnect(DisconnectionReason_t reason);
     virtual ble_error_t disconnect(Handle_t connectionHandle, DisconnectionReason_t reason);
     virtual ble_error_t getPreferredConnectionParams(ConnectionParams_t *params);