diff options
| author | Julian Oes <julian@oes.ch> | 2014-01-28 10:21:48 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-01-28 10:21:48 +0100 |
| commit | 6002819f8fccb491dcfbe23de892a827cd9f4618 (patch) | |
| tree | 3ea664892640ba55fcbba9e35ba50fe8e6047d9d /src/modules/navigator | |
| parent | cd9ec04904fa684f0ecddb3f2a4511346458fe8b (diff) | |
| download | px4-firmware-6002819f8fccb491dcfbe23de892a827cd9f4618.tar.gz px4-firmware-6002819f8fccb491dcfbe23de892a827cd9f4618.tar.bz2 px4-firmware-6002819f8fccb491dcfbe23de892a827cd9f4618.zip | |
Navigator: FSM bugfix and missing break
Diffstat (limited to 'src/modules/navigator')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 8cc2a1489..2a782ea03 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -989,8 +989,8 @@ StateTable::Tran const Navigator::myTable[MAX_STATE][MAX_EVENT] = { /* EVENT_MISSION_REQUESTED */ {ACTION(&Navigator::start_mission), STATE_MISSION}, /* EVENT_RTL_REQUESTED */ {ACTION(&Navigator::start_rtl), STATE_RTL}, /* EVENT_LAND_REQUESTED */ {NO_ACTION, STATE_LAND}, - /* EVENT_MISSION_CHANGED */ {NO_ACTION, STATE_RTL}, - /* EVENT_HOME_POSITION_CHANGED */ {ACTION(&Navigator::start_rtl), STATE_RTL}, + /* EVENT_MISSION_CHANGED */ {NO_ACTION, STATE_LAND}, + /* EVENT_HOME_POSITION_CHANGED */ {NO_ACTION, STATE_LAND}, }, }; @@ -1607,6 +1607,7 @@ Navigator::publish_control_mode() case MAIN_STATE_AUTO: navigator_enabled = true; + break; default: break; |