Skip to content

Make loop() in esp32spi implementation non-blocking #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brentru merged 3 commits into from
Feb 19, 2021
Merged

Make loop() in esp32spi implementation non-blocking #69

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c0f6c8
Changed format codes from %x to %s in logger. _sock_exact_recv raises…
dlizotte-uwo Feb 13, 2021
9791e9d
Fixed long comment lines.
dlizotte-uwo Feb 13, 2021
3ab67bb
fixed superfluous-parens
dlizotte-uwo Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions adafruit_minimqtt/adafruit_minimqtt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ def connect(self, clean_session=True, host=None, port=None, keep_alive=None):
if self.logger:
self.logger.debug("Sending CONNECT to broker...")
self.logger.debug(
"Fixed Header: %x\nVariable Header: %x", fixed_header, var_header
"Fixed Header: %s\nVariable Header: %s", fixed_header, var_header
)
self._sock.send(fixed_header)
self._sock.send(var_header)
Expand Down Expand Up @@ -634,7 +634,7 @@ def publish(self, topic, msg, retain=False, qos=0):

if self.logger:
self.logger.debug(
"Sending PUBLISH\nTopic: %s\nMsg: %x\
"Sending PUBLISH\nTopic: %s\nMsg: %s\
\nQoS: %d\nRetain? %r",
topic,
msg,
Expand Down Expand Up @@ -803,8 +803,7 @@ def loop(self, timeout=1):
# Handle KeepAlive by expecting a PINGREQ/PINGRESP from the server
if self.logger is not None:
self.logger.debug(
"KeepAlive period elapsed - \
requesting a PINGRESP from the server..."
"KeepAlive period elapsed - requesting a PINGRESP from the server..."
)
rcs = self.ping()
self._timestamp = 0
Expand All @@ -826,7 +825,7 @@ def _wait_for_msg(self, timeout=0.1):
res = self._sock_exact_recv(1)
except OSError as error:
if error.errno == errno.ETIMEDOUT:
# raised by a socket timeout in socketpool
# raised by a socket timeout if 0 bytes were present
return None
raise MMQTTException from error

Expand All @@ -837,7 +836,7 @@ def _wait_for_msg(self, timeout=0.1):
return None
if res[0] == MQTT_PINGRESP:
if self.logger:
self.logger.debug("Checking PINGRESP")
self.logger.debug("Got PINGRESP")
sz = self._sock_exact_recv(1)[0]
if sz != 0x00:
raise MMQTTException(
Expand Down Expand Up @@ -910,7 +909,15 @@ def _sock_exact_recv(self, bufsize):
else: # ESP32SPI Impl.
stamp = time.monotonic()
read_timeout = self.keep_alive
# This will timeout with socket timeout (not keepalive timeout)
rc = self._sock.recv(bufsize)
if(not rc):
if self.logger:
self.logger.debug("_sock_exact_recv timeout")
# If no bytes waiting, raise same exception as socketpool
raise OSError(errno.ETIMEDOUT)
# If any bytes waiting, try to read them all,
# or raise exception if wait longer than read_timeout
to_read = bufsize - len(rc)
assert to_read >= 0
read_timeout = self.keep_alive
Expand Down