From 405867a4aa9ee7a7cf10856e5905aa69c1b19443 Mon Sep 17 00:00:00 2001 From: cn Date: Fri, 7 Dec 2018 11:26:50 +0100 Subject: [PATCH] Use standard units for pressure measures, let user choose conversion --- examples/read-all.py | 2 +- examples/temp-offset.py | 2 +- examples/temp-press-hum.py | 2 +- library/bme680/__init__.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/read-all.py b/examples/read-all.py index 1c23ed0..d7d0df1 100755 --- a/examples/read-all.py +++ b/examples/read-all.py @@ -57,7 +57,7 @@ try: if sensor.get_sensor_data(): output = '{0:.2f} C,{1:.2f} hPa,{2:.2f} %RH'.format( sensor.data.temperature, - sensor.data.pressure, + sensor.data.pressure / 100.0, sensor.data.humidity) if sensor.data.heat_stable: diff --git a/examples/temp-offset.py b/examples/temp-offset.py index 2ccd73d..aa7e2b4 100755 --- a/examples/temp-offset.py +++ b/examples/temp-offset.py @@ -24,7 +24,7 @@ def display_data(offset=0): sensor.get_sensor_data() output = '{0:.2f} C, {1:.2f} hPa, {2:.3f} %RH'.format( sensor.data.temperature, - sensor.data.pressure, + sensor.data.pressure / 100.0, sensor.data.humidity) print(output) print('') diff --git a/examples/temp-press-hum.py b/examples/temp-press-hum.py index 8a2702d..8182dbd 100755 --- a/examples/temp-press-hum.py +++ b/examples/temp-press-hum.py @@ -31,7 +31,7 @@ try: output = '{0:.2f} C,{1:.2f} hPa,{2:.3f} %RH'.format( sensor.data.temperature, - sensor.data.pressure, + sensor.data.pressure / 100.0, sensor.data.humidity) print(output) diff --git a/library/bme680/__init__.py b/library/bme680/__init__.py index 62aa7ea..df6f7a4 100644 --- a/library/bme680/__init__.py +++ b/library/bme680/__init__.py @@ -291,7 +291,7 @@ class BME680(BME680Data): self.data.temperature = temperature / 100.0 self.ambient_temperature = temperature # Saved for heater calc - self.data.pressure = self._calc_pressure(adc_pres) / 100.0 + self.data.pressure = self._calc_pressure(adc_pres) self.data.humidity = self._calc_humidity(adc_hum) / 1000.0 self.data.gas_resistance = self._calc_gas_resistance(adc_gas_res, gas_range) return True