Skip to content
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.

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

choose touch screen or cursor control #47

Merged
merged 4 commits into from
Jul 29, 2019
Merged

choose touch screen or cursor control #47

merged 4 commits into from
Jul 29, 2019

Conversation

jerryneedell
Copy link
Contributor

attempt to fix #46
import either touchscreen or cursor control

minimally tested -- it does import now on a PyPortal

@jerryneedell
Copy link
Contributor Author

while this will now import I think it is still broken due to #48 which is due to the change in how the backlight is configured:
https://github.com/adafruit/Adafruit_CircuitPython_PyPortal/blame/master/adafruit_pyportal.py#L170

@brentru brentru mentioned this pull request Jul 29, 2019
Copy link
Member

@brentru brentru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the conditional imports at the top of the file.

Works when combined with #49

@brentru brentru merged commit 65b1e9f into adafruit:master Jul 29, 2019
@jerryneedell jerryneedell deleted the jerryn_fixcursor branch July 29, 2019 16:35
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Jul 29, 2019
Updating https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI to 1.7.0 from 1.6.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_ESP32SPI#61 from brentru/switch-requests
  > Merge pull request adafruit/Adafruit_CircuitPython_ESP32SPI#59 from mscosti/server

Updating https://github.com/adafruit/Adafruit_CircuitPython_PyPortal to 3.1.2 from 3.1.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_PyPortal#50 from brentru/switch-requests
  > Merge pull request adafruit/Adafruit_CircuitPython_PyPortal#49 from brentru/fix-tft-in-use
  > Merge pull request adafruit/Adafruit_CircuitPython_PyPortal#47 from jerryneedell/jerryn_fixcursor
  > Merge pull request adafruit/Adafruit_CircuitPython_PyPortal#42 from adafruit/ladyada-patch-1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

recent update breaks PyPortal
2 participants