mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-18 02:13:33 +08:00
Navigator: allow executing a disarm command during a mission
This commit is contained in:
committed by
Silvan Fuhrer
parent
e1167f0888
commit
4abe2d1dab
@@ -263,6 +263,7 @@ bool FeasibilityChecker::checkMissionItemValidity(mission_item_s &mission_item,
|
||||
mission_item.nav_cmd != NAV_CMD_DO_LAND_START &&
|
||||
mission_item.nav_cmd != NAV_CMD_DO_TRIGGER_CONTROL &&
|
||||
mission_item.nav_cmd != NAV_CMD_DO_DIGICAM_CONTROL &&
|
||||
mission_item.nav_cmd != NAV_CMD_COMPONENT_ARM_DISARM &&
|
||||
mission_item.nav_cmd != NAV_CMD_IMAGE_START_CAPTURE &&
|
||||
mission_item.nav_cmd != NAV_CMD_IMAGE_STOP_CAPTURE &&
|
||||
mission_item.nav_cmd != NAV_CMD_VIDEO_START_CAPTURE &&
|
||||
|
||||
@@ -82,6 +82,7 @@ MissionBlock::is_mission_item_reached_or_completed()
|
||||
case NAV_CMD_DO_MOUNT_CONFIGURE:
|
||||
case NAV_CMD_DO_MOUNT_CONTROL:
|
||||
case NAV_CMD_DO_GIMBAL_MANAGER_CONFIGURE:
|
||||
case NAV_CMD_COMPONENT_ARM_DISARM:
|
||||
case NAV_CMD_DO_SET_ROI:
|
||||
case NAV_CMD_DO_SET_ROI_LOCATION:
|
||||
case NAV_CMD_DO_SET_ROI_WPNEXT_OFFSET:
|
||||
@@ -95,6 +96,7 @@ MissionBlock::is_mission_item_reached_or_completed()
|
||||
case NAV_CMD_SET_CAMERA_FOCUS:
|
||||
case NAV_CMD_DO_CHANGE_SPEED:
|
||||
case NAV_CMD_DO_SET_HOME:
|
||||
|
||||
return true;
|
||||
|
||||
// Indefinite Waypoints
|
||||
|
||||
@@ -76,6 +76,7 @@ enum NAV_CMD {
|
||||
NAV_CMD_DO_SET_CAM_TRIGG_INTERVAL = 214,
|
||||
NAV_CMD_DO_SET_CAM_TRIGG_DIST = 206,
|
||||
NAV_CMD_OBLIQUE_SURVEY = 260,
|
||||
NAV_CMD_COMPONENT_ARM_DISARM = 400,
|
||||
NAV_CMD_SET_CAMERA_MODE = 530,
|
||||
NAV_CMD_SET_CAMERA_SOURCE = 534,
|
||||
NAV_CMD_SET_CAMERA_ZOOM = 531,
|
||||
|
||||
Reference in New Issue
Block a user