diff options
| author | px4dev <px4@purgatory.org> | 2013-01-19 13:17:28 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-19 13:17:28 -0800 |
| commit | c1a1207b9a8636b136197b2b92bbf914f7a928cc (patch) | |
| tree | 702e4d46cefd1edf6aa1e4ba1b4d6a2e4d5d52ff /apps/commander/commander.c | |
| parent | 7eb7836d2db3fa30b65f5ae72054b3fdc3582a6c (diff) | |
| parent | effc3001f4bcc5a2e2510ee5d16e44b1e8188911 (diff) | |
| download | px4-firmware-c1a1207b9a8636b136197b2b92bbf914f7a928cc.tar.gz px4-firmware-c1a1207b9a8636b136197b2b92bbf914f7a928cc.tar.bz2 px4-firmware-c1a1207b9a8636b136197b2b92bbf914f7a928cc.zip | |
Merge pull request #171 from PX4/fault_detection
Attitude / position estimation and controller improvements
Diffstat (limited to 'apps/commander/commander.c')
| -rw-r--r-- | apps/commander/commander.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/commander/commander.c b/apps/commander/commander.c index 103c53dc6..7654b3426 100644 --- a/apps/commander/commander.c +++ b/apps/commander/commander.c @@ -1850,15 +1850,16 @@ int commander_thread_main(int argc, char *argv[]) update_state_machine_mode_manual(stat_pub, ¤t_status, mavlink_fd); } else if (sp_man.manual_override_switch < -STICK_ON_OFF_LIMIT) { - /* check auto mode switch for correct mode */ - if (sp_man.auto_mode_switch > STICK_ON_OFF_LIMIT) { - /* enable guided mode */ - update_state_machine_mode_guided(stat_pub, ¤t_status, mavlink_fd); + // /* check auto mode switch for correct mode */ + // if (sp_man.auto_mode_switch > STICK_ON_OFF_LIMIT) { + // /* enable guided mode */ + // update_state_machine_mode_guided(stat_pub, ¤t_status, mavlink_fd); - } else if (sp_man.auto_mode_switch < -STICK_ON_OFF_LIMIT) { + // } else if (sp_man.auto_mode_switch < -STICK_ON_OFF_LIMIT) { + // XXX hardcode to auto for now update_state_machine_mode_auto(stat_pub, ¤t_status, mavlink_fd); - } + // } } else { /* center stick position, set SAS for all vehicle types */ |