Skip to content

Commit 5ed1e61

Browse files
authored
Merge pull request #24 from tekktrik/dev/fix-units
Fix units
2 parents 0b4f55c + 49a3d69 commit 5ed1e61

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

adafruit_dps310/basic.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -198,31 +198,34 @@ def reset(self):
198198

199199
@property
200200
def pressure(self):
201-
"""Returns the current pressure reading in kPA"""
201+
"""Returns the current pressure reading in hectoPascals (hPa)"""
202202

203203
temp_reading = self._raw_temperature
204204
raw_temperature = self._twos_complement(temp_reading, 24)
205+
205206
pressure_reading = self._raw_pressure
206207
raw_pressure = self._twos_complement(pressure_reading, 24)
207-
_scaled_rawtemp = raw_temperature / self._temp_scale
208-
209-
_temperature = _scaled_rawtemp * self._c1 + self._c0 / 2.0
210208

211-
p_red = raw_pressure / self._pressure_scale
209+
scaled_rawtemp = raw_temperature / self._temp_scale
210+
scaled_rawpres = raw_pressure / self._pressure_scale
212211

213212
pres_calc = (
214213
self._c00
215-
+ p_red * (self._c10 + p_red * (self._c20 + p_red * self._c30))
216-
+ _scaled_rawtemp * (self._c01 + p_red * (self._c11 + p_red * self._c21))
214+
+ scaled_rawpres
215+
* (self._c10 + scaled_rawpres * (self._c20 + scaled_rawpres * self._c30))
216+
+ scaled_rawtemp
217+
* (self._c01 + scaled_rawpres * (self._c11 + scaled_rawpres * self._c21))
217218
)
218219

219220
final_pressure = pres_calc / 100
220221
return final_pressure
221222

222223
@property
223224
def altitude(self):
224-
"""The altitude based on the sea level pressure (:attr:`sea_level_pressure`) -
225-
which you must enter ahead of time)"""
225+
"""The altitude in meters based on the sea level pressure
226+
(:attr:`sea_level_pressure`) - which you must enter
227+
ahead of time
228+
"""
226229
return 44330 * (
227230
1.0 - math.pow(self.pressure / self._sea_level_pressure, 0.1903)
228231
)

0 commit comments

Comments
 (0)