diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-10-05 10:55:12 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-10-05 10:55:12 +0200 |
| commit | 3cebfd40453cc730c298d27790b9492a64f179e0 (patch) | |
| tree | d581550c02af9c682ff30a30645121073ae8befd /src/modules/navigator/navigator_mode.cpp | |
| parent | 70e5d4027a3b1465d5128dbf9a04cbb6545e043d (diff) | |
| parent | 63b7fac10cf4d43e3df7e692336be869a4c124cc (diff) | |
| download | px4-firmware-3cebfd40453cc730c298d27790b9492a64f179e0.tar.gz px4-firmware-3cebfd40453cc730c298d27790b9492a64f179e0.tar.bz2 px4-firmware-3cebfd40453cc730c298d27790b9492a64f179e0.zip | |
Merge remote-tracking branch 'upstream/master' into takeoff_fix
Conflicts:
src/modules/navigator/mission.cpp
Diffstat (limited to 'src/modules/navigator/navigator_mode.cpp')
| -rw-r--r-- | src/modules/navigator/navigator_mode.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/modules/navigator/navigator_mode.cpp b/src/modules/navigator/navigator_mode.cpp index f43215665..3807c5ea8 100644 --- a/src/modules/navigator/navigator_mode.cpp +++ b/src/modules/navigator/navigator_mode.cpp @@ -43,7 +43,7 @@ #include "navigator.h" NavigatorMode::NavigatorMode(Navigator *navigator, const char *name) : - SuperBlock(NULL, name), + SuperBlock(navigator, name), _navigator(navigator), _first_run(true) { @@ -63,6 +63,9 @@ NavigatorMode::run(bool active) { if (_first_run) { /* first run */ _first_run = false; + /* Reset stay in failsafe flag */ + _navigator->get_mission_result()->stay_in_failsafe = false; + _navigator->publish_mission_result(); on_activation(); } else { |