From dfd1cb4ed164395f3e2d242936be450a12acffec Mon Sep 17 00:00:00 2001 From: Jerry Needell Date: Sun, 28 Jul 2019 16:36:06 -0400 Subject: [PATCH 1/4] choose between touchscreen and cursor manager --- adafruit_pyportal.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/adafruit_pyportal.py b/adafruit_pyportal.py index b4f2668..b9645c7 100644 --- a/adafruit_pyportal.py +++ b/adafruit_pyportal.py @@ -55,9 +55,11 @@ from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager import adafruit_esp32spi.adafruit_esp32spi_requests as requests -import adafruit_touchscreen -from adafruit_cursorcontrol.cursorcontrol import Cursor -from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager +if hasattr(board, 'TOUCH_XL'): + import adafruit_touchscreen +elif hasattr(board, 'BUTTON_CLOCK'): + from adafruit_cursorcontrol.cursorcontrol import Cursor + from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager try: from adafruit_display_text.text_area import TextArea # pylint: disable=unused-import From 3d5888011ecec637890781ca8360f7f84fd88f87 Mon Sep 17 00:00:00 2001 From: Jerry Needell Date: Sun, 28 Jul 2019 16:41:42 -0400 Subject: [PATCH 2/4] pylint - move imports --- adafruit_pyportal.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/adafruit_pyportal.py b/adafruit_pyportal.py index b9645c7..4b5a069 100644 --- a/adafruit_pyportal.py +++ b/adafruit_pyportal.py @@ -51,6 +51,16 @@ from digitalio import DigitalInOut import pulseio import neopixel +from adafruit_bitmap_font import bitmap_font + +import storage +import adafruit_sdcard +import displayio +import audioio +import rtc +import supervisor + +from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager import adafruit_esp32spi.adafruit_esp32spi_requests as requests @@ -66,16 +76,6 @@ print("*** WARNING ***\nPlease update your library bundle to the latest 'adafruit_display_text' version as we've deprecated 'text_area' in favor of 'label'") # pylint: disable=line-too-long except ImportError: from adafruit_display_text.Label import Label -from adafruit_bitmap_font import bitmap_font - -import storage -import adafruit_sdcard -import displayio -import audioio -import rtc -import supervisor - -from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError try: from secrets import secrets From 30b1a5366b81197c22ff1951163e19cd00f0e3c7 Mon Sep 17 00:00:00 2001 From: Jerry Needell Date: Sun, 28 Jul 2019 16:49:29 -0400 Subject: [PATCH 3/4] pylint - gotta love pylint --- adafruit_pyportal.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/adafruit_pyportal.py b/adafruit_pyportal.py index 4b5a069..015615a 100644 --- a/adafruit_pyportal.py +++ b/adafruit_pyportal.py @@ -51,19 +51,18 @@ from digitalio import DigitalInOut import pulseio import neopixel -from adafruit_bitmap_font import bitmap_font - import storage -import adafruit_sdcard import displayio import audioio import rtc import supervisor - -from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError - from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager import adafruit_esp32spi.adafruit_esp32spi_requests as requests +from adafruit_bitmap_font import bitmap_font +from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError +import adafruit_sdcard + + if hasattr(board, 'TOUCH_XL'): import adafruit_touchscreen From 63bcbc1643b73158eaba1285ed86848da7920558 Mon Sep 17 00:00:00 2001 From: Jerry Needell Date: Sun, 28 Jul 2019 16:53:18 -0400 Subject: [PATCH 4/4] pylint - grr -- it passed on my pylint --- adafruit_pyportal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_pyportal.py b/adafruit_pyportal.py index 015615a..90d6b3c 100644 --- a/adafruit_pyportal.py +++ b/adafruit_pyportal.py @@ -51,13 +51,13 @@ from digitalio import DigitalInOut import pulseio import neopixel +from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager +import adafruit_esp32spi.adafruit_esp32spi_requests as requests import storage import displayio import audioio import rtc import supervisor -from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager -import adafruit_esp32spi.adafruit_esp32spi_requests as requests from adafruit_bitmap_font import bitmap_font from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError import adafruit_sdcard