mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-04-21 10:07:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Version 1.12.3

Browse Source
This commit is contained in:
Tom Keffer
2012-02-09 23:58:39 +00:00
parent cdc89071b5
commit f89ba4400c
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bin/weewx/VantagePro.py
View File

@@ -206,7 +206,7 @@ class SerialWrapper(BaseWrapper):
def closePort(self):
try:
# This will cancel any pending loop:
self.wakeup_console()
self.wakeup_console(max_tries=1)
except:
pass
self.serial_port.close()
@@ -233,7 +233,7 @@ class EthernetWrapper(BaseWrapper):
def closePort(self):
try:
# This will cancel any pending loop:
self.wakeup_console()
self.wakeup_console(max_tries=1)
except:
pass
self.socket.shutdown(socket.SHUT_RDWR)
@@ -413,23 +413,38 @@ class VantagePro(object):
# Request N packets:
self.port.send_data("LOOP %d\n" % N)
ntries = 1
for loop in range(N) :
if ntries > self.max_tries:
syslog.syslog(syslog.LOG_ERR, "VantagePro: Max retries (%d) exceeded." % self.max_tries)
raise weewx.RetriesExceeded("Max retries exceeded while getting LOOP data.")
try:
# Fetch a packet
_buffer = self.port.read(99)
except weewx.WeeWxIOError, e:
syslog.syslog(syslog.LOG_ERR, "VantagePro: LOOP #%d; read error." % (loop,))
syslog.syslog(syslog.LOG_ERR, "VantagePro: LOOP #%d; read error. Try #%d" % (loop, ntries))
syslog.syslog(syslog.LOG_ERR, " **** %s" % e)
ntries += 1
continue
except serial.serialutil.SerialException, e:
syslog.syslog(syslog.LOG_ERR, "VantagePro: LOOP #%d; SerialException. Try #%d" % (loop, ntries))
syslog.syslog(syslog.LOG_ERR, " **** %s" % e)
syslog.syslog(syslog.LOG_ERR, " **** Is there a competing process running??")
ntries += 1
continue
if crc16(_buffer) :
syslog.syslog(syslog.LOG_ERR,
"VantagePro: LOOP #%d; CRC error." % loop)
"VantagePro: LOOP #%d; CRC error. Try #%d" % (loop, ntries))
ntries += 1
continue
# ... decode it
pkt_dict = unpackLoopPacket(_buffer[:95])
# Yield it
yield pkt_dict
ntries = 1
def genArchivePackets(self, since_ts):
"""A generator function to return archive packets from a VantagePro station.

2
bin/weewx/__init__.py
View File

@@ -12,7 +12,7 @@
"""
import time
__version__="1.12.2"
__version__="1.12.3"
# Holds the program launch time in unix epoch seconds:
# Useful for calculating 'uptime.'

2
weewx.conf
View File

@@ -29,7 +29,7 @@ debug = 0
socket_timeout = 20
# Current version
version = 1.12.2
version = 1.12.3
############################################################################################