mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-04-20 17:46:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
tkeffer@gmail.com
2019-12-02 14:31:03 -07:00
parent a8227c40d5 0ecd4fed83
commit 880491eeef
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bin/weewx/drivers/wmr200.py
View File

@@ -1906,13 +1906,24 @@ class WMR200(weewx.drivers.AbstractDevice):
% (cnt, self._archive_threshold,
weeutil.weeutil.timestamp_to_string(pkt.timestamp_record())))
elif pkt.timestamp_record() > since_ts:
# Calculate the rain accumulation between valid archive
# Update the timestamp delta previous value even if
# we do not use this packet. This is so the next archive
# packet, if any, has the proper delta timestamp
# calculation.
timestamp_packet_previous = timestamp_packet_current
# Ensure that the packet has a valid 'interval' field.
packet_record_interval = int(timestamp_packet_interval / 60.0)
if packet_record_interval == 0:
# This packet occurred less than the minimal interval after the
# initial time search space and is discarded.
loginf('genStartup() Discarding received archive record'
' since interval is zero')
return
pkt.record_update({'interval': packet_record_interval})
# Calculate the rain accumulation between valid archive
# packets.
pkt.record_update(adjust_rain(pkt, PacketArchiveData))
# Ensure that the packet has a valid 'interval' field
pkt.record_update({'interval': int(timestamp_packet_interval / 60.0)})
timestamp_packet_previous = timestamp_packet_current
cnt += 1
log.debug('genStartup() Yielding received archive'
' record cnt:%d after requested timestamp'