Copter: remove second camera mount

ArduCopter/ArduCopter.pde

@@ -686,11 +686,6 @@ static AP_HAL::AnalogSource* rssi_analog_source;
 static AP_Mount camera_mount(&current_loc, ahrs, 0);
 #endif
 
-#if MOUNT2 == ENABLED
-// current_loc uses the baro/gps soloution for altitude rather than gps only.
-static AP_Mount camera_mount2(&current_loc, ahrs, 1);
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 // AC_Fence library to reduce fly-aways
 ////////////////////////////////////////////////////////////////////////////////
@@ -1043,11 +1038,6 @@ static void update_mount()
     camera_mount.update_mount_position();
 #endif
 
-#if MOUNT2 == ENABLED
-    // update camera mount's position
-    camera_mount2.update_mount_position();
-#endif
-
 #if CAMERA == ENABLED
     camera.trigger_pic_cleanup();
 #endif
@@ -1168,10 +1158,6 @@ static void one_hz_loop()
     camera_mount.update_mount_type();
 #endif
 
-#if MOUNT2 == ENABLED
-    camera_mount2.update_mount_type();
-#endif
-
     check_usb_mux();
 
 #if AP_TERRAIN_AVAILABLE

ArduCopter/Parameters.h

@@ -219,7 +219,7 @@ public:
         //
         k_param_camera = 165,
         k_param_camera_mount,
-        k_param_camera_mount2,
+        k_param_camera_mount2,      // deprecated
 
         //
         // Batery monitoring parameters

ArduCopter/Parameters.pde

@@ -941,12 +941,6 @@ const AP_Param::Info var_info[] PROGMEM = {
     GOBJECT(camera_mount,           "MNT_", AP_Mount),
 #endif
 
-#if MOUNT2 == ENABLED
-    // @Group: MNT2_
-    // @Path: ../libraries/AP_Mount/AP_Mount.cpp
-    GOBJECT(camera_mount2,           "MNT2_",       AP_Mount),
-#endif
-
     // @Group: BATT_
     // @Path: ../libraries/AP_BattMonitor/AP_BattMonitor.cpp
     GOBJECT(battery,                "BATT_",       AP_BattMonitor),

ArduCopter/config.h

@@ -529,10 +529,6 @@
  # define MOUNT         ENABLED
 #endif
 
-#ifndef MOUNT2
- # define MOUNT2         DISABLED
-#endif
-
 
 //////////////////////////////////////////////////////////////////////////////
 // Flight mode definitions