Skip to content

Commit c230c08

Browse files
committed
Return sea level in new reading key
1 parent 17cb8e3 commit c230c08

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

enviro/boards/weather.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,9 @@ def get_sensor_readings(seconds_since_last, is_usb_power):
193193
# Adjust pressure to calculated sea level value if set to in config
194194
pressure = bme280_data[1] / 100.0
195195
temperature = bme280_data[0]
196-
197-
if config.sea_level_pressure:
198-
logging.info(f" - recorded temperature: {temperature}")
199-
logging.info(f" - recorded pressure: {pressure}")
200-
pressure = round(helpers.get_sea_level_pressure(pressure, temperature, config.height_above_sea_level), 2)
201-
logging.info(f" - calculated mean sea level pressure: {pressure}")
202196

203197
from ucollections import OrderedDict
204-
return OrderedDict({
198+
readings = OrderedDict({
205199
"temperature": round(temperature, 2),
206200
"humidity": round(bme280_data[2], 2),
207201
"pressure": round(pressure, 2),
@@ -211,3 +205,12 @@ def get_sensor_readings(seconds_since_last, is_usb_power):
211205
"rain_per_second": rain_per_second,
212206
"wind_direction": wind_direction()
213207
})
208+
209+
if config.sea_level_pressure:
210+
logging.info(f" - recorded temperature: {temperature}")
211+
logging.info(f" - recorded pressure: {pressure}")
212+
sea_level_pressure = round(helpers.get_sea_level_pressure(pressure, temperature, config.height_above_sea_level), 2)
213+
logging.info(f" - calculated mean sea level pressure: {sea_level_pressure}")
214+
readings["sea_level_pressure"] = round(sea_level_pressure, 2)
215+
216+
return readings

0 commit comments

Comments
 (0)