diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-09 11:21:39 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-09 11:21:39 +0200 |
| commit | 629e73bcf44f820f1936521d6c65cc481792ce5a (patch) | |
| tree | af754381c45f00a56395cb5eede91e9d3280c43b /src/modules/uORB/objects_common.cpp | |
| parent | 4b9f9281f5d2b425f0de83801eb38224395c0f12 (diff) | |
| parent | 0054eb23d857844ebae34a7d198fc60e538ccd3c (diff) | |
| download | px4-firmware-629e73bcf44f820f1936521d6c65cc481792ce5a.tar.gz px4-firmware-629e73bcf44f820f1936521d6c65cc481792ce5a.tar.bz2 px4-firmware-629e73bcf44f820f1936521d6c65cc481792ce5a.zip | |
Merged master into vision_estimate
Diffstat (limited to 'src/modules/uORB/objects_common.cpp')
| -rw-r--r-- | src/modules/uORB/objects_common.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/modules/uORB/objects_common.cpp b/src/modules/uORB/objects_common.cpp index c180b1cee..7b1b162a0 100644 --- a/src/modules/uORB/objects_common.cpp +++ b/src/modules/uORB/objects_common.cpp @@ -75,6 +75,9 @@ ORB_DEFINE(sensor_combined, struct sensor_combined_s); #include "topics/vehicle_gps_position.h" ORB_DEFINE(vehicle_gps_position, struct vehicle_gps_position_s); +#include "topics/satellite_info.h" +ORB_DEFINE(satellite_info, struct satellite_info_s); + #include "topics/home_position.h" ORB_DEFINE(home_position, struct home_position_s); @@ -183,7 +186,10 @@ ORB_DEFINE(actuator_outputs_2, struct actuator_outputs_s); ORB_DEFINE(actuator_outputs_3, struct actuator_outputs_s); #include "topics/telemetry_status.h" -ORB_DEFINE(telemetry_status, struct telemetry_status_s); +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/debug_key_value.h" ORB_DEFINE(debug_key_value, struct debug_key_value_s); @@ -203,6 +209,9 @@ 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); + #include "topics/tecs_status.h" ORB_DEFINE(tecs_status, struct tecs_status_s); |