diff options
| author | mazahner <mazahner@student.ethz.ch> | 2014-11-10 17:39:04 +0100 |
|---|---|---|
| committer | mazahner <mazahner@student.ethz.ch> | 2014-11-10 17:39:04 +0100 |
| commit | 6ec08335459457c82158d2df06050bd30fb8cc59 (patch) | |
| tree | 3d5407b6bc88533eacedb3bebfc9e0c9b23609ea /src/modules/uORB/objects_common.cpp | |
| parent | d15203de91cc07530809060f949374bb8918daea (diff) | |
| parent | 4e8e6e653beb21808f532b83c6c6e827103ea379 (diff) | |
| download | px4-firmware-6ec08335459457c82158d2df06050bd30fb8cc59.tar.gz px4-firmware-6ec08335459457c82158d2df06050bd30fb8cc59.tar.bz2 px4-firmware-6ec08335459457c82158d2df06050bd30fb8cc59.zip | |
Merge branch 'master' of https://github.com/mazahner/Firmware
Diffstat (limited to 'src/modules/uORB/objects_common.cpp')
| -rw-r--r-- | src/modules/uORB/objects_common.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/modules/uORB/objects_common.cpp b/src/modules/uORB/objects_common.cpp index 08c3ce1ac..b91a00c1e 100644 --- a/src/modules/uORB/objects_common.cpp +++ b/src/modules/uORB/objects_common.cpp @@ -192,12 +192,18 @@ ORB_DEFINE(actuator_outputs_1, struct actuator_outputs_s); ORB_DEFINE(actuator_outputs_2, struct actuator_outputs_s); ORB_DEFINE(actuator_outputs_3, struct actuator_outputs_s); +#include "topics/multirotor_motor_limits.h" +ORB_DEFINE(multirotor_motor_limits, struct multirotor_motor_limits_s); + #include "topics/telemetry_status.h" ORB_DEFINE(telemetry_status_0, struct telemetry_status_s); ORB_DEFINE(telemetry_status_1, struct telemetry_status_s); ORB_DEFINE(telemetry_status_2, struct telemetry_status_s); ORB_DEFINE(telemetry_status_3, struct telemetry_status_s); +#include "topics/test_motor.h" +ORB_DEFINE(test_motor, struct test_motor_s); + #include "topics/debug_key_value.h" ORB_DEFINE(debug_key_value, struct debug_key_value_s); @@ -213,6 +219,9 @@ ORB_DEFINE(encoders, struct encoders_s); #include "topics/estimator_status.h" ORB_DEFINE(estimator_status, struct estimator_status_report); +#include "topics/vision_position_estimate.h" +ORB_DEFINE(vision_position_estimate, struct vision_position_estimate); + #include "topics/vehicle_force_setpoint.h" ORB_DEFINE(vehicle_force_setpoint, struct vehicle_force_setpoint_s); |