From d9baf334c4fab96b31f00310744c823a8d417026 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Wed, 2 Dec 2015 14:56:24 +0900 Subject: [PATCH] Copter: remove unused definitions --- ArduCopter/config.h | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/ArduCopter/config.h b/ArduCopter/config.h index a6f650cab1..eddb69bcdb 100644 --- a/ArduCopter/config.h +++ b/ArduCopter/config.h @@ -52,10 +52,8 @@ #endif #if HIL_MODE != HIL_MODE_DISABLED // we are in HIL mode - #undef CONFIG_BARO - #define CONFIG_BARO HAL_BARO_HIL - #undef CONFIG_COMPASS - #define CONFIG_COMPASS HAL_COMPASS_HIL + #undef CONFIG_SONAR + #define CONFIG_SONAR DISABLED #endif #define MAGNETOMETER ENABLED @@ -145,14 +143,6 @@ # define RC_FAST_SPEED 490 #endif -////////////////////////////////////////////////////////////////////////////// -// Barometer -// - -#ifndef CONFIG_BARO - # define CONFIG_BARO AP_BARO_BMP085 -#endif - ////////////////////////////////////////////////////////////////////////////// // Sonar // @@ -185,20 +175,6 @@ # define SONAR_TILT_CORRECTION DISABLED #endif -////////////////////////////////////////////////////////////////////////////// -// HIL_MODE OPTIONAL - -#ifndef HIL_MODE - #define HIL_MODE HIL_MODE_DISABLED -#endif - -#if HIL_MODE != HIL_MODE_DISABLED // we are in HIL mode - - #undef CONFIG_SONAR - #define CONFIG_SONAR DISABLED - -#endif - #ifndef MAV_SYSTEM_ID # define MAV_SYSTEM_ID 1