Wouter van Kleunen / X_NUCLEO_IDB0XA1

Fork of X_NUCLEO_IDB0XA1 by ST

Files at this revision

API Documentation at this revision

Comitter:
Wolfgang Betz
Date:
Thu Oct 08 07:29:43 2015 +0200
Parent:
137:5baea3b414d9
Child:
139:3a75965fd389
Commit message:
Use 'AST_FOR_MBED_OS' instead of 'YOTTA_CFG_MBED_OS'

Changed in this revision

source/BlueNRGGap.cpp Show annotated file Show diff for this revision Revisions of this file
source/bluenrg-hci/hci/hci.c Show annotated file Show diff for this revision Revisions of this file
source/platform/btle.cpp Show annotated file Show diff for this revision Revisions of this file
source/platform/stm32_bluenrg_ble.cpp Show annotated file Show diff for this revision Revisions of this file
x-nucleo-idb0xa1/bluenrg-hci/debug.h Show annotated file Show diff for this revision Revisions of this file
x-nucleo-idb0xa1/platform/btle.h Show annotated file Show diff for this revision Revisions of this file
--- a/source/BlueNRGGap.cpp	Wed Oct 07 16:19:40 2015 +0200
+++ b/source/BlueNRGGap.cpp	Thu Oct 08 07:29:43 2015 +0200
@@ -289,7 +289,7 @@
  * ADV timeout callback
  */   
 // ANDREA: mbedOS
-#ifdef YOTTA_CFG_MBED_OS
+#ifdef AST_FOR_MBED_OS
 static void advTimeoutCB(void)
 {
     Gap::GapState_t state;
@@ -316,7 +316,7 @@
 
     }
 }
-#endif /* YOTTA_CFG_MBED_OS */
+#endif /* AST_FOR_MBED_OS */
     
 /**************************************************************************/
 /*!
@@ -456,7 +456,7 @@
     if(params.getTimeout() != 0) {
         PRINTF("!!! attaching to!!!\n");
         // ANDREA: mbedOS
-#ifdef YOTTA_CFG_MBED_OS
+#ifdef AST_FOR_MBED_OS
         minar::Scheduler::postCallback(advTimeoutCB).delay(minar::milliseconds(params.getTimeout()));
 #else
         advTimeout.attach(advTimeoutCB, params.getTimeout());
--- a/source/bluenrg-hci/hci/hci.c	Wed Oct 07 16:19:40 2015 +0200
+++ b/source/bluenrg-hci/hci/hci.c	Thu Oct 08 07:29:43 2015 +0200
@@ -149,7 +149,7 @@
         // Insert the packet back into the pool.
         list_insert_head(&hciReadPktPool, (tListNode *)hciReadPacket);
       }     
-#ifdef YOTTA_CFG_MBED_OS
+#ifdef AST_FOR_MBED_OS
       Call_BTLE_Handler();
 #endif
     }
@@ -157,7 +157,7 @@
       // HCI Read Packet Pool is empty, wait for a free packet.
       readPacketListFull = TRUE;
       Clear_SPI_EXTI_Flag();
-#ifdef YOTTA_CFG_MBED_OS
+#ifdef AST_FOR_MBED_OS
       Call_BTLE_Handler();
 #endif
       return;
--- a/source/platform/btle.cpp	Wed Oct 07 16:19:40 2015 +0200
+++ b/source/platform/btle.cpp	Thu Oct 08 07:29:43 2015 +0200
@@ -193,7 +193,7 @@
                             strlen(name), (tHalUint8 *)name);*/
 
     // Andrea: mbedOS
-#ifdef YOTTA_CFG_MBED_OS
+#ifdef AST_FOR_MBED_OS
     minar::Scheduler::postCallback(btle_handler);
 #endif
     return;
@@ -208,7 +208,7 @@
     @returns
 */
 /**************************************************************************/
-#ifdef YOTTA_CFG_MBED_OS
+#ifdef AST_FOR_MBED_OS
 int btle_handler_pending = 0;
 
 void btle_handler(void)
--- a/source/platform/stm32_bluenrg_ble.cpp	Wed Oct 07 16:19:40 2015 +0200
+++ b/source/platform/stm32_bluenrg_ble.cpp	Thu Oct 08 07:29:43 2015 +0200
@@ -176,7 +176,7 @@
     bluenrgDeviceInstance.disable_irq();
 }
 
-#ifdef YOTTA_CFG_MBED_OS
+#ifdef AST_FOR_MBED_OS
 /**
  * Call BTLE callback handler.
  * @param  None
--- a/x-nucleo-idb0xa1/bluenrg-hci/debug.h	Wed Oct 07 16:19:40 2015 +0200
+++ b/x-nucleo-idb0xa1/bluenrg-hci/debug.h	Thu Oct 08 07:29:43 2015 +0200
@@ -47,10 +47,6 @@
 #include <string.h>
 
 /* Exported macro ------------------------------------------------------------*/
-#ifndef YOTTA_CFG_MBED_OS
-#define YOTTA_CFG_MBED_OS
-#endif
-
 #define DEBUG
 #ifdef DEBUG
 #include <stdio.h>
--- a/x-nucleo-idb0xa1/platform/btle.h	Wed Oct 07 16:19:40 2015 +0200
+++ b/x-nucleo-idb0xa1/platform/btle.h	Thu Oct 08 07:29:43 2015 +0200
@@ -43,7 +43,7 @@
 void User_Process(void);
 void setConnectable(void);
 
-#ifdef YOTTA_CFG_MBED_OS
+#ifdef AST_FOR_MBED_OS
 extern int btle_handler_pending;
 extern void btle_handler(void);
 #endif