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
ac65f8e4
Unverified
Commit
ac65f8e4
authored
Dec 28, 2019
by
Don Gagne
Committed by
GitHub
Dec 28, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8189 from DonLakeFlyer/TakePhoto
Fix MAV_CMD_IMAGE_START_CAPTURE usage
parents
0903b2e2
87dd077f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
CameraSection.cc
src/MissionManager/CameraSection.cc
+7
-6
CameraSectionTest.cc
src/MissionManager/CameraSectionTest.cc
+3
-2
No files found.
src/MissionManager/CameraSection.cc
View file @
ac65f8e4
...
...
@@ -200,12 +200,13 @@ void CameraSection::appendSectionItems(QList<MissionItem*>& items, QObject* miss
item
=
new
MissionItem
(
nextSequenceNumber
++
,
MAV_CMD_IMAGE_START_CAPTURE
,
MAV_FRAME_MISSION
,
0
,
// Reserved (Set to 0)
0
,
// Interval (none)
1
,
// Take 1 photo
qQNaN
(),
qQNaN
(),
qQNaN
(),
qQNaN
(),
// reserved
true
,
// autoContinue
false
,
// isCurrentItem
0
,
// Reserved (Set to 0)
0
,
// Interval (none)
1
,
// Take 1 photo
0
,
// No sequence number specified
qQNaN
(),
qQNaN
(),
qQNaN
(),
// reserved
true
,
// autoContinue
false
,
// isCurrentItem
missionItemParent
);
break
;
}
...
...
src/MissionManager/CameraSectionTest.cc
View file @
ac65f8e4
...
...
@@ -113,7 +113,8 @@ void CameraSectionTest::init(void)
0
,
// Reserved (Set to 0)
0
,
// Interval (none)
1
,
// Take 1 photo
NAN
,
NAN
,
NAN
,
NAN
,
// param 4-7 reserved
0
,
// Sequence id not used
NAN
,
NAN
,
NAN
,
// param 5-7 reserved
true
,
// autoContinue
false
),
// isCurrentItem
this
);
...
...
@@ -975,7 +976,7 @@ void CameraSectionTest::_testScanForTakePhotoSection(void)
Mission Param #1 Reserved (Set to 0)
Mission Param #2 Duration between two consecutive pictures (in seconds)
Mission Param #3 Number of images to capture total - 0 for unlimited capture
Mission Param #4
Reserve
d
Mission Param #4
0 Unused sequence i
d
*/
SimpleMissionItem
*
newValidTakePhotoItem
=
new
SimpleMissionItem
(
_offlineVehicle
,
false
/* flyView */
,
this
);
...
...
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