From b0a44b68e4959f0f62b8730f94d82290f0aa5625 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 28 Jun 2022 21:09:38 -0400 Subject: [PATCH 1/3] Fix units in docstrings --- adafruit_dps310/basic.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_dps310/basic.py b/adafruit_dps310/basic.py index 7c8a8a4..4a8afe3 100644 --- a/adafruit_dps310/basic.py +++ b/adafruit_dps310/basic.py @@ -198,7 +198,7 @@ def reset(self): @property def pressure(self): - """Returns the current pressure reading in kPA""" + """Returns the current pressure reading in hPA""" temp_reading = self._raw_temperature raw_temperature = self._twos_complement(temp_reading, 24) @@ -221,8 +221,8 @@ def pressure(self): @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 based on the sea level pressure (:attr:`sea_level_pressure`) + in hPa - which you must enter ahead of time""" return 44330 * ( 1.0 - math.pow(self.pressure / self._sea_level_pressure, 0.1903) ) From 38d4829dddf820ba39e2846c0cc5b2f598aafe6b Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 28 Jun 2022 21:19:01 -0400 Subject: [PATCH 2/3] Update docstrings --- adafruit_dps310/basic.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/adafruit_dps310/basic.py b/adafruit_dps310/basic.py index 4a8afe3..0181659 100644 --- a/adafruit_dps310/basic.py +++ b/adafruit_dps310/basic.py @@ -198,7 +198,7 @@ def reset(self): @property def pressure(self): - """Returns the current pressure reading in hPA""" + """Returns the current pressure reading in hectoPascals (hPa)""" temp_reading = self._raw_temperature raw_temperature = self._twos_complement(temp_reading, 24) @@ -221,8 +221,10 @@ def pressure(self): @property def altitude(self): - """The altitude based on the sea level pressure (:attr:`sea_level_pressure`) - in hPa - 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) ) From 49a3d696572b07414234245c7cd011ac2bbec1ab Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Tue, 28 Jun 2022 21:20:01 -0400 Subject: [PATCH 3/3] Reorganized and changed variable names for pressure property --- adafruit_dps310/basic.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/adafruit_dps310/basic.py b/adafruit_dps310/basic.py index 0181659..d62d212 100644 --- a/adafruit_dps310/basic.py +++ b/adafruit_dps310/basic.py @@ -202,18 +202,19 @@ def pressure(self): 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