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

Try a different, more flexible method of receiving the data.

Browse Source
This commit is contained in:
Kevin Caccamo
2015-12-23 14:03:44 -05:00
parent 79333a46c6
commit 24f70668fc
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,8 +293,8 @@ class StationInet(object):
def get_readings(self):
if self.rec_start is not True:
# Find the record start
buf = ''
if DEBUG_READ: loginf("Attempting to find record start..")
buf = ''
while True:
buf += self.net_socket.recv(8, socket.MSG_WAITALL)
if DEBUG_READ: loginf("(searching...) buf: %s" % buf)
@@ -309,10 +309,29 @@ class StationInet(object):
buf += self.net_socket.recv(
PACKET_SIZE - len(buf), socket.MSG_WAITALL)
else:
buf = self.net_socket.recv(
PACKET_SIZE, socket.MSG_WAITALL)
# if DEBUG_READ: loginf("buf: %s" % buf)
self.net_socket.recv(4, socket.MSG_WAITALL) # CRLF and some other two bytes
# Keep receiving data until we find an exclamation point or two
buf = self.net_socket.recv(2, socket.MSG_WAITALL) # Possibly CRLF
while True:
if buf == '\r\n':
# CRLF is expected
if DEBUG_READ: loginf("buf is CRLF")
buf = ''
break
elif '!' in buf:
excmks = buf.count('!')
# Assuming exclamation points are at the end of the buffer
buf = buf[len(buf) - excmks:]
if DEBUG_READ: loginf("buf has %d exclamation points." % (
excmks))
break
else:
buf = self.net_socket.recv(2, socket.MSG_WAITALL)
if DEBUG_READ: loginf("buf: %s" % ' '.join(
['%02X' % ord(bc) for bc in buf]))
buf += self.net_socket.recv(
PACKET_SIZE - len(buf), socket.MSG_WAITALL)
if DEBUG_READ: loginf("buf: %s" % buf)
self.net_socket.recv(2, socket.MSG_WAITALL) # Some other two bytes
buf.strip()
return buf