diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-20 14:28:05 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-20 14:28:05 +0200 |
| commit | 5fb2a92e7704c2e298128addf890722b6b03289a (patch) | |
| tree | 7ae4b68629f430a2a2124d60a571fa3ff2432c15 /src/modules/commander/commander.cpp | |
| parent | 4c0e229347be585a917e944aed5dae7f31f86a73 (diff) | |
| download | px4-firmware-5fb2a92e7704c2e298128addf890722b6b03289a.tar.gz px4-firmware-5fb2a92e7704c2e298128addf890722b6b03289a.tar.bz2 px4-firmware-5fb2a92e7704c2e298128addf890722b6b03289a.zip | |
commander: Do not confuse developers with wrong comments, do not confuse users with not at all helpful "general error" messages.
Diffstat (limited to 'src/modules/commander/commander.cpp')
| -rw-r--r-- | src/modules/commander/commander.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 04450a44f..48cbc254f 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -1407,8 +1407,12 @@ int commander_thread_main(int argc, char *argv[]) arming_state_changed = true; } else if (arming_ret == TRANSITION_DENIED) { - /* DENIED here indicates bug in the commander */ - mavlink_log_critical(mavlink_fd, "arming state transition denied"); + /* + * the arming transition can be denied to a number of reasons: + * - pre-flight check failed (sensors not ok or not calibrated) + * - safety not disabled + * - system not in manual mode + */ tune_negative(true); } |