dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

navigator comment fall through in case

This commit is contained in:
Daniel Agar 2017-01-04 14:38:10 -05:00
parent b1d537c603
commit 61e48e2286
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/navigator/mission_block.cpp
View File

@ -513,6 +513,8 @@ MissionBlock::mission_item_to_position_setpoint(const struct mission_item_s *ite
case NAV_CMD_TAKEOFF: case NAV_CMD_TAKEOFF:
// set pitch and ensure that the hold time is zero // set pitch and ensure that the hold time is zero
sp->pitch_min = item->pitch_min; sp->pitch_min = item->pitch_min;
// fall through
case NAV_CMD_VTOL_TAKEOFF: case NAV_CMD_VTOL_TAKEOFF:
sp->type = position_setpoint_s::SETPOINT_TYPE_TAKEOFF; sp->type = position_setpoint_s::SETPOINT_TYPE_TAKEOFF;
if(_navigator->get_vstatus()->is_vtol && _param_vtol_wv_takeoff.get()){ if(_navigator->get_vstatus()->is_vtol && _param_vtol_wv_takeoff.get()){
@ -532,7 +534,7 @@ MissionBlock::mission_item_to_position_setpoint(const struct mission_item_s *ite
// initially use current altitude, and switch to mission item altitude once in loiter position // initially use current altitude, and switch to mission item altitude once in loiter position
sp->alt = math::max(_navigator->get_global_position()->alt, _navigator->get_home_position()->alt + _param_loiter_min_alt.get()); sp->alt = math::max(_navigator->get_global_position()->alt, _navigator->get_home_position()->alt + _param_loiter_min_alt.get());
// no break // fall through
case NAV_CMD_LOITER_TIME_LIMIT: case NAV_CMD_LOITER_TIME_LIMIT:
case NAV_CMD_LOITER_UNLIMITED: case NAV_CMD_LOITER_UNLIMITED:
sp->type = position_setpoint_s::SETPOINT_TYPE_LOITER; sp->type = position_setpoint_s::SETPOINT_TYPE_LOITER;