diff --git a/libraries/AP_HAL/AP_HAL_Boards.h b/libraries/AP_HAL/AP_HAL_Boards.h index c568176e40..ff8f306310 100644 --- a/libraries/AP_HAL/AP_HAL_Boards.h +++ b/libraries/AP_HAL/AP_HAL_Boards.h @@ -10,7 +10,6 @@ #define HAL_BOARD_SITL 3 #define HAL_BOARD_SMACCM 4 // unused #define HAL_BOARD_PX4 5 -#define HAL_BOARD_FLYMAPLE 6 #define HAL_BOARD_LINUX 7 #define HAL_BOARD_VRBRAIN 8 #define HAL_BOARD_QURT 9 @@ -57,7 +56,6 @@ #define HAL_INS_MPU60XX_I2C 3 #define HAL_INS_HIL 4 #define HAL_INS_PX4 5 -#define HAL_INS_FLYMAPLE 6 #define HAL_INS_L3G4200D 7 #define HAL_INS_VRBRAIN 8 #define HAL_INS_MPU9250_SPI 9 @@ -108,7 +106,6 @@ Note that these are only approximate, not exact CPU speeds. */ #define HAL_CPU_CLASS_16 1 // DEPRECATED: 16Mhz, AVR2560 or similar -#define HAL_CPU_CLASS_75 2 // 75Mhz, Flymaple or similar #define HAL_CPU_CLASS_150 3 // 150Mhz, PX4 or similar, assumes // hardware floating point. Assumes tens // of kilobytes of memory available @@ -144,26 +141,6 @@ #define HAL_GPIO_LED_ON LOW #define HAL_GPIO_LED_OFF HIGH -#elif CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE -#define HAL_BOARD_NAME "FLYMAPLE" -#define HAL_CPU_CLASS HAL_CPU_CLASS_75 -#define HAL_STORAGE_SIZE 4096 -#define HAL_STORAGE_SIZE_AVAILABLE HAL_STORAGE_SIZE -#define HAL_INS_DEFAULT HAL_INS_FLYMAPLE -#define HAL_BARO_DEFAULT HAL_BARO_BMP085 -#define HAL_BARO_BMP085_BUS 1 -#define HAL_BARO_BMP085_I2C_ADDR 0x77 -#define HAL_COMPASS_DEFAULT HAL_COMPASS_HMC5843 -#define HAL_COMPASS_HMC5843_I2C_BUS 1 -#define HAL_COMPASS_HMC5843_I2C_ADDR 0x1E -#define HAL_SERIAL0_BAUD_DEFAULT 115200 -#define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_NONE -#define HAL_GPIO_A_LED_PIN 13 -#define HAL_GPIO_B_LED_PIN 13 -#define HAL_GPIO_C_LED_PIN 13 -#define HAL_GPIO_LED_ON LOW -#define HAL_GPIO_LED_OFF HIGH - #elif CONFIG_HAL_BOARD == HAL_BOARD_PX4 #define HAL_BOARD_NAME "PX4" #define HAL_CPU_CLASS HAL_CPU_CLASS_150 diff --git a/libraries/AP_HAL/AP_HAL_Main.h b/libraries/AP_HAL/AP_HAL_Main.h index f01e42a521..e26045a1c3 100644 --- a/libraries/AP_HAL/AP_HAL_Main.h +++ b/libraries/AP_HAL/AP_HAL_Main.h @@ -2,11 +2,7 @@ #include "HAL.h" -#if CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE -#define CONFIG_MAIN_WITHOUT_ARGC_ARGV 1 -#else #define CONFIG_MAIN_WITHOUT_ARGC_ARGV 0 -#endif #if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN #define AP_MAIN __EXPORT ArduPilot_main