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
ca385003
Unverified
Commit
ca385003
authored
Feb 22, 2019
by
Gus Grubba
Committed by
GitHub
Feb 22, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7246 from mavlink/moreCameras
Added more cameras
parents
4f0d8ab3
0c87e808
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
290 additions
and
153 deletions
+290
-153
FirmwarePlugin.cc
src/FirmwarePlugin/FirmwarePlugin.cc
+290
-153
No files found.
src/FirmwarePlugin/FirmwarePlugin.cc
View file @
ca385003
...
@@ -347,185 +347,322 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -347,185 +347,322 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
if
(
_cameraList
.
size
()
==
0
)
{
if
(
_cameraList
.
size
()
==
0
)
{
CameraMetaData
*
metaData
;
CameraMetaData
*
metaData
;
metaData
=
new
CameraMetaData
(
tr
(
"Sony NEX-5R 20mm"
),
//http://www.sony.co.uk/electronics/interchangeable-lens-cameras/ilce-qx1-body-kit/specifications
metaData
=
new
CameraMetaData
(
23.2
,
//http://www.sony.com/electronics/camera-lenses/sel16f28/specifications
tr
(
"Canon S100 @ 5.2mm f/2"
),
15.4
,
7.6
,
// sensorWidth
4912
,
5.7
,
// sensorHeight
3264
,
4000
,
// imageWidth
20
,
3000
,
// imageHeight
true
,
5.2
,
// focalLength
false
,
true
,
// true: landscape orientation
1
,
false
,
// true: camera is fixed orientation
this
);
0
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Sony ILCE-QX1"
),
//http://www.sony.co.uk/electronics/interchangeable-lens-cameras/ilce-qx1-body-kit/specifications
metaData
=
new
CameraMetaData
(
23.2
,
//http://www.sony.com/electronics/camera-lenses/sel16f28/specifications
tr
(
"Canon EOS-M 22mm f/2"
),
15.4
,
22.3
,
// sensorWidth
5456
,
14.9
,
// sensorHeight
3632
,
5184
,
// imageWidth
16
,
3456
,
// imageHeight
true
,
22
,
// focalLength
false
,
true
,
// true: landscape orientation
0
,
false
,
// true: camera is fixed orientation
this
);
0
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Canon S100 PowerShot"
),
metaData
=
new
CameraMetaData
(
7.6
,
tr
(
"Canon G9X @ 10.2mm f/2"
),
5.7
,
13.2
,
// sensorWidth
4000
,
8.8
,
// sensorHeight
3000
,
5488
,
// imageWidth
5.2
,
3680
,
// imageHeight
true
,
10.2
,
// focalLength
false
,
true
,
// true: landscape orientation
0
,
false
,
// true: camera is fixed orientation
this
);
0
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Canon G9 X PowerShot"
),
metaData
=
new
CameraMetaData
(
13.2
,
tr
(
"Canon SX260 HS @ 4.5mm f/3.5"
),
8.8
,
6.17
,
// sensorWidth
5488
,
4.55
,
// sensorHeight
3680
,
4000
,
// imageWidth
10.2
,
3000
,
// imageHeight
true
,
4.5
,
// focalLength
false
,
true
,
// true: landscape orientation
0
,
false
,
// true: camera is fixed orientation
this
);
0
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Canon SX260 HS PowerShot"
),
metaData
=
new
CameraMetaData
(
6.17
,
tr
(
"GoPro Hero 4"
),
4.55
,
6.17
,
// sensorWidth
4000
,
4.55
,
// sendsorHeight
3000
,
4000
,
// imageWidth
4.5
,
3000
,
// imageHeight
true
,
2.98
,
// focalLength
false
,
true
,
// landscape
0
,
false
,
// fixedOrientation
this
);
0
,
// minTriggerInterval
this
);
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Canon EOS-M 22mm"
),
metaData
=
new
CameraMetaData
(
22.3
,
tr
(
"Parrot Sequoia RGB"
),
14.9
,
6.17
,
// sensorWidth
5184
,
4.63
,
// sendsorHeight
3456
,
4608
,
// imageWidth
22
,
3456
,
// imageHeight
true
,
4.9
,
// focalLength
false
,
true
,
// landscape
0
,
false
,
// fixedOrientation
this
);
1
,
// minTriggerInterval
this
);
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Sony a6000 16mm"
),
//http://www.sony.co.uk/electronics/interchangeable-lens-cameras/ilce-6000-body-kit#product_details_default
metaData
=
new
CameraMetaData
(
23.5
,
tr
(
"Parrot Sequoia Monochrome"
),
15.6
,
4.8
,
// sensorWidth
6000
,
3.6
,
// sendsorHeight
4000
,
1280
,
// imageWidth
16
,
960
,
// imageHeight
true
,
4.0
,
// focalLength
false
,
true
,
// landscape
0
,
false
,
// fixedOrientation
this
);
0.8
,
// minTriggerInterval
this
);
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Sony RX100 II 28mm"
),
metaData
=
new
CameraMetaData
(
13.2
,
tr
(
"RedEdge"
),
8.8
,
4.8
,
// sensorWidth
5472
,
3.6
,
// sendsorHeight
3648
,
1280
,
// imageWidth
10.4
,
960
,
// imageHeight
true
,
5.5
,
// focalLength
false
,
true
,
// landscape
0
,
false
,
// fixedOrientation
this
);
0
,
// minTriggerInterval
this
);
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Ricoh GR II"
),
metaData
=
new
CameraMetaData
(
23.7
,
// sensorWidth
tr
(
"Ricoh GR II 18.3mm f/2.8"
),
15.7
,
// sendsorHeight
23.7
,
// sensorWidth
4928
,
// imageWidth
15.7
,
// sendsorHeight
3264
,
// imageHeight
4928
,
// imageWidth
18.3
,
// focalLength
3264
,
// imageHeight
true
,
// landscape
18.3
,
// focalLength
false
,
// fixedOrientation
true
,
// landscape
0
,
// minTriggerInterval
false
,
// fixedOrientation
this
);
0
,
// minTriggerInterval
this
);
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"RedEdge"
),
metaData
=
new
CameraMetaData
(
4.8
,
// sensorWidth
tr
(
"Sentera Double 4K Sensor"
),
3.6
,
// sendsorHeight
6.2
,
// sensorWidth
1280
,
// imageWidth
4.65
,
// sendsorHeight
960
,
// imageHeight
4000
,
// imageWidth
5.5
,
// focalLength
3000
,
// imageHeight
true
,
// landscape
5.4
,
// focalLength
false
,
// fixedOrientation
true
,
// landscape
0
,
// minTriggerInterval
false
,
// fixedOrientation
this
);
0
,
// minTriggerInterval
this
);
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Parrot Sequioa RGB"
),
metaData
=
new
CameraMetaData
(
6.17
,
// sensorWidth
tr
(
"Sentera NDVI Single Sensor"
),
4.63
,
// sendsorHeight
4.68
,
// sensorWidth
4608
,
// imageWidth
3.56
,
// sendsorHeight
3456
,
// imageHeight
1248
,
// imageWidth
4.9
,
// focalLength
952
,
// imageHeight
true
,
// landscape
4.14
,
// focalLength
false
,
// fixedOrientation
true
,
// landscape
1
,
// minTriggerInterval
false
,
// fixedOrientation
this
);
0
,
// minTriggerInterval
this
);
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Parrot Sequioa Monochrome"
),
metaData
=
new
CameraMetaData
(
4.8
,
// sensorWidth
//-- http://www.sony.co.uk/electronics/interchangeable-lens-cameras/ilce-6000-body-kit#product_details_default
3.6
,
// sendsorHeight
tr
(
"Sony a6000 Sony 16mm f/2.8"
),
1280
,
// imageWidth
23.5
,
// sensorWidth
960
,
// imageHeight
15.6
,
// sensorHeight
4.0
,
// focalLength
6000
,
// imageWidth
true
,
// landscape
4000
,
// imageHeight
false
,
// fixedOrientation
16
,
// focalLength
0.8
,
// minTriggerInterval
true
,
// true: landscape orientation
this
);
false
,
// true: camera is fixed orientation
2.0
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"GoPro Hero 4"
),
metaData
=
new
CameraMetaData
(
6.17
,
// sensorWidth
tr
(
"Sony a6300 Zeiss 21mm f/2.8"
),
4.55
,
// sendsorHeight
23.5
,
// sensorWidth
4000
,
// imageWidth
15.6
,
// sensorHeight
3000
,
// imageHeight
6000
,
// imageWidth
2.98
,
// focalLength
4000
,
// imageHeight
true
,
// landscape
21
,
// focalLength
false
,
// fixedOrientation
true
,
// true: landscape orientation
0
,
// minTriggerInterval
true
,
// true: camera is fixed orientation
this
);
2.0
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Sentera NDVI Single Sensor"
),
metaData
=
new
CameraMetaData
(
4.68
,
// sensorWidth
tr
(
"Sony a6300 Sony 28mm f/2.0"
),
3.56
,
// sendsorHeight
23.5
,
// sensorWidth
1248
,
// imageWidth
15.6
,
// sensorHeight
952
,
// imageHeight
6000
,
// imageWidth
4.14
,
// focalLength
4000
,
// imageHeight
true
,
// landscape
28
,
// focalLength
false
,
// fixedOrientation
true
,
// true: landscape orientation
0
,
// minTriggerInterval
true
,
// true: camera is fixed orientation
this
);
2.0
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Sentera Double 4K Sensor"
),
metaData
=
new
CameraMetaData
(
6.2
,
// sensorWidth
tr
(
"Sony a7R II Zeiss 21mm f/2.8"
),
4.65
,
// sendsorHeight
35.814
,
// sensorWidth
4000
,
// imageWidth
23.876
,
// sensorHeight
3000
,
// imageHeight
7952
,
// imageWidth
5.4
,
// focalLength
5304
,
// imageHeight
true
,
// landscape
21
,
// focalLength
false
,
// fixedOrientation
true
,
// true: landscape orientation
0
,
// minTriggerInterval
true
,
// true: camera is fixed orientation
this
);
2.0
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Sony a7R II Sony 28mm f/2.0"
),
35.814
,
// sensorWidth
23.876
,
// sensorHeight
7952
,
// imageWidth
5304
,
// imageHeight
28
,
// focalLength
true
,
// true: landscape orientation
true
,
// true: camera is fixed orientation
2.0
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Sony DSC-QX30U @ 4.3mm f/3.5"
),
7.82
,
// sensorWidth
5.865
,
// sensorHeight
5184
,
// imageWidth
3888
,
// imageHeight
4.3
,
// focalLength
true
,
// true: landscape orientation
false
,
// true: camera is fixed orientation
2.0
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
//-- http://www.sony.co.uk/electronics/interchangeable-lens-cameras/ilce-qx1-body-kit/specifications
//-- http://www.sony.com/electronics/camera-lenses/sel16f28/specifications
tr
(
"Sony ILCE-QX1 Sony 16mm f/2.8"
),
23.2
,
// sensorWidth
15.4
,
// sensorHeight
5456
,
// imageWidth
3632
,
// imageHeight
16
,
// 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
(
//-- http://www.sony.co.uk/electronics/interchangeable-lens-cameras/ilce-qx1-body-kit/specifications
tr
(
"Sony NEX-5R Sony 20mm f/2.8"
),
23.2
,
// sensorWidth
15.4
,
// sensorHeight
4912
,
// imageWidth
3264
,
// imageHeight
20
,
// focalLength
true
,
// true: landscape orientation
false
,
// true: camera is fixed orientation
1
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Sony RX100 II @ 10.4mm f/1.8"
),
13.2
,
// sensorWidth
8.8
,
// sensorHeight
5472
,
// imageWidth
3648
,
// imageHeight
10.4
,
// 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
(
tr
(
"Yuneec CGOET"
),
5.6405
,
// sensorWidth
3.1813
,
// sensorHeight
1920
,
// imageWidth
1080
,
// imageHeight
3.5
,
// focalLength
true
,
// true: landscape orientation
true
,
// true: camera is fixed orientation
1.3
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Yuneec E10T"
),
5.6405
,
// sensorWidth
3.1813
,
// sensorHeight
1920
,
// imageWidth
1080
,
// imageHeight
23
,
// focalLength
true
,
// true: landscape orientation
true
,
// true: camera is fixed orientation
1.3
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Yuneec E50"
),
6.2372
,
// sensorWidth
4.7058
,
// sensorHeight
4000
,
// imageWidth
3000
,
// imageHeight
7.2
,
// focalLength
true
,
// true: landscape orientation
true
,
// true: camera is fixed orientation
1.3
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
metaData
=
new
CameraMetaData
(
tr
(
"Yuneec E90"
),
13.3056
,
// sensorWidth
8.656
,
// sensorHeight
5472
,
// imageWidth
3648
,
// imageHeight
8.29
,
// focalLength
true
,
// true: landscape orientation
true
,
// true: camera is fixed orientation
1.3
,
// minimum trigger interval
this
);
// parent
_cameraList
.
append
(
QVariant
::
fromValue
(
metaData
));
}
}
return
_cameraList
;
return
_cameraList
;
...
@@ -533,7 +670,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
...
@@ -533,7 +670,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
QMap
<
QString
,
FactGroup
*>*
FirmwarePlugin
::
factGroups
(
void
)
{
QMap
<
QString
,
FactGroup
*>*
FirmwarePlugin
::
factGroups
(
void
)
{
// Generic plugin has no FactGroups
// Generic plugin has no FactGroups
return
NULL
;
return
nullptr
;
}
}
bool
FirmwarePlugin
::
vehicleYawsToNextWaypointInMission
(
const
Vehicle
*
vehicle
)
const
bool
FirmwarePlugin
::
vehicleYawsToNextWaypointInMission
(
const
Vehicle
*
vehicle
)
const
...
@@ -642,7 +779,7 @@ bool FirmwarePlugin::isVtol(const Vehicle* vehicle) const
...
@@ -642,7 +779,7 @@ bool FirmwarePlugin::isVtol(const Vehicle* vehicle) const
QGCCameraManager
*
FirmwarePlugin
::
createCameraManager
(
Vehicle
*
vehicle
)
QGCCameraManager
*
FirmwarePlugin
::
createCameraManager
(
Vehicle
*
vehicle
)
{
{
Q_UNUSED
(
vehicle
);
Q_UNUSED
(
vehicle
);
return
NULL
;
return
nullptr
;
}
}
QGCCameraControl
*
FirmwarePlugin
::
createCameraControl
(
const
mavlink_camera_information_t
*
info
,
Vehicle
*
vehicle
,
int
compID
,
QObject
*
parent
)
QGCCameraControl
*
FirmwarePlugin
::
createCameraControl
(
const
mavlink_camera_information_t
*
info
,
Vehicle
*
vehicle
,
int
compID
,
QObject
*
parent
)
...
@@ -651,7 +788,7 @@ QGCCameraControl* FirmwarePlugin::createCameraControl(const mavlink_camera_infor
...
@@ -651,7 +788,7 @@ QGCCameraControl* FirmwarePlugin::createCameraControl(const mavlink_camera_infor
Q_UNUSED
(
vehicle
);
Q_UNUSED
(
vehicle
);
Q_UNUSED
(
compID
);
Q_UNUSED
(
compID
);
Q_UNUSED
(
parent
);
Q_UNUSED
(
parent
);
return
NULL
;
return
nullptr
;
}
}
uint32_t
FirmwarePlugin
::
highLatencyCustomModeTo32Bits
(
uint16_t
hlCustomMode
)
uint32_t
FirmwarePlugin
::
highLatencyCustomModeTo32Bits
(
uint16_t
hlCustomMode
)
...
...
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