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/navigator | |
| 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/navigator')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 031545b8f..ca71aab70 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -510,7 +510,7 @@ Navigator::offboard_mission_update(bool isrotaryWing) { struct mission_s offboard_mission; - if (orb_copy(ORB_ID(mission), _offboard_mission_sub, &offboard_mission) == OK) { + if (orb_copy(ORB_ID(offboard_mission), _offboard_mission_sub, &offboard_mission) == OK) { /* Check mission feasibility, for now do not handle the return value, * however warnings are issued to the gcs via mavlink from inside the MissionFeasiblityChecker */ @@ -543,7 +543,7 @@ Navigator::onboard_mission_update() { struct mission_s onboard_mission; - if (orb_copy(ORB_ID(mission), _onboard_mission_sub, &onboard_mission) == OK) { + if (orb_copy(ORB_ID(onboard_mission), _onboard_mission_sub, &onboard_mission) == OK) { _mission.set_onboard_mission_count(onboard_mission.count); _mission.set_current_onboard_mission_index(onboard_mission.current_index); @@ -611,7 +611,7 @@ Navigator::task_main() * do subscriptions */ _global_pos_sub = orb_subscribe(ORB_ID(vehicle_global_position)); - _offboard_mission_sub = orb_subscribe(ORB_ID(mission)); + _offboard_mission_sub = orb_subscribe(ORB_ID(offboard_mission)); _onboard_mission_sub = orb_subscribe(ORB_ID(onboard_mission)); _capabilities_sub = orb_subscribe(ORB_ID(navigation_capabilities)); _vstatus_sub = orb_subscribe(ORB_ID(vehicle_status)); |