aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJulian Oes <julian@oes.ch>2014-06-10 17:33:44 +0200
committerJulian Oes <julian@oes.ch>2014-06-10 17:33:44 +0200
commit9ba89e0cb262e1b926ed903299b93c6d3f40747d (patch)
treeb80ea1afcc52213e92af0bd24ea6286205dde54f /src
parent0697bb29a2aaf2f14e1a7477008b118a0696e54e (diff)
parent6f24afd68a840698a9a77b46bc8f1ca81cc1f5b9 (diff)
downloadpx4-firmware-9ba89e0cb262e1b926ed903299b93c6d3f40747d.tar.gz
px4-firmware-9ba89e0cb262e1b926ed903299b93c6d3f40747d.tar.bz2
px4-firmware-9ba89e0cb262e1b926ed903299b93c6d3f40747d.zip
Merge branch 'navigator_rewrite' into navigator_rewrite_estimator
Diffstat (limited to 'src')
-rw-r--r--src/modules/navigator/mission.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/modules/navigator/mission.cpp b/src/modules/navigator/mission.cpp
index db606e6fa..33a1399b1 100644
--- a/src/modules/navigator/mission.cpp
+++ b/src/modules/navigator/mission.cpp
@@ -84,6 +84,19 @@ void
Mission::reset()
{
_first_run = true;
+
+ /* check anyway if missions have changed so that feedback to groundstation is given */
+ bool onboard_updated;
+ orb_check(_navigator->get_onboard_mission_sub(), &onboard_updated);
+ if (onboard_updated) {
+ update_onboard_mission();
+ }
+
+ bool offboard_updated;
+ orb_check(_navigator->get_offboard_mission_sub(), &offboard_updated);
+ if (offboard_updated) {
+ update_offboard_mission();
+ }
}
bool
@@ -185,6 +198,7 @@ Mission::update_offboard_mission()
_offboard_mission.current_index = 0;
_current_offboard_mission_index = 0;
}
+ report_current_offboard_mission_item();
}