diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-30 09:53:07 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-30 09:53:07 +0200 |
| commit | ffb0ebf13cf033673fd279844d2a60daf72e55ae (patch) | |
| tree | 17c446b9aa20d224510ebd198504b5bfe4656c0b /src/modules/uORB/objects_common.cpp | |
| parent | 3ddb502d2e1b07705bfaa59c89528d53d0444303 (diff) | |
| parent | 28a31708f98eefa4ceb04617f2da3dd7892c99fa (diff) | |
| download | px4-firmware-ffb0ebf13cf033673fd279844d2a60daf72e55ae.tar.gz px4-firmware-ffb0ebf13cf033673fd279844d2a60daf72e55ae.tar.bz2 px4-firmware-ffb0ebf13cf033673fd279844d2a60daf72e55ae.zip | |
Merge remote-tracking branch 'upstream/master' into forcesetpoint
Conflicts:
src/modules/uORB/objects_common.cpp
Diffstat (limited to 'src/modules/uORB/objects_common.cpp')
| -rw-r--r-- | src/modules/uORB/objects_common.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/uORB/objects_common.cpp b/src/modules/uORB/objects_common.cpp index d45314222..f2cbcd290 100644 --- a/src/modules/uORB/objects_common.cpp +++ b/src/modules/uORB/objects_common.cpp @@ -202,3 +202,9 @@ ORB_DEFINE(estimator_status, struct estimator_status_report); #include "topics/vehicle_force_setpoint.h" ORB_DEFINE(vehicle_force_setpoint, struct vehicle_force_setpoint_s); + +#include "topics/tecs_status.h" +ORB_DEFINE(tecs_status, struct tecs_status_s); + +#include "topics/wind_estimate.h" +ORB_DEFINE(wind_estimate, struct wind_estimate_s); |