From e7c1e5b1ff7b1bbdc11ab2cae6b99fe459487119 Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Wed, 26 Nov 2014 11:36:23 +0100 Subject: wip, working on the nuttx wrapper --- src/platforms/px4_defines.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'src/platforms/px4_defines.h') diff --git a/src/platforms/px4_defines.h b/src/platforms/px4_defines.h index 48234766f..d4dc71453 100644 --- a/src/platforms/px4_defines.h +++ b/src/platforms/px4_defines.h @@ -44,8 +44,25 @@ * Building for running within the ROS environment */ #define __EXPORT -#define PX4_MAIN_FUNCTION(_prefix) +// #define PX4_MAIN_FUNCTION(_prefix) +#define PX4_MAIN_FUNCTION(_prefix) int main(int argc, char **argv) +#define PX4_WARN ROS_WARN +#define PX4_INFO ROS_INFO +#define PX4_TOPIC(name) #name +#define PX4_TOPIC_T(name) name + #else -#include -#define PX4_MAIN_FUNCTION(_prefix) __EXPORT int _prefix##main(int argc, char **argv)() { return main(argc, argv); } +/* + * Building for NuttX + */ + +// #define PX4_MAIN_FUNCTION(_prefix) __EXPORT int _prefix##_main(int argc, char **argv)() { return main(argc, argv); } +// #define PX4_MAIN_FUNCTION(_prefix) extern "C" __EXPORT int _prefix##_main(int argc, char *argv[]) { return main(argc, argv); } +#define PX4_MAIN_FUNCTION(_prefix) extern "C" __EXPORT int _prefix##_main(int argc, char *argv[]) +#define PX4_WARN warnx +#define PX4_WARN warnx +#define PX4_INFO warnx +#define PX4_TOPIC(name) ORB_ID(name) +#define PX4_TOPIC_T(name) name##_s + #endif -- cgit v1.2.3