aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-11-26 11:36:23 +0100
committerThomas Gubler <thomasgubler@gmail.com>2014-11-26 11:36:23 +0100
commite7c1e5b1ff7b1bbdc11ab2cae6b99fe459487119 (patch)
treeed69515032079068a3f9fcbf46356a0f860e2f48 /src/include
parent3c6f6618e8709c22ac21f8f0353f292f25da22f7 (diff)
downloadpx4-firmware-e7c1e5b1ff7b1bbdc11ab2cae6b99fe459487119.tar.gz
px4-firmware-e7c1e5b1ff7b1bbdc11ab2cae6b99fe459487119.tar.bz2
px4-firmware-e7c1e5b1ff7b1bbdc11ab2cae6b99fe459487119.zip
wip, working on the nuttx wrapper
Diffstat (limited to 'src/include')
-rw-r--r--src/include/px4.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/include/px4.h b/src/include/px4.h
index 391972b12..22d661b17 100644
--- a/src/include/px4.h
+++ b/src/include/px4.h
@@ -46,19 +46,17 @@
* Building for running within the ROS environment
*/
#include "ros/ros.h"
+#include "px4/rc_channels.h"
-#define PX4_WARN ROS_WARN
-#define PX4_INFO ROS_INFO
-#define PX4_TOPIC(name) #name
#else
/*
* Building for NuttX
*/
+#include <nuttx/config.h>
#include <uORB/uORB.h>
+#include <uORB/topics/rc_channels.h>
+#include <systemlib/err.h>
-#define PX4_WARN warnx
-#define PX4_INFO warnx
-#define PX4_TOPIC(name) ORB_ID(name)
#endif
#include "../platforms/px4_defines.h"