Diff: Logger.h

Revision:

7:604a8369b801

Parent:

3:ee90a9ada112

Child:

8:cba37530d480

--- a/Logger.h	Thu Feb 12 19:00:28 2015 +0000
+++ b/Logger.h	Tue Feb 17 16:53:50 2015 +0000
@@ -1,28 +1,25 @@
 #ifndef _H_LOGGER_H
 #define _H_LOGGER_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#define DATA_OUTPUT
 
 #include <cstdio>
-#ifdef DEBUG
-//static Serial sml2uart(p26, p24);
+#if defined(DEBUG) && defined(OVERALL_DEBUG)
 #define LOG(x, ...)  { printf("\x1b[34m%12.12s: \x1b[39m"x"\x1b[39;49m\r\n", DEBUG, ##__VA_ARGS__); fflush(stdout); }
 #define WARN(x, ...) { printf("\x1b[34m%12.12s: \x1b[33m"x"\x1b[39;49m\r\n", DEBUG, ##__VA_ARGS__); fflush(stdout); }
 #define ERR(x, ...)  { printf("\x1b[34m%12.12s: \x1b[31m"x"\x1b[39;49m\r\n", DEBUG, ##__VA_ARGS__); fflush(stdout); }
 #define INFO(x, ...) { printf("\x1b[34m%12.12s: \x1b[32m"x"\x1b[39;49m\r\n", DEBUG, ##__VA_ARGS__); fflush(stdout); }
-#define DATA(x, ...) { printf("DATA: "x"\r\n", ##__VA_ARGS__); fflush(stdout); }
 #else
 #define LOG(x, ...)
 #define WARN(x, ...)
 #define ERR(x, ...)
 #define INFO(x, ...)
-#define DATA(x, ...)
 #endif
 
-#ifdef __cplusplus
-}
+#if defined(DATA_OUTPUT)
+#define DATA(x) { fwrite(&(x), sizeof (x), 1, stdout); fflush(stdout); }
+#else
+#define DATA(x)
 #endif
 
 #endif//_H_LOGGER_H
\ No newline at end of file