diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 12:08:39 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 12:11:05 +0100 |
| commit | 16618f1adac7f33817fb968b285288beb360b012 (patch) | |
| tree | b6181cbd01cb923023810b735c4bc6cb40c58b8e /src/platforms/px4_includes.h | |
| parent | 4402d7106bc63b2a02a1e4c22f54e072b3c48fc7 (diff) | |
| parent | 6e874bed50d6d8a13a3b7f9b883697cb2718d27b (diff) | |
| download | px4-firmware-16618f1adac7f33817fb968b285288beb360b012.tar.gz px4-firmware-16618f1adac7f33817fb968b285288beb360b012.tar.bz2 px4-firmware-16618f1adac7f33817fb968b285288beb360b012.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
src/examples/subscriber/subscriber_params.c
src/modules/mc_att_control/mc_att_control_main.cpp
src/modules/uORB/topics/vehicle_attitude.h
src/modules/uORB/topics/vehicle_attitude_setpoint.h
src/platforms/px4_middleware.h
Diffstat (limited to 'src/platforms/px4_includes.h')
| -rw-r--r-- | src/platforms/px4_includes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/platforms/px4_includes.h b/src/platforms/px4_includes.h index 752c6b5fe..6c36b692a 100644 --- a/src/platforms/px4_includes.h +++ b/src/platforms/px4_includes.h @@ -59,6 +59,7 @@ #include <px4/vehicle_control_mode.h> #include <px4/actuator_armed.h> #include <px4/parameter_update.h> +#include <px4/parameter_status.h> #endif #else @@ -76,6 +77,7 @@ #include <uORB/topics/vehicle_control_mode.h> #include <uORB/topics/actuator_armed.h> #include <uORB/topics/parameter_update.h> +#include <uORB/topics/vehicle_status.h> #include <systemlib/err.h> #include <systemlib/param/param.h> #include <systemlib/systemlib.h> |