Cansat
/
esp32_Adafruit_BME280_Library
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*sigh* more merge fixing

This commit is contained in:
ladyada 2015-09-14 01:14:33 -04:00
parent ee085fc021
commit 785b6ec52c
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Adafruit_BME280.cpp
View File

@ -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;
}
/**************************************************************************/
/*!

5
Adafruit_BME280.h
View File

@ -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: