mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-06-04 13:15:08 +08:00
mission: add NAV_CMD_DO_SET_ROI & NAV_CMD_ROI
This commit is contained in:
@@ -983,6 +983,8 @@ MavlinkMissionManager::parse_mavlink_mission_item(const mavlink_mission_item_t *
|
|||||||
case MAV_CMD_DO_DIGICAM_CONTROL:
|
case MAV_CMD_DO_DIGICAM_CONTROL:
|
||||||
case MAV_CMD_DO_MOUNT_CONFIGURE:
|
case MAV_CMD_DO_MOUNT_CONFIGURE:
|
||||||
case MAV_CMD_DO_MOUNT_CONTROL:
|
case MAV_CMD_DO_MOUNT_CONTROL:
|
||||||
|
case NAV_CMD_DO_SET_ROI:
|
||||||
|
case NAV_CMD_ROI:
|
||||||
case MAV_CMD_DO_SET_CAM_TRIGG_DIST:
|
case MAV_CMD_DO_SET_CAM_TRIGG_DIST:
|
||||||
case MAV_CMD_DO_VTOL_TRANSITION:
|
case MAV_CMD_DO_VTOL_TRANSITION:
|
||||||
mission_item->nav_cmd = (NAV_CMD)mavlink_mission_item->command;
|
mission_item->nav_cmd = (NAV_CMD)mavlink_mission_item->command;
|
||||||
@@ -1040,6 +1042,8 @@ MavlinkMissionManager::format_mavlink_mission_item(const struct mission_item_s *
|
|||||||
case NAV_CMD_DO_DIGICAM_CONTROL:
|
case NAV_CMD_DO_DIGICAM_CONTROL:
|
||||||
case NAV_CMD_DO_MOUNT_CONFIGURE:
|
case NAV_CMD_DO_MOUNT_CONFIGURE:
|
||||||
case NAV_CMD_DO_MOUNT_CONTROL:
|
case NAV_CMD_DO_MOUNT_CONTROL:
|
||||||
|
case NAV_CMD_DO_SET_ROI:
|
||||||
|
case NAV_CMD_ROI:
|
||||||
case NAV_CMD_DO_SET_CAM_TRIGG_DIST:
|
case NAV_CMD_DO_SET_CAM_TRIGG_DIST:
|
||||||
case NAV_CMD_DO_VTOL_TRANSITION:
|
case NAV_CMD_DO_VTOL_TRANSITION:
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -106,6 +106,8 @@ MissionBlock::is_mission_item_reached()
|
|||||||
case NAV_CMD_DO_DIGICAM_CONTROL:
|
case NAV_CMD_DO_DIGICAM_CONTROL:
|
||||||
case NAV_CMD_DO_MOUNT_CONFIGURE:
|
case NAV_CMD_DO_MOUNT_CONFIGURE:
|
||||||
case NAV_CMD_DO_MOUNT_CONTROL:
|
case NAV_CMD_DO_MOUNT_CONTROL:
|
||||||
|
case NAV_CMD_DO_SET_ROI:
|
||||||
|
case NAV_CMD_ROI:
|
||||||
case NAV_CMD_DO_SET_CAM_TRIGG_DIST:
|
case NAV_CMD_DO_SET_CAM_TRIGG_DIST:
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
@@ -404,6 +406,8 @@ MissionBlock::item_contains_position(const struct mission_item_s *item)
|
|||||||
item->nav_cmd == NAV_CMD_DO_DIGICAM_CONTROL ||
|
item->nav_cmd == NAV_CMD_DO_DIGICAM_CONTROL ||
|
||||||
item->nav_cmd == NAV_CMD_DO_MOUNT_CONFIGURE ||
|
item->nav_cmd == NAV_CMD_DO_MOUNT_CONFIGURE ||
|
||||||
item->nav_cmd == NAV_CMD_DO_MOUNT_CONTROL ||
|
item->nav_cmd == NAV_CMD_DO_MOUNT_CONTROL ||
|
||||||
|
item->nav_cmd == NAV_CMD_DO_SET_ROI ||
|
||||||
|
item->nav_cmd == NAV_CMD_ROI ||
|
||||||
item->nav_cmd == NAV_CMD_DO_SET_CAM_TRIGG_DIST ||
|
item->nav_cmd == NAV_CMD_DO_SET_CAM_TRIGG_DIST ||
|
||||||
item->nav_cmd == NAV_CMD_DO_VTOL_TRANSITION) {
|
item->nav_cmd == NAV_CMD_DO_VTOL_TRANSITION) {
|
||||||
|
|
||||||
|
|||||||
@@ -250,6 +250,8 @@ bool MissionFeasibilityChecker::checkMissionItemValidity(dm_item_t dm_current, s
|
|||||||
missionitem.nav_cmd != NAV_CMD_DO_DIGICAM_CONTROL &&
|
missionitem.nav_cmd != NAV_CMD_DO_DIGICAM_CONTROL &&
|
||||||
missionitem.nav_cmd != NAV_CMD_DO_MOUNT_CONFIGURE &&
|
missionitem.nav_cmd != NAV_CMD_DO_MOUNT_CONFIGURE &&
|
||||||
missionitem.nav_cmd != NAV_CMD_DO_MOUNT_CONTROL &&
|
missionitem.nav_cmd != NAV_CMD_DO_MOUNT_CONTROL &&
|
||||||
|
missionitem.nav_cmd != NAV_CMD_DO_SET_ROI &&
|
||||||
|
missionitem.nav_cmd != NAV_CMD_ROI &&
|
||||||
missionitem.nav_cmd != NAV_CMD_DO_SET_CAM_TRIGG_DIST &&
|
missionitem.nav_cmd != NAV_CMD_DO_SET_CAM_TRIGG_DIST &&
|
||||||
missionitem.nav_cmd != NAV_CMD_DO_VTOL_TRANSITION) {
|
missionitem.nav_cmd != NAV_CMD_DO_VTOL_TRANSITION) {
|
||||||
|
|
||||||
|
|||||||
@@ -59,11 +59,13 @@ enum NAV_CMD {
|
|||||||
NAV_CMD_TAKEOFF = 22,
|
NAV_CMD_TAKEOFF = 22,
|
||||||
NAV_CMD_LOITER_TO_ALT = 31,
|
NAV_CMD_LOITER_TO_ALT = 31,
|
||||||
NAV_CMD_DO_FOLLOW_REPOSITION = 33,
|
NAV_CMD_DO_FOLLOW_REPOSITION = 33,
|
||||||
|
NAV_CMD_ROI = 80,
|
||||||
NAV_CMD_VTOL_TAKEOFF = 84,
|
NAV_CMD_VTOL_TAKEOFF = 84,
|
||||||
NAV_CMD_VTOL_LAND = 85,
|
NAV_CMD_VTOL_LAND = 85,
|
||||||
NAV_CMD_DO_JUMP = 177,
|
NAV_CMD_DO_JUMP = 177,
|
||||||
NAV_CMD_DO_CHANGE_SPEED = 178,
|
NAV_CMD_DO_CHANGE_SPEED = 178,
|
||||||
NAV_CMD_DO_SET_SERVO=183,
|
NAV_CMD_DO_SET_SERVO=183,
|
||||||
|
NAV_CMD_DO_SET_ROI=201,
|
||||||
NAV_CMD_DO_DIGICAM_CONTROL=203,
|
NAV_CMD_DO_DIGICAM_CONTROL=203,
|
||||||
NAV_CMD_DO_MOUNT_CONFIGURE=204,
|
NAV_CMD_DO_MOUNT_CONFIGURE=204,
|
||||||
NAV_CMD_DO_MOUNT_CONTROL=205,
|
NAV_CMD_DO_MOUNT_CONTROL=205,
|
||||||
|
|||||||
Reference in New Issue
Block a user