aboutsummaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-10-09 09:24:47 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-10-09 09:24:47 +0200
commitfa194832ce136116b37ba8ce787b40efce53bc3d (patch)
tree4f9fb96d80bee181f782c1577146f0a1389d9ad8 /src/modules
parentd524b17164125415c831e38ec1e7db11a6ea97e1 (diff)
downloadpx4-firmware-fa194832ce136116b37ba8ce787b40efce53bc3d.tar.gz
px4-firmware-fa194832ce136116b37ba8ce787b40efce53bc3d.tar.bz2
px4-firmware-fa194832ce136116b37ba8ce787b40efce53bc3d.zip
mavlink: Handle new auto sub states.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/mavlink/mavlink_messages.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp
index a2f3828ff..c182cfdb9 100644
--- a/src/modules/mavlink/mavlink_messages.cpp
+++ b/src/modules/mavlink/mavlink_messages.cpp
@@ -162,6 +162,8 @@ void get_mavlink_mode_state(struct vehicle_status_s *status, struct position_set
break;
case NAVIGATION_STATE_AUTO_RTL:
+ /* fallthrough */
+ case NAVIGATION_STATE_AUTO_RCRECOVER:
*mavlink_base_mode |= MAV_MODE_FLAG_AUTO_ENABLED
| MAV_MODE_FLAG_STABILIZE_ENABLED
| MAV_MODE_FLAG_GUIDED_ENABLED;
@@ -170,6 +172,8 @@ void get_mavlink_mode_state(struct vehicle_status_s *status, struct position_set
break;
case NAVIGATION_STATE_LAND:
+ case NAVIGATION_STATE_AUTO_LANDENGFAIL:
+ case NAVIGATION_STATE_AUTO_LANDGPSFAIL:
/* fallthrough */
case NAVIGATION_STATE_DESCEND:
*mavlink_base_mode |= MAV_MODE_FLAG_AUTO_ENABLED