From c431cf760f71e6fadf149ff0f037318144e313f8 Mon Sep 17 00:00:00 2001 From: Bongjun Hur Date: Thu, 5 Aug 2021 08:21:55 +0900 Subject: [PATCH 1/4] fix buffer length var in socket_write() --- adafruit_wiznet5k/adafruit_wiznet5k.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/adafruit_wiznet5k/adafruit_wiznet5k.py b/adafruit_wiznet5k/adafruit_wiznet5k.py index fb4bd51..f9cc3ac 100644 --- a/adafruit_wiznet5k/adafruit_wiznet5k.py +++ b/adafruit_wiznet5k/adafruit_wiznet5k.py @@ -744,11 +744,12 @@ def socket_write(self, socket_num, buffer, timeout=0): dst_addr = offset + (socket_num * 2048 + 0x8000) # update sn_tx_wr to the value + data size - ptr = (ptr + len(buffer)) & 0xFFFF + ptr = (ptr + ret) & 0xFFFF self._write_sntx_wr(socket_num, ptr) cntl_byte = 0x14 + (socket_num << 5) - self.write(dst_addr, cntl_byte, buffer) + txbuf = buffer[:ret] # <- use ret + self.write(dst_addr, cntl_byte, txbuf) self._write_sncr(socket_num, CMD_SOCK_SEND) self._read_sncr(socket_num) From 118e75b6212c3abaa67bbfef719f497a9692c562 Mon Sep 17 00:00:00 2001 From: Bongjun Hur Date: Thu, 5 Aug 2021 14:09:55 +0900 Subject: [PATCH 2/4] fix duplicate function name large in line110 --- examples/wiznet5k_wsgiserver_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/wiznet5k_wsgiserver_test.py b/examples/wiznet5k_wsgiserver_test.py index a0ba423..d66d084 100644 --- a/examples/wiznet5k_wsgiserver_test.py +++ b/examples/wiznet5k_wsgiserver_test.py @@ -107,7 +107,7 @@ def large(request): # pylint: disable=unused-argument @web_app.route("/code") -def large(request): # pylint: disable=unused-argument +def code(request): # pylint: disable=unused-argument print("Static file code.py handler") return ("200 OK", [], get_static_file("code.py")) From f37d4052a218efdc361755365db720d4d0e25a01 Mon Sep 17 00:00:00 2001 From: Bongjun Hur Date: Wed, 11 Aug 2021 10:47:26 +0900 Subject: [PATCH 3/4] fix wrong offset addr in _write_socket() --- adafruit_wiznet5k/adafruit_wiznet5k.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/adafruit_wiznet5k/adafruit_wiznet5k.py b/adafruit_wiznet5k/adafruit_wiznet5k.py index f9cc3ac..2fad166 100644 --- a/adafruit_wiznet5k/adafruit_wiznet5k.py +++ b/adafruit_wiznet5k/adafruit_wiznet5k.py @@ -864,9 +864,8 @@ def _read_snmr(self, sock): def _write_socket(self, sock, address, data): """Write to a W5k socket register.""" - base = self._ch_base_msb << 8 cntl_byte = (sock << 5) + 0x0C - return self.write(base + sock * CH_SIZE + address, cntl_byte, data) + return self.write(address, cntl_byte, data) def _read_socket(self, sock, address): """Read a W5k socket register.""" From f8a020d76b436f531fdd6312c9a9aa598f993933 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 3 Jan 2022 16:39:43 -0600 Subject: [PATCH 4/4] code format and pylint --- adafruit_wiznet5k/adafruit_wiznet5k.py | 2 +- examples/wiznet5k_wsgiserver_test.py | 27 +++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/adafruit_wiznet5k/adafruit_wiznet5k.py b/adafruit_wiznet5k/adafruit_wiznet5k.py index 2fad166..35f06e6 100644 --- a/adafruit_wiznet5k/adafruit_wiznet5k.py +++ b/adafruit_wiznet5k/adafruit_wiznet5k.py @@ -748,7 +748,7 @@ def socket_write(self, socket_num, buffer, timeout=0): self._write_sntx_wr(socket_num, ptr) cntl_byte = 0x14 + (socket_num << 5) - txbuf = buffer[:ret] # <- use ret + txbuf = buffer[:ret] # <- use ret self.write(dst_addr, cntl_byte, txbuf) self._write_sncr(socket_num, CMD_SOCK_SEND) diff --git a/examples/wiznet5k_wsgiserver_test.py b/examples/wiznet5k_wsgiserver_test.py index d66d084..2b99980 100644 --- a/examples/wiznet5k_wsgiserver_test.py +++ b/examples/wiznet5k_wsgiserver_test.py @@ -20,36 +20,35 @@ import busio import digitalio import neopixel -import time import adafruit_requests as requests +from adafruit_wsgi.wsgi_app import WSGIApp from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket import adafruit_wiznet5k.adafruit_wiznet5k_wsgiserver as server -from adafruit_wsgi.wsgi_app import WSGIApp print("Wiznet5k Web Server Test") -def get_mac(i2c): +def get_mac(_i2c): "Read MAC from 24AA02E48 chip and return it" - mac = bytearray(6) - while not i2c.try_lock(): + _mac = bytearray(6) + while not _i2c.try_lock(): pass - i2c.writeto(0x50, bytearray((0xFA,))) - i2c.readfrom_into(0x50, mac, start=0, end=6) - i2c.unlock() - return mac + _i2c.writeto(0x50, bytearray((0xFA,))) + _i2c.readfrom_into(0x50, _mac, start=0, end=6) + _i2c.unlock() + return _mac def get_static_file(filename): "Static file generator" with open(filename, "rb") as f: - bytes = None - while bytes is None or len(bytes) == 2048: - bytes = f.read(2048) - yield bytes + _bytes = None + while _bytes is None or len(_bytes) == 2048: + _bytes = f.read(2048) + yield _bytes # Status LED @@ -113,7 +112,7 @@ def code(request): # pylint: disable=unused-argument @web_app.route("/btc") -def btc(request): +def btc(request): # pylint: disable=unused-argument print("BTC handler") r = requests.get("http://api.coindesk.com/v1/bpi/currentprice/USD.json") result = r.text