diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-20 20:10:39 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-20 20:10:39 +0200 |
| commit | 8634780e80f728ccbd4bc63860aeaa11727aeedb (patch) | |
| tree | 3c29da11c2e9bb2b931821f73cd581281790f47b /src/modules/uORB | |
| parent | 88149311ea687b62ba28e036e7de09ed2763f2bc (diff) | |
| parent | 0b85c41cd19486e829d48cf9e604fbc25b9e52a6 (diff) | |
| download | px4-firmware-8634780e80f728ccbd4bc63860aeaa11727aeedb.tar.gz px4-firmware-8634780e80f728ccbd4bc63860aeaa11727aeedb.tar.bz2 px4-firmware-8634780e80f728ccbd4bc63860aeaa11727aeedb.zip | |
Merge branch 'master' into mpc_rc
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/objects_common.cpp | 2 | ||||
| -rw-r--r-- | src/modules/uORB/topics/mission.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/uORB/objects_common.cpp b/src/modules/uORB/objects_common.cpp index c8a589bb7..90675bb2e 100644 --- a/src/modules/uORB/objects_common.cpp +++ b/src/modules/uORB/objects_common.cpp @@ -127,7 +127,7 @@ ORB_DEFINE(position_setpoint_triplet, struct position_setpoint_triplet_s); ORB_DEFINE(vehicle_global_velocity_setpoint, struct vehicle_global_velocity_setpoint_s); #include "topics/mission.h" -ORB_DEFINE(mission, struct mission_s); +ORB_DEFINE(offboard_mission, struct mission_s); ORB_DEFINE(onboard_mission, struct mission_s); #include "topics/mission_result.h" diff --git a/src/modules/uORB/topics/mission.h b/src/modules/uORB/topics/mission.h index 9594c4c6a..ef4bc1def 100644 --- a/src/modules/uORB/topics/mission.h +++ b/src/modules/uORB/topics/mission.h @@ -105,7 +105,7 @@ struct mission_s */ /* register this as object request broker structure */ -ORB_DECLARE(mission); +ORB_DECLARE(offboard_mission); ORB_DECLARE(onboard_mission); #endif |