From a0b6481dfdb930b0c697635d7632f910eb4e75e9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 26 Sep 2013 22:36:46 +1000 Subject: [PATCH] Copter: removed SMACCM support --- ArduCopter/ArduCopter.pde | 1 - ArduCopter/config.h | 15 +-------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/ArduCopter/ArduCopter.pde b/ArduCopter/ArduCopter.pde index b21f30dbd8..539afaed58 100644 --- a/ArduCopter/ArduCopter.pde +++ b/ArduCopter/ArduCopter.pde @@ -77,7 +77,6 @@ #include #include #include -#include #include #include #include diff --git a/ArduCopter/config.h b/ArduCopter/config.h index 1159835375..0984dd4a04 100644 --- a/ArduCopter/config.h +++ b/ArduCopter/config.h @@ -74,13 +74,6 @@ # define CONFIG_BARO AP_BARO_PX4 # define CONFIG_SONAR_SOURCE SONAR_SOURCE_ANALOG_PIN # define MAGNETOMETER ENABLED -#elif CONFIG_HAL_BOARD == HAL_BOARD_SMACCM - # define CONFIG_IMU_TYPE CONFIG_IMU_MPU6000 - # define CONFIG_BARO AP_BARO_MS5611 - # define CONFIG_MS5611_SERIAL AP_BARO_MS5611_I2C - # define CONFIG_ADC DISABLED - # define CONFIG_SONAR_SOURCE SONAR_SOURCE_ANALOG_PIN - # define MAGNETOMETER ENABLED #elif CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE # define CONFIG_IMU_TYPE CONFIG_IMU_FLYMAPLE # define CONFIG_BARO AP_BARO_BMP085 @@ -190,12 +183,6 @@ # define LED_OFF HIGH # define BATTERY_VOLT_PIN -1 # define BATTERY_CURR_PIN -1 -#elif CONFIG_HAL_BOARD == HAL_BOARD_SMACCM -// XXX these are just copied, may not make sense - # define LED_ON LOW - # define LED_OFF HIGH - # define BATTERY_VOLT_PIN -1 - # define BATTERY_CURR_PIN -1 #elif CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE # define BATTERY_VOLT_PIN 20 # define BATTERY_CURR_PIN 19 @@ -223,7 +210,7 @@ #define COPTER_LED_6 AN9 // Motor LED #define COPTER_LED_7 AN10 // Motor LED #define COPTER_LED_8 AN11 // Motor LED -#elif CONFIG_HAL_BOARD == HAL_BOARD_APM1 || CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL || CONFIG_HAL_BOARD == HAL_BOARD_PX4 || HAL_BOARD_SMACCM +#elif CONFIG_HAL_BOARD == HAL_BOARD_APM1 || CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL || CONFIG_HAL_BOARD == HAL_BOARD_PX4 #define COPTER_LED_1 AN8 // Motor or Aux LED #define COPTER_LED_2 AN9 // Motor LED #define COPTER_LED_3 AN10 // Motor or GPS LED