APM: enable AP_Declination by default

This commit is contained in:
Andrew Tridgell 2012-03-30 14:19:02 +11:00
parent 0bc604f030
commit 86cc7a5e1d
2 changed files with 1 additions and 10 deletions

View File

@ -59,10 +59,7 @@ version 2.1 of the License, or (at your option) any later version.
#include "Parameters.h" #include "Parameters.h"
#include "GCS.h" #include "GCS.h"
#if AUTOMATIC_DECLINATION == ENABLED
// this is in an #if to avoid the static data
#include <AP_Declination.h> // ArduPilot Mega Declination Helper Library #include <AP_Declination.h> // ArduPilot Mega Declination Helper Library
#endif
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Serial ports // Serial ports
@ -975,12 +972,10 @@ static void update_GPS(void)
init_home(); init_home();
} }
#if AUTOMATIC_DECLINATION == ENABLED
if (g.compass_enabled) { if (g.compass_enabled) {
// Set compass declination automatically // Set compass declination automatically
compass.set_initial_location(g_gps->latitude, g_gps->longitude, false); compass.set_initial_location(g_gps->latitude, g_gps->longitude);
} }
#endif
ground_start_count = 0; ground_start_count = 0;
} }
} }

View File

@ -418,10 +418,6 @@
# define GROUND_START_DELAY 0 # define GROUND_START_DELAY 0
#endif #endif
#ifndef AUTOMATIC_DECLINATION
#define AUTOMATIC_DECLINATION ENABLED
#endif
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// ENABLE_AIR_START // ENABLE_AIR_START
// //