diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-26 11:36:23 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-26 11:36:23 +0100 |
| commit | e7c1e5b1ff7b1bbdc11ab2cae6b99fe459487119 (patch) | |
| tree | ed69515032079068a3f9fcbf46356a0f860e2f48 /src/platforms/px4_defines.h | |
| parent | 3c6f6618e8709c22ac21f8f0353f292f25da22f7 (diff) | |
| download | px4-firmware-e7c1e5b1ff7b1bbdc11ab2cae6b99fe459487119.tar.gz px4-firmware-e7c1e5b1ff7b1bbdc11ab2cae6b99fe459487119.tar.bz2 px4-firmware-e7c1e5b1ff7b1bbdc11ab2cae6b99fe459487119.zip | |
wip, working on the nuttx wrapper
Diffstat (limited to 'src/platforms/px4_defines.h')
| -rw-r--r-- | src/platforms/px4_defines.h | 23 |
1 files changed, 20 insertions, 3 deletions
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 <nuttx/config.h> -#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 |