diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-03-21 13:33:19 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-03-21 13:33:19 +0100 |
| commit | bc451eef4b92e21f575ad0b695d869f7316df2ce (patch) | |
| tree | 42eb3552554eb4dd68a3f348c91d84d74283de55 /src/modules/uORB/objects_common.cpp | |
| parent | d2a74dff673e2d3f49fc98dea601be753bd18416 (diff) | |
| parent | 057bcf3172f3c8d1bab561e7e4cad14977cd74d0 (diff) | |
| download | px4-firmware-bc451eef4b92e21f575ad0b695d869f7316df2ce.tar.gz px4-firmware-bc451eef4b92e21f575ad0b695d869f7316df2ce.tar.bz2 px4-firmware-bc451eef4b92e21f575ad0b695d869f7316df2ce.zip | |
Merge remote-tracking branch 'upstream/master' into diff_press_filter
Conflicts:
src/drivers/meas_airspeed/meas_airspeed.cpp
Diffstat (limited to 'src/modules/uORB/objects_common.cpp')
| -rw-r--r-- | src/modules/uORB/objects_common.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/modules/uORB/objects_common.cpp b/src/modules/uORB/objects_common.cpp index 4c84c1f25..fb24de8d1 100644 --- a/src/modules/uORB/objects_common.cpp +++ b/src/modules/uORB/objects_common.cpp @@ -190,3 +190,6 @@ ORB_DEFINE(navigation_capabilities, struct navigation_capabilities_s); #include "topics/esc_status.h" ORB_DEFINE(esc_status, struct esc_status_s); + +#include "topics/encoders.h" +ORB_DEFINE(encoders, struct encoders_s); |