Nordic Semiconductor / nrf51-sdk

Nordic nrf51 sdk sources. Mirrored from https://github.com/ARMmbed/nrf51-sdk.

Dependents:   nRF51822 nRF51822

Files at this revision

API Documentation at this revision

Revision 33:0d31ee7f1af0, committed 2016-04-07

Comitter:
vcoubard
Date:
Thu Apr 07 17:38:07 2016 +0100
Parent:
32:6335323e4327
Child:
34:83ee7767efcf
Commit message:
Synchronized with git rev 7ff95c97
Author: Vincent Coubard
Merge pull request #9 from andresag01/master

Add ifdef to include correct mbed.h file in mbedOS

Changed in this revision

source/nordic_sdk/components/ble/common/ble_conn_params.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/source/nordic_sdk/components/ble/common/ble_conn_params.cpp	Thu Apr 07 17:38:06 2016 +0100
+++ b/source/nordic_sdk/components/ble/common/ble_conn_params.cpp	Thu Apr 07 17:38:07 2016 +0100
@@ -40,7 +40,11 @@
 #ifdef USE_APP_TIMER
 #include "app_timer.h"
 #else
-#include "mbed.h"
+    #ifdef YOTTA_CFG_MBED_OS
+        #include "mbed-drivers/mbed.h"
+    #else
+        #include "mbed.h"
+    #endif
 #endif
 
 static ble_conn_params_init_t m_conn_params_config;     /**< Configuration as specified by the application. */