mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-04-24 03:27:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem introduced by PR #630.

Browse Source
This commit is contained in:
Tom Keffer
2021-01-29 15:51:20 -08:00
parent 8f54e26646
commit e4d6ac7c8f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/weewx/wxservices.py
View File

@@ -76,6 +76,8 @@ class StdWXCalculate(weewx.engine.StdService):
self.archive_calc_dict.setdefault('windDir', 'software')
self.loop_calc_dict.setdefault('windGustDir', 'software')
self.archive_calc_dict.setdefault('windGustDir', 'software')
# For backwards compatibility:
self.calc_dict = self.archive_calc_dict
if weewx.debug > 1:
log.debug("Calculations for LOOP packets: %s", self.loop_calc_dict)
@@ -98,13 +100,16 @@ class StdWXCalculate(weewx.engine.StdService):
def new_archive_record(self, event):
self.do_calculations(event.record, self.archive_calc_dict)
def do_calculations(self, data_dict, calc_dict):
def do_calculations(self, data_dict, calc_dict=None):
"""Augment the data dictionary with derived types as necessary.
data_dict: The incoming LOOP packet or archive record.
calc_dict: the directives to apply
"""
if calc_dict is None:
calc_dict = self.archive_calc_dict
# Go through the list of potential calculations and see which ones need to be done
for obs in calc_dict:
directive = calc_dict[obs]