diff --git a/adafruit_io/adafruit_io.py b/adafruit_io/adafruit_io.py index 524b3dd..a7606ab 100755 --- a/adafruit_io/adafruit_io.py +++ b/adafruit_io/adafruit_io.py @@ -38,6 +38,7 @@ * Adafruit's ESP32SPI library: https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI """ +from adafruit_esp32spi import adafruit_esp32spi_wifimanager from adafruit_io.adafruit_io_errors import AdafruitIO_RequestError, AdafruitIO_ThrottleError __version__ = "0.0.0-auto.0" @@ -56,7 +57,7 @@ def __init__(self, adafruit_io_username, adafruit_io_key, wifi_manager): """ self.username = adafruit_io_username self.key = adafruit_io_key - if wifi_manager: + if isinstance(wifi_manager, adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager): self.wifi = wifi_manager else: raise TypeError("This library requires a WiFiManager object.") @@ -89,7 +90,7 @@ def _compose_path(self, path): """Composes a valid API request path. :param str path: Adafruit IO API URL path. """ - return "{0}/{1}/{2}/{3}".format('https://io.adafruit.com/api', 'v2', self.username, path) + return "https://io.adafruit.com/api/v2/{0}/{1}".format(self.username, path) # HTTP Requests def _post(self, path, payload): diff --git a/docs/api.rst b/docs/api.rst index 4705ac0..f37bb28 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -5,5 +5,5 @@ API .. If your library file(s) are nested in a directory (e.g. /adafruit_foo/foo.py) .. use this format as the module name: "adafruit_foo.foo" -.. automodule:: adafruit_io +.. automodule:: adafruit_io.adafruit_io :members: diff --git a/docs/conf.py b/docs/conf.py index e3d0d23..b875a8a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -16,6 +16,8 @@ 'sphinx.ext.todo', ] +autodoc_mock_imports = ["digitalio", "busdevice", "neopixel", "adafruit_esp32spi"] + intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)} # Add any paths that contain templates here, relative to this directory.