Merge pull request #5366 from AndKe/RX100

Camera: Added Sony RX100

Merge pull request #5366 from AndKe/RX100
Camera: Added Sony RX100
044e3f72 · Don Gagne · GitHub · c2a4428f · c6f54b28 · 044e3f72
Commit 044e3f72 authored Jul 01, 2017 by Don Gagne Committed by GitHub Jul 01, 2017
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

FirmwarePlugin.cc src/FirmwarePlugin/FirmwarePlugin.cc +11 -0

No files found.
--- a/src/FirmwarePlugin/FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/FirmwarePlugin.cc
@@ -410,6 +410,17 @@ const QVariantList& FirmwarePlugin::cameraList(const Vehicle* vehicle)
                                      false,
                                      this);
        _cameraList.append(QVariant::fromValue(metaData));
+
+        metaData = new CameraMetaData(tr("Sony RX100 II 28mm"),
+                                      13.2,
+                                      8.8,
+                                      5472,
+                                      3648,
+                                      10.4,
+                                      true,
+                                      false,
+                                      this);
+        _cameraList.append(QVariant::fromValue(metaData));
    }

    return _cameraList;