diff --git a/CHANGES.txt b/CHANGES.txt index 59d2324d..41e94365 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,13 @@ CHANGE HISTORY -------------------------------- +X.X.X + +Add a weewx "favorite icon" favicon.ico that displays in your browser toolbar. + +Changed VantagePro.accumulateLoop to make it slightly more robust. + + 1.9.2 11/20/10 Now catches exception of type OverflowError when calculating celsius dewpoint. diff --git a/bin/weewx/VantagePro.py b/bin/weewx/VantagePro.py index d750a9ee..6d85492d 100644 --- a/bin/weewx/VantagePro.py +++ b/bin/weewx/VantagePro.py @@ -262,8 +262,15 @@ class VantagePro (object) : except (AttributeError, weewx.accum.OutOfSpan): # Initialize the accumulators: self.clearAccumulators(physicalLOOPPacket['dateTime']) - # Try again, calling myself recursively: - self.accumulateLoop(physicalLOOPPacket) + # Try again: + try: + for obs_type in self.special: + self.current_accumulators[obs_type].addToSum(physicalLOOPPacket) + # For battery status, OR every status field together: + self.txBatteryStatus |= physicalLOOPPacket['txBatteryStatus'] + except weewx.accum.OutOfSpan: + # Failed again. There's something wrong. Log it. + syslog.syslog(syslog.LOG_ERR, "VantagePro: Unable to initialize accumulators.") def clearAccumulators(self, time_ts): """Initialize or clear the accumulators""" diff --git a/skins/Standard/favicon.ico b/skins/Standard/favicon.ico new file mode 100755 index 00000000..3556f133 Binary files /dev/null and b/skins/Standard/favicon.ico differ diff --git a/skins/Standard/index.html.tmpl b/skins/Standard/index.html.tmpl index e1b71fa4..9fb7699a 100644 --- a/skins/Standard/index.html.tmpl +++ b/skins/Standard/index.html.tmpl @@ -4,12 +4,13 @@ ## $Date$ -
+ #if $encoding == 'utf8' #end if