mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-02-23 00:04:02 -04:00
ArduCopter config: Correct LOGGING_ENABLED defaults to force disable for 1280
Per email, this is what Jason meant to do in aeb92870, but previous code forced logging enable for all non-1280 users.
This commit is contained in:
parent
005a8afa07
commit
cc38189f71
@ -662,14 +662,20 @@
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
// Dataflash logging control
|
||||
//
|
||||
#ifdef LOGGING_ENABLED
|
||||
#undef LOGGING_ENABLED
|
||||
#endif
|
||||
|
||||
#if defined( __AVR_ATmega2560__ ) // determines if optical flow code is included
|
||||
#define LOGGING_ENABLED ENABLED
|
||||
// Logging must be disabled for 1280 build.
|
||||
#if defined( __AVR_ATmega1280__ )
|
||||
# if LOGGING_ENABLED == ENABLED
|
||||
// If logging was enabled in APM_Config or command line, warn the user.
|
||||
# warning "Logging is not supported on ATmega1280"
|
||||
# undef LOGGING_ENABLED
|
||||
# endif
|
||||
# ifndef LOGGING_ENABLED
|
||||
# define LOGGING_ENABLED DISABLED
|
||||
# endif
|
||||
#else
|
||||
#define LOGGING_ENABLED DISABLED
|
||||
// Logging is enabled by default for all other builds.
|
||||
# define LOGGING_ENABLED ENABLED
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user