From 7b2896c72bd23f75b7bd2191433f0d8edcc885c1 Mon Sep 17 00:00:00 2001 From: Amilcar Lucas Date: Sat, 4 Aug 2012 18:38:50 +0200 Subject: [PATCH] Merge from ArduPlane --- ArduCopter/config.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/ArduCopter/config.h b/ArduCopter/config.h index ee18040a97..546e4c45a2 100644 --- a/ArduCopter/config.h +++ b/ArduCopter/config.h @@ -477,11 +477,22 @@ # define MOUNT ENABLED #endif -#if defined( __AVR_ATmega1280__ ) && MOUNT == ENABLED -// The small ATmega1280 chip does not have enough memory for camera support -// so disable CLI, this will allow camera support and other improvements to fit. +#if defined( __AVR_ATmega1280__ ) && (MOUNT == 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 +# 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 + #endif