Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
c6c2a2b8
Commit
c6c2a2b8
authored
Apr 05, 2018
by
Gus Grubba
Browse files
Set video capture status for missions
parent
a792ad5c
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/MissionManager/CameraSection.cc
View file @
c6c2a2b8
...
@@ -180,11 +180,11 @@ void CameraSection::appendSectionItems(QList<MissionItem*>& items, QObject* miss
...
@@ -180,11 +180,11 @@ void CameraSection::appendSectionItems(QList<MissionItem*>& items, QObject* miss
item
=
new
MissionItem
(
nextSequenceNumber
++
,
item
=
new
MissionItem
(
nextSequenceNumber
++
,
MAV_CMD_VIDEO_START_CAPTURE
,
MAV_CMD_VIDEO_START_CAPTURE
,
MAV_FRAME_MISSION
,
MAV_FRAME_MISSION
,
0
,
// Reserved (Set to 0)
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
NAN
,
NAN
,
NAN
,
NAN
,
NAN
,
// param 3-7 reserved
true
,
// autoContinue
true
,
// autoContinue
false
,
// isCurrentItem
false
,
// isCurrentItem
missionItemParent
);
missionItemParent
);
break
;
break
;
...
@@ -360,7 +360,7 @@ bool CameraSection::_scanTakeVideo(QmlObjectListModel* visualItems, int scanInde
...
@@ -360,7 +360,7 @@ bool CameraSection::_scanTakeVideo(QmlObjectListModel* visualItems, int scanInde
if
(
item
)
{
if
(
item
)
{
MissionItem
&
missionItem
=
item
->
missionItem
();
MissionItem
&
missionItem
=
item
->
missionItem
();
if
((
MAV_CMD
)
item
->
command
()
==
MAV_CMD_VIDEO_START_CAPTURE
)
{
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
);
cameraAction
()
->
setRawValue
(
TakeVideo
);
visualItems
->
removeAt
(
scanIndex
)
->
deleteLater
();
visualItems
->
removeAt
(
scanIndex
)
->
deleteLater
();
return
true
;
return
true
;
...
...
src/MissionManager/CameraSection.h
View file @
c6c2a2b8
...
@@ -14,6 +14,8 @@
...
@@ -14,6 +14,8 @@
#include
"MissionItem.h"
#include
"MissionItem.h"
#include
"Fact.h"
#include
"Fact.h"
#define VIDEO_CAPTURE_STATUS_INTERVAL 0.2 //-- Send capture status every 5 seconds
class
CameraSection
:
public
Section
class
CameraSection
:
public
Section
{
{
Q_OBJECT
Q_OBJECT
...
...
src/MissionManager/CameraSectionTest.cc
View file @
c6c2a2b8
...
@@ -70,7 +70,7 @@ void CameraSectionTest::init(void)
...
@@ -70,7 +70,7 @@ void CameraSectionTest::init(void)
MAV_CMD_VIDEO_START_CAPTURE
,
MAV_CMD_VIDEO_START_CAPTURE
,
MAV_FRAME_MISSION
,
MAV_FRAME_MISSION
,
0
,
// Reserved (Set to 0)
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
NAN
,
NAN
,
NAN
,
NAN
,
NAN
,
// param 3-7 reserved
true
,
// autocontinue
true
,
// autocontinue
false
),
// isCurrentItem
false
),
// isCurrentItem
...
@@ -896,13 +896,6 @@ void CameraSectionTest::_testScanForStartVideoSection(void)
...
@@ -896,13 +896,6 @@ void CameraSectionTest::_testScanForStartVideoSection(void)
QCOMPARE
(
_cameraSection
->
settingsSpecified
(),
false
);
QCOMPARE
(
_cameraSection
->
settingsSpecified
(),
false
);
visualItems
.
clear
();
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
)
void
CameraSectionTest
::
_testScanForStopVideoSection
(
void
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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