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
c3edf7aa
Unverified
Commit
c3edf7aa
authored
Aug 26, 2019
by
Don Gagne
Committed by
GitHub
Aug 26, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7719 from ppicazo/patch-1
Add Sony DSC-RX0 Camera
parents
c33fb061
f5e16c4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
0 deletions
+13
-0
FirmwarePlugin.cc
src/FirmwarePlugin/FirmwarePlugin.cc
+13
-0
No files found.
src/FirmwarePlugin/FirmwarePlugin.cc
View file @
c3edf7aa
...
@@ -575,6 +575,19 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -575,6 +575,19 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
2.0
,
// minimum trigger interval
2.0
,
// minimum trigger interval
this
);
// parent
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Sony DSC-RX0"
),
13.2
,
// sensorWidth
8.8
,
// sensorHeight
4800
,
// imageWidth
3200
,
// imageHeight
7.7
,
// focalLength
true
,
// true: landscape orientation
false
,
// true: camera is fixed orientation
0
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
metaData
=
new
CameraMetaData
(
//-- http://www.sony.co.uk/electronics/interchangeable-lens-cameras/ilce-qx1-body-kit/specifications
//-- http://www.sony.co.uk/electronics/interchangeable-lens-cameras/ilce-qx1-body-kit/specifications
...
...
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