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
97c51871
Commit
97c51871
authored
Oct 21, 2017
by
Don Gagne
Committed by
GitHub
Oct 21, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5765 from DonLakeFlyer/Cameras
Add cameras
parents
e97a7356
72681649
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
0 deletions
+24
-0
FirmwarePlugin.cc
src/FirmwarePlugin/FirmwarePlugin.cc
+24
-0
No files found.
src/FirmwarePlugin/FirmwarePlugin.cc
View file @
97c51871
...
...
@@ -430,6 +430,30 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
0
,
this
);
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Ricoh GR II"
),
23.7
,
// sensorWidth
15.7
,
// sendsorHeight
4928
,
// imageWidth
3264
,
// imageHeight
18.3
,
// focalLength
true
,
// landscape
false
,
// fixedOrientation
0
,
// minTriggerInterval
this
);
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"RedEdge"
),
4.8
,
// sensorWidth
3.6
,
// sendsorHeight
1280
,
// imageWidth
960
,
// imageHeight
5.5
,
// focalLength
true
,
// landscape
false
,
// fixedOrientation
0
,
// minTriggerInterval
this
);
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
}
return
_cameraList
;
...
...
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