Merge with latest 2.3
This commit is contained in:
+6
-3
@@ -24,6 +24,9 @@
|
||||
#include "definitions.h"
|
||||
#include "rtc.h"
|
||||
#include "dump.h"
|
||||
|
||||
#define CRLF "\r\n"
|
||||
|
||||
#if defined(CLI)
|
||||
#include "cli.h"
|
||||
#else
|
||||
@@ -48,7 +51,7 @@ uint8_t auxSerialTracesEnabled();
|
||||
#endif
|
||||
|
||||
#define TRACE_NOCRLF(...) debugPrintf(__VA_ARGS__)
|
||||
#define TRACE(f_, ...) debugPrintf((f_ "\r\n"), ##__VA_ARGS__)
|
||||
#define TRACE(f_, ...) debugPrintf((f_ CRLF), ##__VA_ARGS__)
|
||||
#define DUMP(data, size) dump(data, size)
|
||||
#define TRACE_DEBUG(...) debugPrintf("-D- " __VA_ARGS__)
|
||||
#define TRACE_DEBUG_WP(...) debugPrintf(__VA_ARGS__)
|
||||
@@ -65,7 +68,7 @@ uint8_t auxSerialTracesEnabled();
|
||||
#endif
|
||||
|
||||
#if defined(TRACE_LUA_INTERNALS_ENABLED)
|
||||
#define TRACE_LUA_INTERNALS(f_, ...) debugPrintf(("[LUA INT] " f_ "\r\n"), ##__VA_ARGS__)
|
||||
#define TRACE_LUA_INTERNALS(f_, ...) debugPrintf(("[LUA INT] " f_ CRLF), ##__VA_ARGS__)
|
||||
|
||||
#define TRACE_LUA_INTERNALS_WITH_LINEINFO(L, f_, ...) do { \
|
||||
lua_Debug ar; \
|
||||
@@ -73,7 +76,7 @@ uint8_t auxSerialTracesEnabled();
|
||||
lua_getinfo(L, ">Sl", &ar); \
|
||||
debugPrintf("%s:%d: ", ar.short_src, ar.currentline); \
|
||||
} \
|
||||
debugPrintf(("[LUA INT] " f_ "\r\n"), ##__VA_ARGS__); \
|
||||
debugPrintf(("[LUA INT] " f_ CRLF), ##__VA_ARGS__); \
|
||||
} while(0)
|
||||
#else
|
||||
#define TRACE_LUA_INTERNALS(...)
|
||||
|
||||
Reference in New Issue
Block a user