diff options
| author | Julian Oes <julian@oes.ch> | 2014-03-30 13:40:06 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-03-30 13:40:06 +0200 |
| commit | 5d3660b6a929f33ae18dfcb617c6879847637dac (patch) | |
| tree | 16eca446b5299d69eb46a9b7d266b88c5c65bd3a /src/modules/uORB/objects_common.cpp | |
| parent | 1d75f3eb8a1dba5b919c417b27a44e16ddcb0d32 (diff) | |
| parent | 60728bb6a6211407a1db12e7c015272cf998d928 (diff) | |
| download | px4-firmware-5d3660b6a929f33ae18dfcb617c6879847637dac.tar.gz px4-firmware-5d3660b6a929f33ae18dfcb617c6879847637dac.tar.bz2 px4-firmware-5d3660b6a929f33ae18dfcb617c6879847637dac.zip | |
Merge remote-tracking branch 'px4/paul_estimator_numeric' into test_bottle_drop_paul
Conflicts:
src/modules/uORB/topics/vehicle_command.h
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 fb24de8d1..4b31cc8a4 100644 --- a/src/modules/uORB/objects_common.cpp +++ b/src/modules/uORB/objects_common.cpp @@ -193,3 +193,6 @@ ORB_DEFINE(esc_status, struct esc_status_s); #include "topics/encoders.h" ORB_DEFINE(encoders, struct encoders_s); + +#include "topics/estimator_status.h" +ORB_DEFINE(estimator_status, struct estimator_status_report); |