CP - Expose known parameters

src/Camera/QGCCameraControl.cc

@@ -61,13 +61,13 @@ static const char* kPhotoLapseCount = "PhotoLapseCount";
 
 //-----------------------------------------------------------------------------
 // Known Parameters
-static const char *kCAM_EV          = "CAM_EV";
-static const char *kCAM_EXPMODE     = "CAM_EXPMODE";
-static const char *kCAM_ISO         = "CAM_ISO";
-static const char* kCAM_SHUTTER     = "CAM_SHUTTER";
-static const char* kCAM_APERTURE    = "CAM_APERTURE";
-static const char* kCAM_WBMODE      = "CAM_WBMODE";
-static const char* kCAM_MODE        = "CAM_MODE";
+const char* QGCCameraControl::kCAM_EV          = "CAM_EV";
+const char* QGCCameraControl::kCAM_EXPMODE     = "CAM_EXPMODE";
+const char* QGCCameraControl::kCAM_ISO         = "CAM_ISO";
+const char* QGCCameraControl::kCAM_SHUTTERSPD  = "CAM_SHUTTERSPD";
+const char* QGCCameraControl::kCAM_APERTURE    = "CAM_APERTURE";
+const char* QGCCameraControl::kCAM_WBMODE      = "CAM_WBMODE";
+const char* QGCCameraControl::kCAM_MODE        = "CAM_MODE";
 
 //-----------------------------------------------------------------------------
 QGCCameraOptionExclusion::QGCCameraOptionExclusion(QObject* parent, QString param_, QString value_, QStringList exclusions_)
@@ -1990,9 +1990,9 @@ QGCCameraControl::iso()
 
 //-----------------------------------------------------------------------------
 Fact*
-QGCCameraControl::shutter()
+QGCCameraControl::shutterSpeed()
 {
-    return (_paramComplete && _activeSettings.contains(kCAM_SHUTTER)) ? getFact(kCAM_SHUTTER) : nullptr;
+    return (_paramComplete && _activeSettings.contains(kCAM_SHUTTERSPD)) ? getFact(kCAM_SHUTTERSPD) : nullptr;
 }
 
 //-----------------------------------------------------------------------------

src/Camera/QGCCameraControl.h

@@ -144,7 +144,7 @@ public:
     Q_PROPERTY(Fact*        exposureMode        READ exposureMode       NOTIFY parametersReady)
     Q_PROPERTY(Fact*        ev                  READ ev                 NOTIFY parametersReady)
     Q_PROPERTY(Fact*        iso                 READ iso                NOTIFY parametersReady)
-    Q_PROPERTY(Fact*        shutter             READ shutter            NOTIFY parametersReady)
+    Q_PROPERTY(Fact*        shutterSpeed        READ shutterSpeed       NOTIFY parametersReady)
     Q_PROPERTY(Fact*        aperture            READ aperture           NOTIFY parametersReady)
     Q_PROPERTY(Fact*        wb                  READ wb                 NOTIFY parametersReady)
     Q_PROPERTY(Fact*        mode                READ mode               NOTIFY parametersReady)
@@ -222,7 +222,7 @@ public:
     virtual Fact*       exposureMode        ();
     virtual Fact*       ev                  ();
     virtual Fact*       iso                 ();
-    virtual Fact*       shutter             ();
+    virtual Fact*       shutterSpeed        ();
     virtual Fact*       aperture            ();
     virtual Fact*       wb                  ();
     virtual Fact*       mode                ();
@@ -249,6 +249,16 @@ public:
     //-- Allow controller to modify or invalidate parameter change
     virtual bool        validateParameter   (Fact* pFact, QVariant& newValue);
 
+
+    // Known Parameters
+    static const char* kCAM_EV;
+    static const char* kCAM_EXPMODE;
+    static const char* kCAM_ISO;
+    static const char* kCAM_SHUTTERSPD;
+    static const char* kCAM_APERTURE;
+    static const char* kCAM_WBMODE;
+    static const char* kCAM_MODE;
+
 signals:
     void    infoChanged                     ();
     void    videoStatusChanged              ();