updated for adler

This commit is contained in:
Lars Wilko Sentse
2024-06-19 14:53:36 +02:00
parent 3a0d38bf7a
commit 22180ab7af
2 changed files with 16 additions and 9 deletions

View File

@@ -20,7 +20,7 @@ namespace sta
STA_ASSERT(device != nullptr);
}
MS56xx::MS56xx(I2CDevice * device, Version version, DelayUsFunc delay, OsrLevel osr /* = OsrLevel::_1024 */)
/*MS56xx::MS56xx(I2CDevice * device, Version version, DelayUsFunc delay, OsrLevel osr = OsrLevel::_1024)
: device_{device},
version_{version},
delay_{delay},
@@ -29,7 +29,7 @@ namespace sta
C_{}
{
STA_ASSERT(device != nullptr);
}
}*/
bool MS56xx::init()
{
@@ -65,7 +65,7 @@ namespace sta
delay_(osrDelay());
}
float MS56xx::getPressure(Unit unit /* = Unit::hPa */)
MSData MS56xx::getPressure(Unit unit /* = Unit::hPa */)
{
requestData(TEMPERATURE);
uint8_t buffer[3] = { 0x00, 0x00, 0x00 };
@@ -86,8 +86,9 @@ namespace sta
// Convert to desired unit.
pressure = convertPressure(pressure, unit);
float temperature = (2000 + dT_ * C_[6]) * 0.01;
return pressure;
return MSData{pressure, temperature};
}
float MS56xx::getTemperature()
@@ -111,7 +112,7 @@ namespace sta
float MS56xx::getAltitudeEstimate()
{
float pressure = getPressure(Unit::hPa);
float pressure = getPressure(Unit::hPa).pressure;
// Taken from: https://cdn-shop.adafruit.com/datasheets/BST-BMP180-DS000-09.pdf, page 16
float altitude = 44330 * (1 - std::pow(pressure / sealevel_, 1 / 5.255));