Merge pull request #20 from things-nyc/fix-await-calibration

Reset on begin and read coefficients only after calibration
This commit is contained in:
Limor "Ladyada" Fried 2017-02-11 21:50:19 -05:00 committed by GitHub
commit f1e14909c7
2 changed files with 25 additions and 1 deletions

View File

@ -66,8 +66,19 @@ bool Adafruit_BME280::begin(uint8_t addr)
if (read8(BME280_REGISTER_CHIPID) != 0x60)
return false;
// reset the device using soft-reset
// this makes sure the IIR is off, etc.
write8(BME280_REGISTER_SOFTRESET, 0xB6);
// wait for chip to wake up.
delay(300);
// if chip is still reading calibration, delay
while (isReadingCalibration())
delay(100);
readCoefficients(); // read trimming parameters, see DS 4.2.2
setSampling(); // use defaults
return true;
@ -338,6 +349,18 @@ void Adafruit_BME280::readCoefficients(void)
_bme280_calib.dig_H6 = (int8_t)read8(BME280_REGISTER_DIG_H6);
}
/**************************************************************************/
/*!
@brief return true if chip is busy reading cal data
*/
/**************************************************************************/
bool Adafruit_BME280::isReadingCalibration(void)
{
uint8_t const rStatus = read8(BME280_REGISTER_STATUS);
return (rStatus & (1 << 0)) != 0;
}
/**************************************************************************/
/*!

View File

@ -187,6 +187,7 @@ class Adafruit_BME280 {
private:
void readCoefficients(void);
bool isReadingCalibration(void);
uint8_t spixfer(uint8_t x);
void write8(byte reg, byte value);