Skip to content

Remove ESP32SPI_Requests, switch to CircuitPython_Requests #61

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
merged 5 commits into from
Jul 29, 2019
Merged

Remove ESP32SPI_Requests, switch to CircuitPython_Requests #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db246ed
update to _requests
Jul 29, 2019
50b7a01
add ent simpletest with new requests api
Jul 29, 2019
ac131da
newline
Jul 29, 2019
143fac5
switch to requests on wsgiserver
Jul 29, 2019
d18f535
fix autodoc for dep. requests
Jul 29, 2019
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
266 changes: 0 additions & 266 deletions adafruit_esp32spi/adafruit_esp32spi_requests.py
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions adafruit_esp32spi/adafruit_esp32spi_wifimanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
from time import sleep
from micropython import const
from adafruit_esp32spi import adafruit_esp32spi
import adafruit_esp32spi.adafruit_esp32spi_requests as requests
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
import adafruit_requests as requests

class ESPSPI_WiFiManager:
"""
Expand All @@ -61,7 +62,7 @@ def __init__(self, esp, secrets, status_pixel=None, attempts=2, connection_type=
self.password = secrets['password']
self.attempts = attempts
self._connection_type = connection_type
requests.set_interface(self.esp)
requests.set_socket(socket, esp)
self.statuspix = status_pixel
self.pixel_status(0)

Expand Down
2 changes: 1 addition & 1 deletion adafruit_esp32spi/adafruit_esp32spi_wsgiserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
import gc
from micropython import const
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
from adafruit_esp32spi.adafruit_esp32spi_requests import parse_headers
from adafruit_requests import parse_headers

_the_interface = None # pylint: disable=invalid-name
def set_interface(iface):
Expand Down
3 changes: 0 additions & 3 deletions docs/api.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@
.. automodule:: adafruit_esp32spi.adafruit_esp32spi
:members:

.. automodule:: adafruit_esp32spi.adafruit_esp32spi_requests
:members:

.. automodule:: adafruit_esp32spi.adafruit_esp32spi_socket
:members:
6 changes: 3 additions & 3 deletions examples/esp32spi_simpletest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import board
import busio
from digitalio import DigitalInOut

import adafruit_esp32spi.adafruit_esp32spi_socket as socket
from adafruit_esp32spi import adafruit_esp32spi
import adafruit_esp32spi.adafruit_esp32spi_requests as requests
import adafruit_requests as requests

print("ESP32 SPI webclient test")

Expand All @@ -24,7 +24,7 @@
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)

requests.set_interface(esp)
requests.set_socket(socket, esp)

if esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
print("ESP32 found and in idle mode")
Expand Down
5 changes: 3 additions & 2 deletions examples/esp32spi_wpa2ent_simpletest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
import busio
from digitalio import DigitalInOut

import adafruit_esp32spi.adafruit_esp32spi_socket as socket
from adafruit_esp32spi import adafruit_esp32spi
import adafruit_esp32spi.adafruit_esp32spi_requests as requests
import adafruit_requests as requests

# Version number comparison code. Credit to gnud on stackoverflow
# (https://stackoverflow.com/a/1714190), swapping out cmp() to
Expand All @@ -40,7 +41,7 @@ def normalize(v):
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)

requests.set_interface(esp)
requests.set_socket(socket, esp)

if esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
print("ESP32 found and in idle mode")
Expand Down