aboutsummaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-02-01 19:03:45 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-02-01 19:03:45 +0100
commitdd7c198268836b06119a6127601a93cf152f288e (patch)
tree7d1b06e3c23cc49724cba5b94531a5c27a8812f2 /src/modules
parentaa5d8a8732b1bed690360c25d725f2c13458528a (diff)
parente1356f69b4a0c6c5cc8eaacb83f7c2791406d747 (diff)
downloadpx4-firmware-dd7c198268836b06119a6127601a93cf152f288e.tar.gz
px4-firmware-dd7c198268836b06119a6127601a93cf152f288e.tar.bz2
px4-firmware-dd7c198268836b06119a6127601a93cf152f288e.zip
Merged master into beta
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/commander/commander.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index aca3f6256..40117b7a1 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -1475,7 +1475,7 @@ check_mode_switches(struct manual_control_setpoint_s *sp_man, struct vehicle_sta
{
/* main mode switch */
if (!isfinite(sp_man->mode_switch)) {
- warnx("mode sw not finite");
+ /* default to manual if signal is invalid */
status->mode_switch = MODE_SWITCH_MANUAL;
} else if (sp_man->mode_switch > STICK_ON_OFF_LIMIT) {