Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
f8bb0a63
Commit
f8bb0a63
authored
Aug 24, 2017
by
Gus Grubba
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Stable_V3.2' of
https://github.com/mavlink/qgroundcontrol
into cameraControl
parents
d3f3230a
9e426b02
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
MissionManager.cc
src/MissionManager/MissionManager.cc
+14
-8
AppMessages.qml
src/QmlControls/AppMessages.qml
+3
-0
No files found.
src/MissionManager/MissionManager.cc
View file @
f8bb0a63
...
...
@@ -1006,7 +1006,6 @@ void MissionManager::generateResumeMission(int resumeIndex)
}
resumeIndex
=
qMax
(
0
,
resumeIndex
);
int
seqNum
=
0
;
QList
<
MissionItem
*>
resumeMission
;
QList
<
MAV_CMD
>
includedResumeCommands
;
...
...
@@ -1029,7 +1028,6 @@ void MissionManager::generateResumeMission(int resumeIndex)
<<
MAV_CMD_NAV_TAKEOFF
;
bool
addHomePosition
=
_vehicle
->
firmwarePlugin
()
->
sendHomePositionToVehicle
();
int
setCurrentIndex
=
addHomePosition
?
1
:
0
;
int
prefixCommandCount
=
0
;
for
(
int
i
=
0
;
i
<
_missionItems
.
count
();
i
++
)
{
...
...
@@ -1039,8 +1037,7 @@ void MissionManager::generateResumeMission(int resumeIndex)
prefixCommandCount
++
;
}
MissionItem
*
newItem
=
new
MissionItem
(
*
oldItem
,
this
);
newItem
->
setIsCurrentItem
(
i
==
setCurrentIndex
);
newItem
->
setSequenceNumber
(
seqNum
++
);
newItem
->
setIsCurrentItem
(
false
);
resumeMission
.
append
(
newItem
);
}
}
...
...
@@ -1079,12 +1076,13 @@ void MissionManager::generateResumeMission(int resumeIndex)
foundCameraStartStop
=
true
;
break
;
case
MAV_CMD_IMAGE_START_CAPTURE
:
// Only keep the first of these commands that are found
if
(
foundCameraStartStop
)
{
if
(
resumeItem
->
param3
()
!=
0
)
{
// Remove commands which do not trigger by time
resumeMission
.
removeAt
(
prefixCommandCount
);
break
;
}
if
(
resumeItem
->
param3
()
!=
0
)
{
//
Remove commands which do no trigger by time
if
(
foundCameraStartStop
)
{
//
Only keep the first of these commands that are found
resumeMission
.
removeAt
(
prefixCommandCount
);
}
foundCameraStartStop
=
true
;
...
...
@@ -1096,6 +1094,14 @@ void MissionManager::generateResumeMission(int resumeIndex)
prefixCommandCount
--
;
}
// Adjust sequence numbers and current item
int
seqNum
=
0
;
for
(
int
i
=
0
;
i
<
resumeMission
.
count
();
i
++
)
{
resumeMission
[
i
]
->
setSequenceNumber
(
seqNum
++
);
}
int
setCurrentIndex
=
addHomePosition
?
1
:
0
;
resumeMission
[
setCurrentIndex
]
->
setIsCurrentItem
(
true
);
// Send to vehicle
_clearAndDeleteWriteMissionItems
();
for
(
int
i
=
0
;
i
<
resumeMission
.
count
();
i
++
)
{
...
...
src/QmlControls/AppMessages.qml
View file @
f8bb0a63
...
...
@@ -24,6 +24,8 @@ QGCView {
property
bool
loaded
:
false
property
var
_qgcView
:
qgcView
QGCPalette
{
id
:
qgcPal
;
colorGroupEnabled
:
panel
.
enabled
}
Component
{
...
...
@@ -117,6 +119,7 @@ QGCView {
nameFilters
:
[
qsTr
(
"
Log files (*.txt)
"
),
qsTr
(
"
All Files (*)
"
)]
selectExisting
:
false
title
:
qsTr
(
"
Select log save file
"
)
qgcView
:
_qgcView
onAcceptedForSave
:
{
debugMessageModel
.
writeMessages
(
file
);
visible
=
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment