From 43c88c37eb402c65db1ccac387b4d4c015e9970e Mon Sep 17 00:00:00 2001
From: Staroselskii Georgii <gosha371@gmail.com>
Date: Wed, 26 Nov 2014 15:16:51 +0300
Subject: [PATCH] AP_Baro: fixed MS5611 initialisation in order to get rid off
 conflicts with other I2C devices

---
 libraries/AP_Baro/AP_Baro_MS5611.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/AP_Baro/AP_Baro_MS5611.cpp b/libraries/AP_Baro/AP_Baro_MS5611.cpp
index 8f3eecef21..9b180b0d72 100644
--- a/libraries/AP_Baro/AP_Baro_MS5611.cpp
+++ b/libraries/AP_Baro/AP_Baro_MS5611.cpp
@@ -287,6 +287,7 @@ bool AP_Baro_MS5611::check_crc(void)
 // SPI should be initialized externally
 bool AP_Baro_MS5611::init()
 {
+    hal.scheduler->suspend_timer_procs();
     if (_serial == NULL) {
         hal.scheduler->panic(PSTR("PANIC: AP_Baro_MS5611: NULL serial driver"));
         return false; /* never reached */
@@ -330,6 +331,7 @@ bool AP_Baro_MS5611::init()
     _d1_count = 0;
     _d2_count = 0;
 
+    hal.scheduler->resume_timer_procs();
     hal.scheduler->register_timer_process( AP_HAL_MEMBERPROC(&AP_Baro_MS5611::_update));
     _serial->sem_give();