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
ef731572
Unverified
Commit
ef731572
authored
May 13, 2019
by
Gus Grubba
Committed by
GitHub
May 13, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7439 from mavlink/cameraSupport
Camera info requests
parents
3b82eb84
3a2b0f33
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
QGCCameraManager.cc
src/Camera/QGCCameraManager.cc
+3
-4
No files found.
src/Camera/QGCCameraManager.cc
View file @
ef731572
...
...
@@ -107,8 +107,8 @@ QGCCameraManager::_handleHeartbeat(const mavlink_message_t &message)
{
mavlink_heartbeat_t
heartbeat
;
mavlink_msg_heartbeat_decode
(
&
message
,
&
heartbeat
);
//--
If this heartbeat is from a different component within the vehicle
if
(
_vehicleReadyState
&&
_vehicle
->
id
()
==
message
.
sysid
&&
_vehicle
->
defaultComponentId
()
!=
message
.
compid
)
{
//--
Only pay attention to "camera" component IDs
if
(
_vehicleReadyState
&&
_vehicle
->
id
()
==
message
.
sysid
&&
message
.
compid
>=
MAV_COMP_ID_CAMERA
&&
message
.
compid
<=
MAV_COMP_ID_CAMERA6
)
{
//-- First time hearing from this one?
QString
sCompID
=
QString
::
number
(
message
.
compid
);
if
(
!
_cameraInfoRequest
.
contains
(
sCompID
))
{
...
...
@@ -135,8 +135,7 @@ QGCCameraManager::_handleHeartbeat(const mavlink_message_t &message)
}
}
else
{
pInfo
->
tryCount
++
;
//-- Request camera info. Again. It could be something other than a camera, in which
// case, we won't ever receive it.
//-- Request camera info again.
_requestCameraInfo
(
message
.
compid
);
}
}
...
...
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