diff options
| author | Julian Oes <julian@oes.ch> | 2014-04-18 11:15:40 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-04-18 11:15:40 +0200 |
| commit | a4b10bab3042d653c5f59e704cb58008f7551401 (patch) | |
| tree | a3cbe2f0fa8b7ec1b3fd766ab69b802d254ece65 /src/modules/navigator | |
| parent | c77c5c878b05928d0817123e935af4941f653759 (diff) | |
| download | px4-firmware-a4b10bab3042d653c5f59e704cb58008f7551401.tar.gz px4-firmware-a4b10bab3042d653c5f59e704cb58008f7551401.tar.bz2 px4-firmware-a4b10bab3042d653c5f59e704cb58008f7551401.zip | |
navigator: wrong mission topic was copied, clearer naming of offboard mission now
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 5a94b6671..bcb3c8d0a 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)); |