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
4d851c94
Commit
4d851c94
authored
Mar 26, 2019
by
Gus Grubba
Browse files
Make sure video streaming is running before accessing the video receiver.
parent
6af7e8f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
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
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