From 358dc91d415e145a4d84de0e4e59104adc5fe182 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 12 Dec 2011 14:59:39 +1100
Subject: [PATCH] fixed hil ArduCopter build

---
 ArduCopter/config.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ArduCopter/config.h b/ArduCopter/config.h
index 7a8d61480d..28f4eb6d68 100644
--- a/ArduCopter/config.h
+++ b/ArduCopter/config.h
@@ -213,6 +213,8 @@
  # undef GPS_PROTOCOL
  # define GPS_PROTOCOL GPS_PROTOCOL_NONE
 
+ #undef CONFIG_SONAR
+ #define CONFIG_SONAR DISABLED
 #endif
 
 
@@ -667,7 +669,7 @@
 # ifndef LOGGING_ENABLED
 #  define LOGGING_ENABLED    DISABLED
 # endif
-#else
+#elif LOGGING_ENABLED != DISABLED
 // Logging is enabled by default for all other builds.
 # define LOGGING_ENABLED		ENABLED
 #endif