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
4d851c94
Commit
4d851c94
authored
Mar 26, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure video streaming is running before accessing the video receiver.
parent
6af7e8f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
13 deletions
+19
-13
QGCCameraControl.cc
src/Camera/QGCCameraControl.cc
+12
-8
Vehicle.cc
src/Vehicle/Vehicle.cc
+7
-5
No files found.
src/Camera/QGCCameraControl.cc
View file @
4d851c94
...
...
@@ -364,10 +364,12 @@ QGCCameraControl::takePhoto()
_setPhotoStatus
(
PHOTO_CAPTURE_IN_PROGRESS
);
_captureInfoRetries
=
0
;
//-- Capture local image as well
QString
photoPath
=
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
appSettings
()
->
savePath
()
->
rawValue
().
toString
()
+
QStringLiteral
(
"/Photo"
);
QDir
().
mkpath
(
photoPath
);
photoPath
+=
+
"/"
+
QDateTime
::
currentDateTime
().
toString
(
"yyyy-MM-dd_hh.mm.ss.zzz"
)
+
".jpg"
;
qgcApp
()
->
toolbox
()
->
videoManager
()
->
videoReceiver
()
->
grabImage
(
photoPath
);
if
(
qgcApp
()
->
toolbox
()
->
videoManager
()
->
videoReceiver
())
{
QString
photoPath
=
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
appSettings
()
->
savePath
()
->
rawValue
().
toString
()
+
QStringLiteral
(
"/Photo"
);
QDir
().
mkpath
(
photoPath
);
photoPath
+=
+
"/"
+
QDateTime
::
currentDateTime
().
toString
(
"yyyy-MM-dd_hh.mm.ss.zzz"
)
+
".jpg"
;
qgcApp
()
->
toolbox
()
->
videoManager
()
->
videoReceiver
()
->
grabImage
(
photoPath
);
}
return
true
;
}
}
...
...
@@ -1471,10 +1473,12 @@ QGCCameraControl::handleCaptureStatus(const mavlink_camera_capture_status_t& cap
//-- Time Lapse
if
(
photoStatus
()
==
PHOTO_CAPTURE_INTERVAL_IDLE
||
photoStatus
()
==
PHOTO_CAPTURE_INTERVAL_IN_PROGRESS
)
{
//-- Capture local image as well
QString
photoPath
=
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
appSettings
()
->
savePath
()
->
rawValue
().
toString
()
+
QStringLiteral
(
"/Photo"
);
QDir
().
mkpath
(
photoPath
);
photoPath
+=
+
"/"
+
QDateTime
::
currentDateTime
().
toString
(
"yyyy-MM-dd_hh.mm.ss.zzz"
)
+
".jpg"
;
qgcApp
()
->
toolbox
()
->
videoManager
()
->
videoReceiver
()
->
grabImage
(
photoPath
);
if
(
qgcApp
()
->
toolbox
()
->
videoManager
()
->
videoReceiver
())
{
QString
photoPath
=
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
appSettings
()
->
savePath
()
->
rawValue
().
toString
()
+
QStringLiteral
(
"/Photo"
);
QDir
().
mkpath
(
photoPath
);
photoPath
+=
+
"/"
+
QDateTime
::
currentDateTime
().
toString
(
"yyyy-MM-dd_hh.mm.ss.zzz"
)
+
".jpg"
;
qgcApp
()
->
toolbox
()
->
videoManager
()
->
videoReceiver
()
->
grabImage
(
photoPath
);
}
}
}
...
...
src/Vehicle/Vehicle.cc
View file @
4d851c94
...
...
@@ -1640,9 +1640,11 @@ void Vehicle::_updateArmed(bool armed)
}
else
{
_mapTrajectoryStop
();
// Also handle Video Streaming
if
(
_settingsManager
->
videoSettings
()
->
disableWhenDisarmed
()
->
rawValue
().
toBool
())
{
_settingsManager
->
videoSettings
()
->
streamEnabled
()
->
setRawValue
(
false
);
qgcApp
()
->
toolbox
()
->
videoManager
()
->
videoReceiver
()
->
stop
();
if
(
qgcApp
()
->
toolbox
()
->
videoManager
()
->
videoReceiver
())
{
if
(
_settingsManager
->
videoSettings
()
->
disableWhenDisarmed
()
->
rawValue
().
toBool
())
{
_settingsManager
->
videoSettings
()
->
streamEnabled
()
->
setRawValue
(
false
);
qgcApp
()
->
toolbox
()
->
videoManager
()
->
videoReceiver
()
->
stop
();
}
}
}
}
...
...
@@ -1654,8 +1656,8 @@ void Vehicle::_handlePing(LinkInterface* link, mavlink_message_t& message)
mavlink_message_t
msg
;
mavlink_msg_ping_decode
(
&
message
,
&
ping
);
mavlink_msg_ping_pack_chan
(
_mavlink
->
getSystemId
(
),
_mavlink
->
getComponentId
(
),
mavlink_msg_ping_pack_chan
(
static_cast
<
uint8_t
>
(
_mavlink
->
getSystemId
()
),
static_cast
<
uint8_t
>
(
_mavlink
->
getComponentId
()
),
priorityLink
()
->
mavlinkChannel
(),
&
msg
,
ping
.
time_usec
,
...
...
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