From f7b3914a91f8fc58f15f989fec1cd30f8999a737 Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Thu, 10 Sep 2015 00:21:43 +0100 Subject: [PATCH] Fixing merge and build broken by 3cf77579ba0cc728a32bdf3b1446d76c2656ec92 --- src/main/drivers/barometer_bmp085.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/drivers/barometer_bmp085.c b/src/main/drivers/barometer_bmp085.c index b796c5e826..a46b8f20c4 100644 --- a/src/main/drivers/barometer_bmp085.c +++ b/src/main/drivers/barometer_bmp085.c @@ -110,7 +110,6 @@ STATIC_UNIT_TESTED bmp085_t bmp085; #define UT_DELAY 6000 // 1.5ms margin according to the spec (4.5ms T conversion time) #define UP_DELAY 27000 // 6000+21000=27000 1.5ms margin according to the spec (25.5ms P conversion time with OSS=3) -static bmp085_t bmp085; static bool bmp085InitDone = false; STATIC_UNIT_TESTED uint16_t bmp085_ut; // static result of temperature measurement STATIC_UNIT_TESTED uint32_t bmp085_up; // static result of pressure measurement