Skip to content
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

Jump to bottom

Add ESP32-S2 (Native Networking) and CPython #61

Merged
merged 78 commits into from
Feb 3, 2021
Merged

Add ESP32-S2 (Native Networking) and CPython #61

merged 78 commits into from
Feb 3, 2021

Conversation

brentru
Copy link
Member

@brentru brentru commented Feb 1, 2021 •
edited
Loading

This pull request:

  • Adds compatibility and examples for ESP32-S2 and "Native Networking"
  • Adds compatibility and examples for usage with CPython
  • Provides backwards-compatible "legacy" support for ESP32SPI, Ethernet socket interface.
  • Removes dependency for Adafruit_CircuitPython_Logging to be installed, a logger may be passed into a MQTT object.
  • Adds a username_pw_set method to dynamically set username and password outside of client initialization.
  • Reorganizes examples into folders, categorized by network interface
  • connect() may now accept a keepalive time
  • loop() may now accept a timeout in seconds.

NOTE: "Native Socket" (ESP32-S2) is only supported in CircuitPython 6.2.0b1 or newer

Addresses:
#58
#43
https://github.com/brentru/Adafruit_CircuitPython_MiniMQTT/pull/2
adafruit/Adafruit_CircuitPython_AzureIoT#21
adafruit/Adafruit_CircuitPython_AdafruitIO#52

This library has been tested on:
Adafruit CircuitPython 6.2.0-beta.1 on 2021-01-27; Adafruit Metro ESP32S2 with ESP32S2, Native Networking
Adafruit CircuitPython 6.0.1 on 2020-12-28; Adafruit Feather M4 Express with samd51j19 with Ethernet FeatherWing
Adafruit CircuitPython 6.1.0 on 2021-01-21; Adafruit PyPortal with samd51j20, ESP32SPI
CPython 3.9.1

brentru added 30 commits November 16, 2020 14:30
starting to bring over session, update licensing
2600c1e
add _get_socket
1db4bad
BREAKING _init_, should match paho mqtt
7d74dbf
dont break init, leave alone for now
afabde4
add username_pw_set, make username/pass private
10dfa0b
refactor logger class, add enable_logger, disable_logger
8dae98f
hook logging
722ecda
remove Session, socket pool impl. instead
971903d
Add socketpool, ssl context to constructor
29bc57d
bring in socketpool helper methods
c14b990
add _get_socket helper, replace code in connect, modify connect signa…
95efa9e 
…ture to be paho-mqtt friendly
connects, try cpython native logging first
d400267
specify exception, cpython logging second for circuitpy clients
964ac36
encode topic as bytes, wait_for_msg BlockingIOError
966bae7
fix BlockingIOerror, not calling on_message?
f1e3fbe
on_message works with subscriptions
a43035e
encode topic within unsubscribe
7cdcc32
remove is not none statement from logger calls
baa1fc4
remove positional call to _wait_for_msg
0c05e65
pylint minimqtt, add simpletest for cpython
1a65b92
use secrets' username
cb322ed
add cpython example for AIO, tested
1d78c0f
socket exists, but ssl.SSLWantReadError persists?
4af0ad0
CircuitPython lacks select() module, use socket timeouttype instead o…
fbfb6ec 
…f non-blocking SSL socket to avoid SSLWantWrite/SSLWantRead errors, https://docs.python.org/3/library/ssl.html#notes-on-non-blocking-sockets
backwards compat. recv, adding shared buffer impl to save memory
8492a58
add shared buffer, connect tested
984c600
public command methods use shared rx buffer
a907575
convert recv_len into recv_into
2ae61a4
recv->recv_into calls
6ebf233
resize the rx buffer dynamically
5356318
@brentru brentru requested review from makermelissa and a team February 1, 2021 22:07
makermelissa
makermelissa approved these changes Feb 1, 2021
View reviewed changes
Copy link
Collaborator

@makermelissa makermelissa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and it works great. That's a bonus that it doesn't require logging anymore.

@brentru
Copy link
Member Author

brentru commented Feb 3, 2021

Thanks for reviewing and testing

@brentru brentru merged commit 99a6099 into adafruit:master Feb 3, 2021
This was referenced Feb 3, 2021
Closed
Closed
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Feb 4, 2021
@adafruit-adabot
Automated update by Adabot (adafruit/adabot@f49a93b)
193cdea 
Updating https://github.com/adafruit/Adafruit_CircuitPython_AdafruitIO to 5.2.0 from 5.1.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_AdafruitIO#63 from brentru/add-esp32s2-updated-code

Updating https://github.com/adafruit/Adafruit_CircuitPython_MiniMQTT to 5.0.0 from 4.1.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_MiniMQTT#61 from brentru/cpython-s2

Updating https://github.com/adafruit/Adafruit_CircuitPython_SimpleIO to 3.0.0 from 2.1.3:
  > Merge pull request adafruit/Adafruit_CircuitPython_SimpleIO#59 from adafruit/dherrada-patch-1
rtwfroody pushed a commit to rtwfroody/Adafruit_CircuitPython_MiniMQTT that referenced this pull request Sep 18, 2022
@brentru
Merge pull request adafruit#61 from brentru/cpython-s2
5ce2b0b 
Add ESP32-S2 (Native Networking) and CPython
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@makermelissa makermelissa makermelissa approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@brentru @makermelissa