diff --git a/ArduPlane/config.h b/ArduPlane/config.h index 161959e89f..b5942b2d39 100644 --- a/ArduPlane/config.h +++ b/ArduPlane/config.h @@ -59,7 +59,27 @@ #endif #if defined( __AVR_ATmega1280__ ) + // default choices for a 1280. We can't fit everything in, so we + // make some popular choices #define LOGGING_ENABLED DISABLED + #ifndef CONFIG_RELAY + # define CONFIG_RELAY DISABLED + #endif + #ifndef GEOFENCE_ENABLED + # define GEOFENCE_ENABLED DISABLED + #endif + #ifndef CLI_ENABLED + # define CLI_ENABLED DISABLED + #endif + #ifndef MOUNT2 + # define MOUNT2 DISABLED + #endif + #ifndef MOUNT + # define MOUNT ENABLED + #endif + #ifndef CAMERA + # define CAMERA DISABLED + #endif #endif ////////////////////////////////////////////////////////////////////////////// @@ -438,27 +458,6 @@ # define MOUNT2 DISABLED #endif -#if defined( __AVR_ATmega1280__ ) && (MOUNT == ENABLED || MOUNT2 == ENABLED) - -// The small ATmega1280 chip does not have enough memory for mount support -// so disable CLI, this will allow mount support and other improvements to fit. -// This should almost have no side effects, because the APM planner can now do a complete board setup. - # define CLI_ENABLED DISABLED - -// The small ATmega1280 chip does not have enough memory for mount support -// so disable AUTO GPS support, this will allow mount support and other improvements to fit. -// This should almost have no side effects, because the most users use MTK anyways. -// If the user defined a GPS protocol, than we will NOT overwrite it - # if GPS_PROTOCOL == GPS_PROTOCOL_AUTO - # undef GPS_PROTOCOL - # define GPS_PROTOCOL GPS_PROTOCOL_MTK - # endif - - # undef CAMERA - # define CAMERA DISABLED -#endif - - ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// // FLIGHT AND NAVIGATION CONTROL