From bd00b629e7ed8e4cd67d49b3580c7e65a4e1aa7c Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Tue, 29 Nov 2011 20:36:07 -0800
Subject: [PATCH] ArduCopter Init: different call to barometer.init based on
 CONFIG_BARO

* BMP085 has two arguments, second varying on apm1/apm2
* ms5611 has no arguments
---
 ArduCopter/system.pde | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ArduCopter/system.pde b/ArduCopter/system.pde
index 6904fad8fa..abe891eeb2 100644
--- a/ArduCopter/system.pde
+++ b/ArduCopter/system.pde
@@ -244,11 +244,16 @@ static void init_ardupilot()
         adc.Init(&timer_scheduler);       // APM ADC library initialization
 #endif // CONFIG_ADC
 
-#if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
-        barometer.Init(1, true);
-#else
-        barometer.Init(1, false);
-#endif // CONFIG_APM_HARDWARE
+#if CONFIG_BARO == AP_BARO_MS5611
+        barometer.init();
+#elif CONFIG_BARO == AP_BARO_BMP085
+# if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
+        #warning bmp085 for apm2
+        barometer.init(1, true);
+# else
+        barometer.init(1, false);
+# endif // CONFIG_APM_HARDWARE
+#endif // CONFIG_BARO
 
 #endif // HIL_MODE