Skip to content

Q
qgroundcontrol
Commit 173f35ac authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #4968 from DonLakeFlyer/HoverAndCapture 

Add MAV_CMD_NAV_DELAY to hover and capture
parents 12109fad b857ec48
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
src/MissionManager/MavCmdInfoCommon.json
View file @ 173f35ac
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
} }
}, },
{ {
"id": 94, "id": 93,
"rawName": "MAV_CMD_NAV_DELAY", "rawName": "MAV_CMD_NAV_DELAY",
"friendlyName": "Delay until", "friendlyName": "Delay until",
"description": "Delay unti the specified time is reached.", "description": "Delay unti the specified time is reached.",
......
src/MissionManager/SurveyMissionItem.cc
View file @ 173f35ac
...@@ -853,8 +853,6 @@ int SurveyMissionItem::_appendWaypointToMission(QList<MissionItem*>& items, int ...@@ -853,8 +853,6 @@ int SurveyMissionItem::_appendWaypointToMission(QList<MissionItem*>& items, int
false, // isCurrentItem false, // isCurrentItem
missionItemParent); missionItemParent);
items.append(item); items.append(item);
#if 0
// Not yet supported by firmware
item = new MissionItem(seqNum++, item = new MissionItem(seqNum++,
MAV_CMD_NAV_DELAY, MAV_CMD_NAV_DELAY,
MAV_FRAME_MISSION, MAV_FRAME_MISSION,
...@@ -865,7 +863,6 @@ int SurveyMissionItem::_appendWaypointToMission(QList<MissionItem*>& items, int ...@@ -865,7 +863,6 @@ int SurveyMissionItem::_appendWaypointToMission(QList<MissionItem*>& items, int
false, // isCurrentItem false, // isCurrentItem
missionItemParent); missionItemParent);
items.append(item); items.append(item);
#endif
default: default:
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment