Rob Kluin / nRF51822

config changes

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 578:78f69f1be114, committed 2016-01-11

Comitter:
vcoubard
Date:
Mon Jan 11 10:19:25 2016 +0000
Parent:
577:d38f01a3e701
Child:
579:cf8a66f11353
Commit message:
Synchronized with git rev 90de915f
Author: Andres Amaya Garcia
Replace deprecated inclusions of mbed.h

Replace all deprecated inclusions of mbed.h for mbed-drivers/mbed.h when using
mbed OS. Applications should compile for mbed classic.

Changed in this revision

source/nRF5xGap.cpp Show annotated file Show diff for this revision Revisions of this file
source/nRF5xGap.h Show annotated file Show diff for this revision Revisions of this file
source/nRF5xGattServer.cpp Show annotated file Show diff for this revision Revisions of this file
source/nRF5xn.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/source/nRF5xGap.cpp	Mon Jan 11 10:19:25 2016 +0000
+++ b/source/nRF5xGap.cpp	Mon Jan 11 10:19:25 2016 +0000
@@ -15,7 +15,11 @@
  */
 
 #include "nRF5xn.h"
-#include "mbed.h"
+#ifdef YOTTA_CFG_MBED_OS
+    #include "mbed-drivers/mbed.h"
+#else
+    #include "mbed.h"
+#endif
 #include "ble/BLE.h"
 
 #include "common/common.h"

--- a/source/nRF5xGap.h	Mon Jan 11 10:19:25 2016 +0000
+++ b/source/nRF5xGap.h	Mon Jan 11 10:19:25 2016 +0000
@@ -17,7 +17,11 @@
 #ifndef __NRF5x_GAP_H__
 #define __NRF5x_GAP_H__
 
-#include "mbed.h"
+#ifdef YOTTA_CFG_MBED_OS
+    #include "mbed-drivers/mbed.h"
+#else
+    #include "mbed.h"
+#endif
 #include "ble/blecommon.h"
 #include "ble.h"
 #include "ble/GapAdvertisingParams.h"

--- a/source/nRF5xGattServer.cpp	Mon Jan 11 10:19:25 2016 +0000
+++ b/source/nRF5xGattServer.cpp	Mon Jan 11 10:19:25 2016 +0000
@@ -15,7 +15,11 @@
  */
 
 #include "nRF5xGattServer.h"
-#include "mbed.h"
+#ifdef YOTTA_CFG_MBED_OS
+    #include "mbed-drivers/mbed.h"
+#else
+    #include "mbed.h"
+#endif
 
 #include "common/common.h"
 #include "btle/custom/custom_helper.h"

--- a/source/nRF5xn.cpp	Mon Jan 11 10:19:25 2016 +0000
+++ b/source/nRF5xn.cpp	Mon Jan 11 10:19:25 2016 +0000
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-#include "mbed.h"
+#ifdef YOTTA_CFG_MBED_OS
+    #include "mbed-drivers/mbed.h"
+#else
+    #include "mbed.h"
+#endif
 #include "nRF5xn.h"
 #include "ble/blecommon.h"
 #include "nrf_soc.h"