From 785b6ec52cc96d4e81529c80b658d4eb5bc51ddd Mon Sep 17 00:00:00 2001 From: ladyada Date: Mon, 14 Sep 2015 01:14:33 -0400 Subject: [PATCH] *sigh* more merge fixing --- Adafruit_BME280.cpp | 11 ----------- Adafruit_BME280.h | 5 ----- 2 files changed, 16 deletions(-) diff --git a/Adafruit_BME280.cpp b/Adafruit_BME280.cpp index a6b656b..6622960 100644 --- a/Adafruit_BME280.cpp +++ b/Adafruit_BME280.cpp @@ -283,17 +283,6 @@ float Adafruit_BME280::readPressure(void) { } -float Adafruit_BME280::readAltitude(float seaLevelhPa) { - float altitude; - - float pressure = readPressure(); // in Si units for Pascal - pressure /= 100; - - altitude = 44330 * (1.0 - pow(pressure / seaLevelhPa, 0.1903)); - - return altitude; -} - /**************************************************************************/ /*! diff --git a/Adafruit_BME280.h b/Adafruit_BME280.h index 5fd3688..b8cd51a 100644 --- a/Adafruit_BME280.h +++ b/Adafruit_BME280.h @@ -140,12 +140,7 @@ class Adafruit_BME280 float readTemperature(void); float readPressure(void); float readHumidity(void); -<<<<<<< HEAD - - float readAltitude(float seaLevelhPa = 1013.25); -======= float readAltitude(float seaLevel); ->>>>>>> 11ad05a034c3ef433825590ef39c8cc11cd1e50b private: