diff options
| author | TickTock- <lukecell@safe-mail.net> | 2014-04-27 13:12:28 -0700 |
|---|---|---|
| committer | TickTock- <lukecell@safe-mail.net> | 2014-04-27 13:12:28 -0700 |
| commit | 6a7b104c2baad7527d35736979ddd1352bf4119d (patch) | |
| tree | 5ce1b86a08812b4a0485277dfaee741d1d56a837 /src/modules/commander | |
| parent | 07c35010aaee59fbed21824c20666bda9c340705 (diff) | |
| download | px4-firmware-6a7b104c2baad7527d35736979ddd1352bf4119d.tar.gz px4-firmware-6a7b104c2baad7527d35736979ddd1352bf4119d.tar.bz2 px4-firmware-6a7b104c2baad7527d35736979ddd1352bf4119d.zip | |
compiles
Diffstat (limited to 'src/modules/commander')
| -rw-r--r-- | src/modules/commander/commander.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index d5f05c991..50380107d 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -1228,11 +1228,8 @@ int commander_thread_main(int argc, char *argv[]) status.set_nav_state_timestamp = hrt_absolute_time(); } else { -<<<<<<< HEAD + /* LOITER switch */ -======= - /* MISSION switch */ ->>>>>>> ad77ba26427aa9a2d8b8241fc95271667a1c0863 if (sp_man.loiter_switch == SWITCH_POS_ON) { /* stick is in LOITER position */ status.set_nav_state = NAV_STATE_LOITER; |