zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Update Sony trigger time settings and add Flir DUo Pro R

QGC4.4
Sander Smeets 4 years ago committed by Don Gagne
parent
def44b97ef
commit
88df2ff8d7
1 changed files with 26 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      src/FirmwarePlugin/FirmwarePlugin.cc

35
src/FirmwarePlugin/FirmwarePlugin.cc
Unescape View File

@ -534,7 +534,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*) @@ -534,7 +534,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*)
16, // focalLength
true, // true: landscape orientation
false, // true: camera is fixed orientation
2.0, // minimum trigger interval
1.0, // minimum trigger interval
tr("Sony a6000 16mm"), // SHOULD BE BLANK FOR NEWLY ADDED CAMERAS. Deprecated translation from older builds.
this); // parent
_cameraList.append(QVariant::fromValue(metaData));
@ -550,7 +550,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*) @@ -550,7 +550,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*)
35, // focalLength
true, // true: landscape orientation
false, // true: camera is fixed orientation
2.0, // minimum trigger interval
1.0, // minimum trigger interval
"",
this); // parent
_cameraList.append(QVariant::fromValue(metaData));
@ -566,7 +566,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*) @@ -566,7 +566,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*)
21, // focalLength
true, // true: landscape orientation
false, // true: camera is fixed orientation
2.0, // minimum trigger interval
1.0, // minimum trigger interval
tr("Sony a6300 Zeiss 21mm f/2.8"),// SHOULD BE BLANK FOR NEWLY ADDED CAMERAS. Deprecated translation from older builds.
this); // parent
_cameraList.append(QVariant::fromValue(metaData));
@ -582,7 +582,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*) @@ -582,7 +582,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*)
28, // focalLength
true, // true: landscape orientation
false, // true: camera is fixed orientation
2.0, // minimum trigger interval
1.0, // minimum trigger interval
tr("Sony a6300 Sony 28mm f/2.0"), // SHOULD BE BLANK FOR NEWLY ADDED CAMERAS. Deprecated translation from older builds.
this); // parent
_cameraList.append(QVariant::fromValue(metaData));
@ -598,7 +598,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*) @@ -598,7 +598,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*)
21, // focalLength
true, // true: landscape orientation
true, // true: camera is fixed orientation
2.0, // minimum trigger interval
1.0, // minimum trigger interval
tr("Sony a7R II Zeiss 21mm f/2.8"), // SHOULD BE BLANK FOR NEWLY ADDED CAMERAS. Deprecated translation from older builds.
this); // parent
_cameraList.append(QVariant::fromValue(metaData));
@ -614,7 +614,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*) @@ -614,7 +614,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*)
28, // focalLength
true, // true: landscape orientation
true, // true: camera is fixed orientation
2.0, // minimum trigger interval
1.0, // minimum trigger interval
tr("Sony a7R II Sony 28mm f/2.0"),// SHOULD BE BLANK FOR NEWLY ADDED CAMERAS. Deprecated translation from older builds.
this); // parent
_cameraList.append(QVariant::fromValue(metaData));
@ -630,7 +630,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*) @@ -630,7 +630,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*)
35, // focalLength
true, // true: landscape orientation
false, // true: camera is fixed orientation
2.0, // minimum trigger interval
1.0, // minimum trigger interval
"",
this); // parent
_cameraList.append(QVariant::fromValue(metaData));
@ -646,7 +646,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*) @@ -646,7 +646,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*)
35, // focalLength
true, // true: landscape orientation
false, // true: camera is fixed orientation
2.0, // minimum trigger interval
1.0, // minimum trigger interval
"",
this); // parent
_cameraList.append(QVariant::fromValue(metaData));
@ -694,7 +694,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*) @@ -694,7 +694,7 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*)
35, // focalLength
true, // true: landscape orientation
false, // true: camera is fixed orientation
2.0, // minimum trigger interval
1.0, // minimum trigger interval
"",
this); // parent
_cameraList.append(QVariant::fromValue(metaData));
@ -833,6 +833,23 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*) @@ -833,6 +833,23 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle*)
this); // parent
_cameraList.append(QVariant::fromValue(metaData));
metaData = new CameraMetaData(
"Flir Duo Pro R",
tr("Flir"),
tr("Duo Pro R"),
10.88, // sensorWidth
8.704, // sensorHeight
640, // imageWidth
512, // imageHeight
19, // focalLength
true, // true: landscape orientation
false, // true: camera is fixed orientation
1.0, // minimum trigger interval
"", // SHOULD BE BLANK FOR NEWLY ADDED CAMERAS. Deprecated translation from older builds.
this); // parent
_cameraList.append(QVariant::fromValue(metaData));
}
return _cameraList;

Write Preview
Loading…
Cancel
Save