Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions adafruit_dps310/basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,31 +198,34 @@ def reset(self):

@property
def pressure(self):
"""Returns the current pressure reading in kPA"""
"""Returns the current pressure reading in hectoPascals (hPa)"""

temp_reading = self._raw_temperature
raw_temperature = self._twos_complement(temp_reading, 24)

pressure_reading = self._raw_pressure
raw_pressure = self._twos_complement(pressure_reading, 24)
_scaled_rawtemp = raw_temperature / self._temp_scale

_temperature = _scaled_rawtemp * self._c1 + self._c0 / 2.0

p_red = raw_pressure / self._pressure_scale
scaled_rawtemp = raw_temperature / self._temp_scale
scaled_rawpres = raw_pressure / self._pressure_scale

pres_calc = (
self._c00
+ p_red * (self._c10 + p_red * (self._c20 + p_red * self._c30))
+ _scaled_rawtemp * (self._c01 + p_red * (self._c11 + p_red * self._c21))
+ scaled_rawpres
* (self._c10 + scaled_rawpres * (self._c20 + scaled_rawpres * self._c30))
+ scaled_rawtemp
* (self._c01 + scaled_rawpres * (self._c11 + scaled_rawpres * self._c21))
)

final_pressure = pres_calc / 100
return final_pressure

@property
def altitude(self):
"""The altitude based on the sea level pressure (:attr:`sea_level_pressure`) -
which you must enter ahead of time)"""
"""The altitude in meters based on the sea level pressure
(:attr:`sea_level_pressure`) - which you must enter
ahead of time
"""
return 44330 * (
1.0 - math.pow(self.pressure / self._sea_level_pressure, 0.1903)
)
Expand Down