aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copter: remove second camera mount

Browse Source
This commit is contained in:
Randy Mackay 2014-12-16 21:23:33 +09:00
parent 976ae14f1f
commit b6bcf841e1
4 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ArduCopter/ArduCopter.pde
View File

@ -686,11 +686,6 @@ static AP_HAL::AnalogSource* rssi_analog_source;
static AP_Mount camera_mount(&current_loc, ahrs, 0); static AP_Mount camera_mount(&current_loc, ahrs, 0);
#endif #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 // AC_Fence library to reduce fly-aways
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1043,11 +1038,6 @@ static void update_mount()
camera_mount.update_mount_position(); camera_mount.update_mount_position();
#endif #endif
#if MOUNT2 == ENABLED
// update camera mount's position
camera_mount2.update_mount_position();
#endif
#if CAMERA == ENABLED #if CAMERA == ENABLED
camera.trigger_pic_cleanup(); camera.trigger_pic_cleanup();
#endif #endif
@ -1168,10 +1158,6 @@ static void one_hz_loop()
camera_mount.update_mount_type(); camera_mount.update_mount_type();
#endif #endif
#if MOUNT2 == ENABLED
camera_mount2.update_mount_type();
#endif
check_usb_mux(); check_usb_mux();
#if AP_TERRAIN_AVAILABLE #if AP_TERRAIN_AVAILABLE

2
ArduCopter/Parameters.h
View File

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

6
ArduCopter/Parameters.pde
View File

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

4
ArduCopter/config.h
View File

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