Skip to content

Commit 65b1e9f

Browse files
authored
Merge pull request #47 from jerryneedell/jerryn_fixcursor
choose touch screen or cursor control
2 parents c625dba + 63bcbc1 commit 65b1e9f

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

adafruit_pyportal.py

+15-14
Original file line numberDiff line numberDiff line change
@@ -51,29 +51,30 @@
5151
from digitalio import DigitalInOut
5252
import pulseio
5353
import neopixel
54-
5554
from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
5655
import adafruit_esp32spi.adafruit_esp32spi_requests as requests
56+
import storage
57+
import displayio
58+
import audioio
59+
import rtc
60+
import supervisor
61+
from adafruit_bitmap_font import bitmap_font
62+
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
63+
import adafruit_sdcard
64+
65+
5766

58-
import adafruit_touchscreen
59-
from adafruit_cursorcontrol.cursorcontrol import Cursor
60-
from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager
67+
if hasattr(board, 'TOUCH_XL'):
68+
import adafruit_touchscreen
69+
elif hasattr(board, 'BUTTON_CLOCK'):
70+
from adafruit_cursorcontrol.cursorcontrol import Cursor
71+
from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager
6172

6273
try:
6374
from adafruit_display_text.text_area import TextArea # pylint: disable=unused-import
6475
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
6576
except ImportError:
6677
from adafruit_display_text.Label import Label
67-
from adafruit_bitmap_font import bitmap_font
68-
69-
import storage
70-
import adafruit_sdcard
71-
import displayio
72-
import audioio
73-
import rtc
74-
import supervisor
75-
76-
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
7778

7879
try:
7980
from secrets import secrets

0 commit comments

Comments
 (0)