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.
Dependents: 02_DPPU_JUANDA_120 02_DPPU_JUANDA_120_Latest_copy 02_DPPU_JUANDA_120_Latest
Diff: Relax.h
- Revision:
- 83:71e3b8bc9ab8
- Parent:
- 74:208e3e32d263
--- a/Relax.h	Wed May 28 07:14:21 2014 +0000
+++ b/Relax.h	Wed May 28 14:53:37 2014 +0000
@@ -2,15 +2,14 @@
 
 #include "mbed.h"
 
-// declare the osDelay (usually from cmsis_os.h)
-extern "C" void osDelay(uint32_t ms);
-
-/** A wait function that is independent whether the OS is includes or not
-    if rtos is included the Thread will yield for a certain time 
-    otherwise (without rtos) it will just stay in a busy loop.
-    
-    \param ms number of milliseconds to wait
-*/
-inline void RELAX_MS(int ms) { 
-    osDelay(ms); 
-}
\ No newline at end of file
+#ifdef USING_RTOS
+#include "rtos.h"
+inline void RELAX_MS(unsigned int ms) {
+    if (ms) Thread::wait(ms);
+    else    Thread::yield();
+}
+#else
+inline void RELAX_MS(unsigned int ms) {
+    if (ms) wait_ms(ms);
+}
+#endif