Skip to content

Commit e4aac2f

Browse files
author
brentru
committed
fix errors on pr per @ladyada review
1 parent 6b6bbc8 commit e4aac2f

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

adafruit_pyportal.py

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,10 @@
5151
from digitalio import DigitalInOut
5252
import pulseio
5353
import neopixel
54-
try:
55-
import adafruit_touchscreen
56-
except ImportError:
57-
pass
58-
try:
59-
from adafruit_cursorcontrol.cursorcontrol import Cursor
60-
from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager
61-
except ImportError:
62-
pass
54+
55+
import adafruit_touchscreen
56+
from adafruit_cursorcontrol.cursorcontrol import Cursor
57+
from adafruit_cursorcontrol.cursorcontrol_cursormanager import CursorManager
6358

6459
from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
6560
import adafruit_esp32spi.adafruit_esp32spi_requests as requests
@@ -171,11 +166,11 @@ def __init__(self, *, url=None, headers=None, json_path=None, regexp_path=None,
171166

172167
self._debug = debug
173168

174-
try:
175-
self._backlight = pulseio.PWMOut(board.TFT_LITE) # pylint: disable=no-member
176-
except AttributeError:
169+
if hasattr(board, 'TFT_BACKLIGHT'):
177170
self._backlight = pulseio.PWMOut(board.TFT_BACKLIGHT) # pylint: disable=no-member
178-
except ValueError:
171+
elif hasattr(board, 'TFT_LITE'):
172+
self._backlight = pulseio.PWMOut(board.TFT_LITE) # pylint: disable=no-member
173+
else:
179174
self._backlight = None
180175
self.set_backlight(1.0) # turn on backlight
181176

@@ -234,10 +229,12 @@ def __init__(self, *, url=None, headers=None, json_path=None, regexp_path=None,
234229

235230
self._speaker_enable = DigitalInOut(board.SPEAKER_ENABLE)
236231
self._speaker_enable.switch_to_output(False)
237-
try: # PyPortal
232+
if hasattr(board, 'AUDIO_OUT'):
238233
self.audio = audioio.AudioOut(board.AUDIO_OUT)
239-
except AttributeError: # PyGamer/PyBadge
234+
elif hasattr(board, 'SPEAKER'):
240235
self.audio = audioio.AudioOut(board.SPEAKER)
236+
else:
237+
raise AttributeError('Board does not have a builtin speaker!')
241238
try:
242239
self.play_file("pyportal_startup.wav")
243240
except OSError:

0 commit comments

Comments
 (0)