From 88df2ff8d7bf830b1f9e6415d148037be0200676 Mon Sep 17 00:00:00 2001 From: Sander Smeets Date: Tue, 27 Jul 2021 09:19:02 +0200 Subject: [PATCH] Update Sony trigger time settings and add Flir DUo Pro R --- src/FirmwarePlugin/FirmwarePlugin.cc | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc index 4e4d653..7878dd0 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.cc +++ b/src/FirmwarePlugin/FirmwarePlugin.cc @@ -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*) 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*) 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*) 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*) 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*) 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*) 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*) 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*) 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*) 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;