From 2bc2460c07309b91877a338658864489408fbd38 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 22 Aug 2012 12:12:15 +1000
Subject: [PATCH] APM: optional build with new controller libs

---
 ArduPlane/ArduPlane.pde | 5 +++++
 ArduPlane/config.h      | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde
index f549c38468..0c078ae6f9 100644
--- a/ArduPlane/ArduPlane.pde
+++ b/ArduPlane/ArduPlane.pde
@@ -52,6 +52,11 @@
 #include <AP_Airspeed.h>
 #include <memcheck.h>
 
+// optional new controller library
+#if APM_CONTROL == ENABLED
+#include <APM_Control.h>
+#endif
+
 // Configuration
 #include "config.h"
 
diff --git a/ArduPlane/config.h b/ArduPlane/config.h
index 1debcd8d01..8f520da743 100644
--- a/ArduPlane/config.h
+++ b/ArduPlane/config.h
@@ -838,3 +838,8 @@
 #ifndef OBC_FAILSAFE
  # define OBC_FAILSAFE DISABLED
 #endif
+
+// new APM_Control controller library by Jon Challinger
+#ifndef APM_CONTROL
+# define APM_CONTROL DISABLED
+#endif