fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-26 15:20:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rc_timeout' into mpc_rc

Browse Source
This commit is contained in:
Anton Babushkin
2014-04-24 22:40:46 +02:00
parent db474072a7 63c50676f9
commit 22aaae197b
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
+2 -2
View File
@@ -1277,12 +1277,12 @@ int commander_thread_main(int argc, char *argv[])
} else {
/* MISSION switch */
if (sp_man.mission_switch == SWITCH_POS_ON) {
if (sp_man.loiter_switch == SWITCH_POS_ON) {
/* stick is in LOITER position */
status.set_nav_state = NAV_STATE_LOITER;
status.set_nav_state_timestamp = hrt_absolute_time();
} else if (sp_man.mission_switch != SWITCH_POS_NONE) {
} else if (sp_man.loiter_switch != SWITCH_POS_NONE) {
/* stick is in MISSION position */
status.set_nav_state = NAV_STATE_MISSION;
status.set_nav_state_timestamp = hrt_absolute_time();