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

fix merge

This commit is contained in:
ladyada 2015-09-14 01:12:56 -04:00
parent dbd60ee741
commit ee085fc021
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/bme280test/bme280test.ino
View File

@ -47,15 +47,7 @@ void loop() {
Serial.println(" *C");
Serial.print("Pressure = ");
<<<<<<< HEAD
Serial.print(bme.readPressure());
Serial.println(" Pa");
Serial.print("Approx altitude = ");
Serial.print(bme.readAltitude(1013.25)); // this should be adjusted to your local forcase
Serial.println(" m");
=======
Serial.print(bme.readPressure() / 100.0F);
Serial.println(" hPa");
@ -63,7 +55,6 @@ void loop() {
Serial.print(bme.readAltitude(SEALEVELPRESSURE_HPA));
Serial.println(" m");
>>>>>>> 11ad05a034c3ef433825590ef39c8cc11cd1e50b
Serial.print("Humidity = ");
Serial.print(bme.readHumidity());
Serial.println(" %");