diff --git a/ArduCopter/config.h b/ArduCopter/config.h index 180e720cbb..99cfed5176 100644 --- a/ArduCopter/config.h +++ b/ArduCopter/config.h @@ -58,7 +58,6 @@ #if CONFIG_HAL_BOARD == HAL_BOARD_APM2 # define CONFIG_IMU_TYPE CONFIG_IMU_MPU6000 # define CONFIG_PUSHBUTTON DISABLED - # define CONFIG_RELAY DISABLED # define CONFIG_SONAR_SOURCE SONAR_SOURCE_ANALOG_PIN # define MAGNETOMETER ENABLED # ifdef APM2_BETA_HARDWARE @@ -70,14 +69,12 @@ #elif CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL # define CONFIG_IMU_TYPE CONFIG_IMU_SITL # define CONFIG_PUSHBUTTON DISABLED - # define CONFIG_RELAY DISABLED # define CONFIG_SONAR_SOURCE SONAR_SOURCE_ANALOG_PIN # define MAGNETOMETER ENABLED #elif CONFIG_HAL_BOARD == HAL_BOARD_PX4 # define CONFIG_IMU_TYPE CONFIG_IMU_PX4 # define CONFIG_BARO AP_BARO_PX4 # define CONFIG_PUSHBUTTON DISABLED - # define CONFIG_RELAY DISABLED # define CONFIG_SONAR_SOURCE SONAR_SOURCE_ANALOG_PIN # define MAGNETOMETER ENABLED #elif CONFIG_HAL_BOARD == HAL_BOARD_SMACCM @@ -86,7 +83,6 @@ # define CONFIG_MS5611_SERIAL AP_BARO_MS5611_I2C # define CONFIG_ADC DISABLED # define CONFIG_PUSHBUTTON DISABLED - # define CONFIG_RELAY DISABLED # define CONFIG_SONAR_SOURCE SONAR_SOURCE_ANALOG_PIN # define MAGNETOMETER ENABLED #endif @@ -253,10 +249,6 @@ # define CONFIG_PUSHBUTTON ENABLED #endif -#ifndef CONFIG_RELAY - # define CONFIG_RELAY ENABLED -#endif - ////////////////////////////////////////////////////////////////////////////// // Barometer //