From 5dbd2a2b600b8f90d3d9af259e50655ce9153bcb Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 30 Mar 2012 14:19:02 +1100
Subject: [PATCH] APM: enable AP_Declination by default

---
 ArduPlane/ArduPlane.pde | 7 +------
 ArduPlane/config.h      | 4 ----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde
index dd5f0fbaea..8235efef78 100644
--- a/ArduPlane/ArduPlane.pde
+++ b/ArduPlane/ArduPlane.pde
@@ -59,10 +59,7 @@ version 2.1 of the License, or (at your option) any later version.
 #include "Parameters.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
-#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Serial ports
@@ -975,12 +972,10 @@ static void update_GPS(void)
 					init_home();
 				}
 
-#if AUTOMATIC_DECLINATION == ENABLED
 				if (g.compass_enabled) {
 					// 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;
 			}
 		}
diff --git a/ArduPlane/config.h b/ArduPlane/config.h
index efd2ffe394..07b777f4b4 100644
--- a/ArduPlane/config.h
+++ b/ArduPlane/config.h
@@ -418,10 +418,6 @@
 # define GROUND_START_DELAY		0
 #endif
 
-#ifndef AUTOMATIC_DECLINATION
-	#define AUTOMATIC_DECLINATION ENABLED
-#endif
-
 //////////////////////////////////////////////////////////////////////////////
 // ENABLE_AIR_START
 //