diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 9ef7e18..0ad56b5 --- a/README.md +++ b/README.md @@ -26,11 +26,11 @@ The GW1000 driver requires WeeWX v3.7.0 or greater. - download the GW1000 driver extension package: - $ wget -P /var/tmp https://github.com/gjr80/weewx-gw1000/releases/download/v0.1.0b2/weewx-gw1000-0.1.0b2.tar.gz + $ wget -P /var/tmp https://github.com/gjr80/weewx-gw1000/releases/download/v0.1.0b3/weewx-gw1000-0.1.0b3.tar.gz - install the GW1000 driver extension: - $ wee_extension --install=/var/tmp/weewx-gw1000.0.1.0b2.tar.gz + $ wee_extension --install=/var/tmp/weewx-gw1000.0.1.0b3.tar.gz - skip to step 4 @@ -38,11 +38,11 @@ The GW1000 driver requires WeeWX v3.7.0 or greater. - download the GW1000 driver extension package: - $ wget -P /var/tmp https://github.com/gjr80/weewx-gw1000/releases/download/v0.1.0b2/weewx-gw1000-0.1.0b2.tar.gz + $ wget -P /var/tmp https://github.com/gjr80/weewx-gw1000/releases/download/v0.1.0b3/weewx-gw1000-0.1.0b3.tar.gz - extract *gw1000.py* from the GW1000 driver extension package: - $ tar -xzf /var/tmp/weewx-gw1000.0.1.0b2.tar.gz + $ tar -xzf /var/tmp/weewx-gw1000.0.1.0b3.tar.gz - copy the file *gw1000.py* to the *$BIN_ROOT/user* directory: diff --git a/bin/user/gw1000.py b/bin/user/gw1000.py index 64433bb..e27ff26 100755 --- a/bin/user/gw1000.py +++ b/bin/user/gw1000.py @@ -28,7 +28,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. -Version: 0.1.0b2 Date: 22 July 2020 +Version: 0.1.0b3 Date: 22 July 2020 Revision History ?? ????? 2020 v0.1.0 @@ -321,7 +321,7 @@ def log_traceback_debug(prefix=''): log_traceback(prefix=prefix, loglevel=syslog.LOG_DEBUG) DRIVER_NAME = 'GW1000' -DRIVER_VERSION = '0.1.0b2' +DRIVER_VERSION = '0.1.0b3' # various defaults used throughout # default port used by GW1000 @@ -1346,7 +1346,11 @@ def __init__(self, ip_address=None, port=None, disc_port = ip_port_list[0][1] # log the fact as well as what we found gw1000_str = ', '.join([':'.join(['%s:%d' % b]) for b in ip_port_list]) - loginf("Multiple GW1000 were found at %s" % (gw1000_str,)) + if len(ip_port_list) == 1: + stem = "GW1000 was" + else: + stem = "Multiple GW1000 were" + loginf("%s found at %s" % (stem, gw1000_str)) ip_address = disc_ip.encode() if ip_address is None else ip_address.encode() port = disc_port if port is None else port self.ip_address = ip_address @@ -1633,7 +1637,7 @@ class Parser(object): b'\x16': ('decode_uv', 2, 'uv'), # UV (uW/m2), size in bytes:2 b'\x17': ('decode_uvi', 1, 'uvi'), # UVI (0-15 index), size in bytes:1 b'\x18': ('decode_datetime', 6, 'datetime'), # Date and time, size in bytes:6 - b'\x19': ('decode_speed', 1, 'daymaxwind'), # Day max_wind (m/s), size in bytes:2 + b'\x19': ('decode_speed', 2, 'daymaxwind'), # Day max_wind (m/s), size in bytes:2 b'\x1A': ('decode_temp', 2, 'temp1'), b'\x1B': ('decode_temp', 2, 'temp2'), b'\x1C': ('decode_temp', 2, 'temp3'), @@ -2186,7 +2190,7 @@ def discover(): gw1000_found = 0 for (ip, port) in sorted_list: if ip is not None and port is not None: - print("GW1000 discovered at IP address %s and port %d" % (ip, port)) + print("GW1000 discovered at IP address %s on port %d" % (ip, port)) found = True gw1000_found += 1 else: diff --git a/install.py b/install.py old mode 100644 new mode 100755 index af4637d..f23c3cf --- a/install.py +++ b/install.py @@ -10,7 +10,7 @@ Installer for GW1000 Driver -Version: 0.1.0b2 Date: 22 July 2020 +Version: 0.1.0b3 Date: 22 July 2020 Revision History ?? ????? 2020 v0.1.0 @@ -23,7 +23,7 @@ from setup import ExtensionInstaller REQUIRED_VERSION = "3.7.0" -GW1000_VERSION = "0.1.0b2" +GW1000_VERSION = "0.1.0b3" def loader(): diff --git a/readme.txt b/readme.txt old mode 100644 new mode 100755 index d55c3c5..ed43e5e --- a/readme.txt +++ b/readme.txt @@ -31,11 +31,11 @@ method): - download the GW1000 driver extension package: - $ wget -P /var/tmp https://github.com/gjr80/weewx-gw1000/releases/download/v0.1.0b2/weewx-gw1000-0.1.0b2.tar.gz + $ wget -P /var/tmp https://github.com/gjr80/weewx-gw1000/releases/download/v0.1.0b3/weewx-gw1000-0.1.0b3.tar.gz - install the GW1000 driver extension: - $ wee_extension --install=/var/tmp/weewx-gw1000.0.1.0b2.tar.gz + $ wee_extension --install=/var/tmp/weewx-gw1000.0.1.0b3.tar.gz - skip to step 4