mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-02-01 21:48:28 -04:00
Getting rid of Simple Logging
This commit is contained in:
parent
0f91fbcee5
commit
d7af42c925
@ -672,22 +672,21 @@
|
|||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
// Dataflash logging control
|
// Dataflash logging control
|
||||||
//
|
//
|
||||||
|
// Logging must be disabled for 1280 build.
|
||||||
#if defined( __AVR_ATmega1280__ )
|
#if defined( __AVR_ATmega1280__ )
|
||||||
# ifndef CONFIG_LOGGING
|
# if LOGGING_ENABLED == ENABLED
|
||||||
# define CONFIG_LOGGING LOGGING_SIMPLE
|
// If logging was enabled in APM_Config or command line, warn the user.
|
||||||
# elif CONFIG_LOGGING != LOGGING_SIMPLE
|
# warning "Logging is not supported on ATmega1280"
|
||||||
# warning "Simple Logging is the only officially supported mode on mega 1280"
|
# undef LOGGING_ENABLED
|
||||||
# endif
|
# endif
|
||||||
|
# ifndef LOGGING_ENABLED
|
||||||
|
# define LOGGING_ENABLED DISABLED
|
||||||
|
# endif
|
||||||
|
#elif !defined(LOGGING_ENABLED)
|
||||||
|
// Logging is enabled by default for all other builds.
|
||||||
|
# define LOGGING_ENABLED ENABLED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CONFIG_LOGGING
|
|
||||||
# define CONFIG_LOGGING LOGGING_VERBOSE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef LOGGING_ENABLED
|
|
||||||
# define LOGGING_ENABLED ENABLED
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef LOG_ATTITUDE_FAST
|
#ifndef LOG_ATTITUDE_FAST
|
||||||
# define LOG_ATTITUDE_FAST DISABLED
|
# define LOG_ATTITUDE_FAST DISABLED
|
||||||
@ -782,7 +781,7 @@
|
|||||||
// Navigation defaults
|
// Navigation defaults
|
||||||
//
|
//
|
||||||
#ifndef WP_RADIUS_DEFAULT
|
#ifndef WP_RADIUS_DEFAULT
|
||||||
# define WP_RADIUS_DEFAULT 1
|
# define WP_RADIUS_DEFAULT 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef LOITER_RADIUS
|
#ifndef LOITER_RADIUS
|
||||||
|
Loading…
Reference in New Issue
Block a user