mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-06-10 18:15:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix all errors that occur when trying to initialize the driver.

Browse Source 
Most of the errors were references to nonexistent variables. I've finally got to testing this driver, and fixed these errors in the process.
This commit is contained in:
Kevin Caccamo
2016-04-08 03:29:26 -04:00
parent e17e01da2b
commit 7e8e1d948e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/weewx/drivers/ws1.py
View File

@@ -66,7 +66,8 @@ class WS1Driver(weewx.drivers.AbstractDevice):
[Required. Default is serial]
port - Serial port or network address.
[Required. Default is /dev/ttyS0 for serial, and 192.168.36.25:3000 for TCP/IP]
[Required. Default is /dev/ttyS0 for serial,
and 192.168.36.25:3000 for TCP/IP]
max_tries - how often to retry serial communication before giving up.
[Optional. Default is 5]
@@ -101,8 +102,8 @@ class WS1Driver(weewx.drivers.AbstractDevice):
DEBUG_READ = int(stn_dict.get('debug_read', DEBUG_READ))
if con_mode == 'tcp' or con_mode == 'udp':
self.station = StationInet(self.port, con_mode, timeout, max_tries,
retry_wait)
self.station = StationInet(self.port, con_mode, timeout,
self.max_tries, self.retry_wait)
else:
self.station = StationSerial(self.port, timeout=timeout)
self.station.open()
@@ -284,6 +285,9 @@ class StationInet(object):
ip_addr = None
ip_port = None
self.max_retries = max_retries
self.retry_interval = retry_interval
if addr.find(':') != -1:
self.conn_info = addr.split(':')
try:
@@ -297,10 +301,10 @@ class StationInet(object):
self.conn_info = (ip_addr, ip_port)
try:
if self.protocol == 'tcp':
if protocol == 'tcp':
self.net_socket = socket.socket(
socket.AF_INET, socket.SOCK_STREAM)
elif self.protocol == 'udp':
elif protocol == 'udp':
self.net_socket = socket.socket(
socket.AF_INET, socket.SOCK_DGRAM)
except (socket.error, socket.herror), ex: