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
c6c2a2b8
Commit
c6c2a2b8
authored
Apr 05, 2018
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set video capture status for missions
parent
a792ad5c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
14 deletions
+9
-14
CameraSection.cc
src/MissionManager/CameraSection.cc
+6
-6
CameraSection.h
src/MissionManager/CameraSection.h
+2
-0
CameraSectionTest.cc
src/MissionManager/CameraSectionTest.cc
+1
-8
No files found.
src/MissionManager/CameraSection.cc
View file @
c6c2a2b8
...
...
@@ -180,11 +180,11 @@ void CameraSection::appendSectionItems(QList<MissionItem*>& items, QObject* miss
item
=
new
MissionItem
(
nextSequenceNumber
++
,
MAV_CMD_VIDEO_START_CAPTURE
,
MAV_FRAME_MISSION
,
0
,
// Reserved (Set to 0)
0
,
// No CAMERA_CAPTURE_STATUS streaming
NAN
,
NAN
,
NAN
,
NAN
,
NAN
,
// param 3-7 reserved
true
,
// autoContinue
false
,
// isCurrentItem
0
,
// Reserved (Set to 0)
VIDEO_CAPTURE_STATUS_INTERVAL
,
// CAMERA_CAPTURE_STATUS (default to every 5 seconds)
NAN
,
NAN
,
NAN
,
NAN
,
NAN
,
// param 3-7 reserved
true
,
// autoContinue
false
,
// isCurrentItem
missionItemParent
);
break
;
...
...
@@ -360,7 +360,7 @@ bool CameraSection::_scanTakeVideo(QmlObjectListModel* visualItems, int scanInde
if
(
item
)
{
MissionItem
&
missionItem
=
item
->
missionItem
();
if
((
MAV_CMD
)
item
->
command
()
==
MAV_CMD_VIDEO_START_CAPTURE
)
{
if
(
missionItem
.
param1
()
==
0
&&
missionItem
.
param2
()
==
0
)
{
if
(
missionItem
.
param1
()
==
0
&&
missionItem
.
param2
()
==
VIDEO_CAPTURE_STATUS_INTERVAL
)
{
cameraAction
()
->
setRawValue
(
TakeVideo
);
visualItems
->
removeAt
(
scanIndex
)
->
deleteLater
();
return
true
;
...
...
src/MissionManager/CameraSection.h
View file @
c6c2a2b8
...
...
@@ -14,6 +14,8 @@
#include "MissionItem.h"
#include "Fact.h"
#define VIDEO_CAPTURE_STATUS_INTERVAL 0.2 //-- Send capture status every 5 seconds
class
CameraSection
:
public
Section
{
Q_OBJECT
...
...
src/MissionManager/CameraSectionTest.cc
View file @
c6c2a2b8
...
...
@@ -70,7 +70,7 @@ void CameraSectionTest::init(void)
MAV_CMD_VIDEO_START_CAPTURE
,
MAV_FRAME_MISSION
,
0
,
// Reserved (Set to 0)
0
,
// No CAMERA_CAPTURE_STATUS streaming
VIDEO_CAPTURE_STATUS_INTERVAL
,
// CAMERA_CAPTURE_STATUS (default to every 5 seconds)
NAN
,
NAN
,
NAN
,
NAN
,
NAN
,
// param 3-7 reserved
true
,
// autocontinue
false
),
// isCurrentItem
...
...
@@ -896,13 +896,6 @@ void CameraSectionTest::_testScanForStartVideoSection(void)
QCOMPARE
(
_cameraSection
->
settingsSpecified
(),
false
);
visualItems
.
clear
();
invalidSimpleItem
.
missionItem
()
=
_validStartVideoItem
->
missionItem
();
invalidSimpleItem
.
missionItem
().
setParam2
(
10
);
// must be 0
visualItems
.
append
(
&
invalidSimpleItem
);
QCOMPARE
(
_cameraSection
->
scanForSection
(
&
visualItems
,
scanIndex
),
false
);
QCOMPARE
(
visualItems
.
count
(),
1
);
QCOMPARE
(
_cameraSection
->
settingsSpecified
(),
false
);
visualItems
.
clear
();
}
void
CameraSectionTest
::
_testScanForStopVideoSection
(
void
)
...
...
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