global: use static method to construct AP_Camera

APMrover2/Rover.cpp

@@ -31,9 +31,6 @@ Rover::Rover(void) :
     modes(&g.mode1),
     L1_controller(ahrs, nullptr),
     nav_controller(&L1_controller),
-#if CAMERA == ENABLED
-    camera(&relay, MASK_LOG_CAMERA, current_loc, gps, ahrs),
-#endif
 #if MOUNT == ENABLED
     camera_mount(ahrs, current_loc),
 #endif

APMrover2/Rover.h

@@ -206,14 +206,14 @@ private:
 
     AP_ServoRelayEvents ServoRelayEvents = AP_ServoRelayEvents::create(relay);
 
+    // The rover's current location
+    struct Location current_loc;
+
     // Camera
 #if CAMERA == ENABLED
-    AP_Camera camera;
+    AP_Camera camera = AP_Camera::create(&relay, MASK_LOG_CAMERA, current_loc, gps, ahrs);
 #endif
 
-    // The rover's current location
-    struct Location current_loc;
-
     // Camera/Antenna mount tracking and stabilisation stuff
 #if MOUNT == ENABLED
     // current_loc uses the baro/gps solution for altitude rather than gps only.

ArduCopter/Copter.cpp

@@ -66,9 +66,6 @@ Copter::Copter(void)
     mainLoop_count(0),
     rtl_loiter_start_time(0),
     auto_trim_counter(0),
-#if CAMERA == ENABLED
-    camera(&relay, MASK_LOG_CAMERA, current_loc, gps, ahrs),
-#endif
 #if MOUNT == ENABLED
     camera_mount(ahrs, current_loc),
 #endif

ArduCopter/Copter.h

@@ -541,9 +541,9 @@ private:
     // handle repeated servo and relay events
     AP_ServoRelayEvents ServoRelayEvents = AP_ServoRelayEvents::create(relay);
 
-    // Reference to the camera object (it uses the relay object inside it)
+    // Camera
 #if CAMERA == ENABLED
-    AP_Camera camera;
+    AP_Camera camera = AP_Camera::create(&relay, MASK_LOG_CAMERA, current_loc, gps, ahrs);
 #endif
 
     // Camera/Antenna mount tracking and stabilisation stuff

ArduPlane/Plane.h

@@ -274,7 +274,7 @@ private:
 
     // Camera
 #if CAMERA == ENABLED
-    AP_Camera camera{&relay, MASK_LOG_CAMERA, current_loc, gps, ahrs};
+    AP_Camera camera = AP_Camera::create(&relay, MASK_LOG_CAMERA, current_loc, gps, ahrs);
 #endif
 
 #if OPTFLOW == ENABLED

ArduSub/Sub.cpp

@@ -59,9 +59,6 @@ Sub::Sub(void)
           pmTest1(0),
           fast_loopTimer(0),
           mainLoop_count(0),
-#if CAMERA == ENABLED
-          camera(&relay, MASK_LOG_CAMERA, current_loc, gps, ahrs),
-#endif
 #if MOUNT == ENABLED
           camera_mount(ahrs, current_loc),
 #endif

ArduSub/Sub.h

@@ -413,9 +413,9 @@ private:
     // handle repeated servo and relay events
     AP_ServoRelayEvents ServoRelayEvents = AP_ServoRelayEvents::create(relay);
 
-    // Reference to the camera object (it uses the relay object inside it)
+    // Camera
 #if CAMERA == ENABLED
-    AP_Camera camera;
+    AP_Camera camera = AP_Camera::create(&relay, MASK_LOG_CAMERA, current_loc, gps, ahrs);
 #endif
 
     // Camera/Antenna mount tracking and stabilisation stuff