fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-05 14:51:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Logging fixes and enhancements

Browse Source 
Made the logging macros generic so they can be used for multiple targets.

Fixed toolchain_native.mk so err.h is included from src/systemlib for posix.

Reduced debug output for uORB.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-05-19 11:53:19 -07:00
parent 95de7c2e94
commit eaef0db7d6
4 changed files with 27 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/px4_log.h
+20 -28
View File
@@ -38,39 +38,35 @@
#pragma once
#if defined(__PX4_QURT)
#define __px4_log_omit(level, ...) { }
__BEGIN_DECLS
extern void qurt_log(const char *fmt, ...);
__END_DECLS
#include <stdio.h>
#define qurt_log(...) {printf(__VA_ARGS__); printf("\n");}
#define PX4_DBG(...) qurt_log(__VA_ARGS__)
#define PX4_DEBUG(...) qurt_log(__VA_ARGS__)
#define PX4_INFO(...) qurt_log(__VA_ARGS__)
#define PX4_WARN(...) qurt_log(__VA_ARGS__)
#define PX4_ERR(...) { qurt_log("ERROR file %s line %d:", __FILE__, __LINE__); qurt_log(__VA_ARGS__); }
#elif defined(__PX4_LINUX)
#include <stdio.h>
#define linux_log(level, ...) { \
#define __px4_log(level, ...) { \
printf("%-5s ", level);\
printf(__VA_ARGS__);\
printf("\n");\
}
#define linux_log_verbose(level, ...) { \
#define __px4_log_verbose(level, ...) { \
printf("%-5s ", level);\
printf(__VA_ARGS__);\
printf(" (file %s line %d)\n", __FILE__, __LINE__);\
}
#if defined(__PX4_QURT)
#include <stdio.h>
#define PX4_DEBUG(...) __px4_log_omit("DEBUG", __VA_ARGS__);
#define PX4_INFO(...) __px4_log("INFO", __VA_ARGS__);
#define PX4_WARN(...) __px4_log_verbose("WARN", __VA_ARGS__);
#define PX4_ERR(...) __px4_log_verbose("ERROR", __VA_ARGS__);
#elif defined(__PX4_LINUX)
#include <stdio.h>
//#define PX4_DEBUG(...) { }
#define PX4_DEBUG(...) { linux_log("DEBUG", __VA_ARGS__); }
#define PX4_INFO(...) { linux_log("INFO", __VA_ARGS__); }
#define PX4_WARN(...) { linux_log_verbose("WARN", __VA_ARGS__); }
#define PX4_ERR(...) { linux_log_verbose("ERROR", __VA_ARGS__); }
#define PX4_DEBUG(...) __px4_log_omit("DEBUG", __VA_ARGS__);
#define PX4_INFO(...) __px4_log("INFO", __VA_ARGS__);
#define PX4_WARN(...) __px4_log_verbose("WARN", __VA_ARGS__);
#define PX4_ERR(...) __px4_log_verbose("ERROR", __VA_ARGS__);
#elif defined(__PX4_ROS)
@@ -80,7 +76,6 @@ __END_DECLS
#define PX4_ERR(...) ROS_WARN(__VA_ARGS__)
#elif defined(__PX4_NUTTX)
#include <systemlib/err.h>
#define PX4_DBG(...)
@@ -90,9 +85,6 @@ __END_DECLS
#else
#define PX4_DBG(...)
#define PX4_WARN(...)
#define PX4_INFO(...)
#define PX4_ERR(...)
#error "Target platform unknown"
#endif