Lorenzo Maiorfi / XBeeLib_Fixed

Digi XBeeLib fixed for NonCopyable issue

Dependents:   XBeeZB_Receive_Data

Fork of XBeeLib by Digi International Inc.

This lib fixes NonCopyable<T> issues of Digi XBeeLib. Also, lib has been reworked in order to make it RTOS-aware, overcoming several others issues due to stdio Mutex operations.

Diff: Utils/Debug.h

Revision:
12:8dc9761210c1
Parent:
4:629712865107
--- a/Utils/Debug.h	Sat Mar 24 19:50:19 2018 +0100
+++ b/Utils/Debug.h	Sun Mar 25 16:54:52 2018 +0200
@@ -15,11 +15,30 @@
 
 #include "config.h"
 
+
+#if defined(ENABLE_THREAD_SAFE_LOGGING)
+
+#include "mbed.h"
+
+extern EventQueue s_logging_event_queue;
+
+#endif
+
+
 #if defined(ENABLE_LOGGING)
 
 #include "DigiLogger.h"
 
+#if !(defined(ENABLE_THREAD_SAFE_LOGGING))
+
 #define digi_log(...)  DigiLog::DigiLogger::log_format(__VA_ARGS__);
+
+#else
+
+#define digi_log(...)  s_logging_event_queue.call(&DigiLog::DigiLogger::log_format, __VA_ARGS__);
+
+#endif
+
 #else
 #define digi_log(...)  do {} while(0)
 #endif
@@ -27,11 +46,24 @@
 #if defined(ENABLE_ASSERTIONS)
 #include "mbed.h"
 #if !(defined assert)
-#define assert(expr)            if (!(expr)) {                                      \
-                                    digi_log(LogLevelNone, "Assertion failed: %s, file %s, line %d\n", \
+
+#if !(defined(ENABLE_THREAD_SAFE_LOGGING))
+
+    #define assert(expr)        if (!(expr)) {                                      \
+                                    DigiLog::DigiLogger::log_format(LogLevelNone, "Assertion failed: %s, file %s, line %d\n", \
                                          #expr, __FILE__, __LINE__);                \
                                     mbed_die();                                     \
                                 }
+
+#else
+
+    #define assert(expr)        if (!(expr)) {                                      \
+                                    s_logging_event_queue.call(&DigiLog::DigiLogger::log_format, LogLevelNone, "Assertion failed: %s, file %s, line %d\n", #expr, __FILE__, __LINE__ ); \
+                                    mbed_die();                                     \
+                                }
+
+#endif
+
 #endif
 #else
 #define assert(expr)