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
8f045546
Unverified
Commit
8f045546
authored
Feb 28, 2019
by
Gus Grubba
Committed by
GitHub
Feb 28, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7256 from mavlink/revertCameraNames
Revert Camera Names
parents
c6a7d7e9
8e4831d7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
11 deletions
+22
-11
FirmwarePlugin.cc
src/FirmwarePlugin/FirmwarePlugin.cc
+22
-11
No files found.
src/FirmwarePlugin/FirmwarePlugin.cc
View file @
8f045546
...
@@ -348,7 +348,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -348,7 +348,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
CameraMetaData
*
metaData
;
CameraMetaData
*
metaData
;
metaData
=
new
CameraMetaData
(
metaData
=
new
CameraMetaData
(
tr
(
"Canon S100 @ 5.2mm f/2"
),
//tr("Canon S100 @ 5.2mm f/2"),
tr
(
"Canon S100 PowerShot"
),
7.6
,
// sensorWidth
7.6
,
// sensorWidth
5.7
,
// sensorHeight
5.7
,
// sensorHeight
4000
,
// imageWidth
4000
,
// imageWidth
...
@@ -361,7 +362,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -361,7 +362,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
metaData
=
new
CameraMetaData
(
tr
(
"Canon EOS-M 22mm f/2"
),
//tr("Canon EOS-M 22mm f/2"),
tr
(
"Canon EOS-M 22mm"
),
22.3
,
// sensorWidth
22.3
,
// sensorWidth
14.9
,
// sensorHeight
14.9
,
// sensorHeight
5184
,
// imageWidth
5184
,
// imageWidth
...
@@ -374,7 +376,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -374,7 +376,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
metaData
=
new
CameraMetaData
(
tr
(
"Canon G9X @ 10.2mm f/2"
),
//tr("Canon G9X @ 10.2mm f/2"),
tr
(
"Canon G9 X PowerShot"
),
13.2
,
// sensorWidth
13.2
,
// sensorWidth
8.8
,
// sensorHeight
8.8
,
// sensorHeight
5488
,
// imageWidth
5488
,
// imageWidth
...
@@ -387,7 +390,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -387,7 +390,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
metaData
=
new
CameraMetaData
(
tr
(
"Canon SX260 HS @ 4.5mm f/3.5"
),
//tr("Canon SX260 HS @ 4.5mm f/3.5"),
tr
(
"Canon SX260 HS PowerShot"
),
6.17
,
// sensorWidth
6.17
,
// sensorWidth
4.55
,
// sensorHeight
4.55
,
// sensorHeight
4000
,
// imageWidth
4000
,
// imageWidth
...
@@ -413,7 +417,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -413,7 +417,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
metaData
=
new
CameraMetaData
(
tr
(
"Parrot Sequoia RGB"
),
//tr("Parrot Sequoia RGB"),
tr
(
"Parrot Sequioa RGB"
),
6.17
,
// sensorWidth
6.17
,
// sensorWidth
4.63
,
// sendsorHeight
4.63
,
// sendsorHeight
4608
,
// imageWidth
4608
,
// imageWidth
...
@@ -426,7 +431,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -426,7 +431,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
metaData
=
new
CameraMetaData
(
tr
(
"Parrot Sequoia Monochrome"
),
//tr("Parrot Sequoia Monochrome"),
tr
(
"Parrot Sequioa Monochrome"
),
4.8
,
// sensorWidth
4.8
,
// sensorWidth
3.6
,
// sendsorHeight
3.6
,
// sendsorHeight
1280
,
// imageWidth
1280
,
// imageWidth
...
@@ -452,7 +458,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -452,7 +458,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
metaData
=
new
CameraMetaData
(
tr
(
"Ricoh GR II 18.3mm f/2.8"
),
//tr("Ricoh GR II 18.3mm f/2.8"),
tr
(
"Ricoh GR II"
),
23.7
,
// sensorWidth
23.7
,
// sensorWidth
15.7
,
// sendsorHeight
15.7
,
// sendsorHeight
4928
,
// imageWidth
4928
,
// imageWidth
...
@@ -492,7 +499,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -492,7 +499,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
metaData
=
new
CameraMetaData
(
metaData
=
new
CameraMetaData
(
//-- http://www.sony.co.uk/electronics/interchangeable-lens-cameras/ilce-6000-body-kit#product_details_default
//-- http://www.sony.co.uk/electronics/interchangeable-lens-cameras/ilce-6000-body-kit#product_details_default
tr
(
"Sony a6000 Sony 16mm f/2.8"
),
//tr("Sony a6000 Sony 16mm f/2.8"),
tr
(
"Sony a6000 16mm"
),
23.5
,
// sensorWidth
23.5
,
// sensorWidth
15.6
,
// sensorHeight
15.6
,
// sensorHeight
6000
,
// imageWidth
6000
,
// imageWidth
...
@@ -572,7 +580,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -572,7 +580,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
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
//-- http://www.sony.com/electronics/camera-lenses/sel16f28/specifications
//-- http://www.sony.com/electronics/camera-lenses/sel16f28/specifications
tr
(
"Sony ILCE-QX1 Sony 16mm f/2.8"
),
//tr("Sony ILCE-QX1 Sony 16mm f/2.8"),
tr
(
"Sony ILCE-QX1"
),
23.2
,
// sensorWidth
23.2
,
// sensorWidth
15.4
,
// sensorHeight
15.4
,
// sensorHeight
5456
,
// imageWidth
5456
,
// imageWidth
...
@@ -586,7 +595,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -586,7 +595,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
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
tr
(
"Sony NEX-5R Sony 20mm f/2.8"
),
//tr("Sony NEX-5R Sony 20mm f/2.8"),
tr
(
"Sony NEX-5R 20mm"
),
23.2
,
// sensorWidth
23.2
,
// sensorWidth
15.4
,
// sensorHeight
15.4
,
// sensorHeight
4912
,
// imageWidth
4912
,
// imageWidth
...
@@ -599,7 +609,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -599,7 +609,8 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
metaData
=
new
CameraMetaData
(
tr
(
"Sony RX100 II @ 10.4mm f/1.8"
),
//tr("Sony RX100 II @ 10.4mm f/1.8"),
tr
(
"Sony RX100 II 28mm"
),
13.2
,
// sensorWidth
13.2
,
// sensorWidth
8.8
,
// sensorHeight
8.8
,
// sensorHeight
5472
,
// imageWidth
5472
,
// imageWidth
...
...
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