adafruit-mirror/Adafruit-BMP085-Library
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge 0b521ef7dc into 04a39d95d4

Browse source
This commit is contained in:
GitHub Merge Button 2012-02-22 00:09:54 -08:00
commit 02b7fc3227
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
BMP085.cpp
View file

@ -72,9 +72,15 @@ uint32_t BMP085::readRawPressure(void) {
_delay_ms(26);
raw = read16(BMP085_PRESSUREDATA);
raw <<= 8;
raw |= read8(BMP085_PRESSUREDATA+2);
raw >>= (8 - oversampling);
// ---- extra byte XLSB only for BMP085_ULTRAHIGHRES
if (oversampling==0) {
raw <<= 8;
raw |= read8(BMP085_PRESSUREDATA+2);
raw >>= (8 - oversampling);
}
// ---- end of edit
#if BMP085_DEBUG == 1
Serial.print("Raw pressure: "); Serial.println(raw);
#endif
@ -148,7 +154,11 @@ int32_t BMP085::readPressure(void) {
if (B7 < 0x80000000) {
p = (B7 * 2) / B4;
} else {
p = (B7 * 2) / B3;
// ---- formula not consistent with specification sheet
// p = (B7 * 2) / B3;
p = (B7 / B4) * 2;
// ---- end of edit
}
X1 = (p >> 8) * (p >> 8);
X1 = (X1 * 3038) >> 16;