Skip to content

Use the correct object for PinAlarm and TouchAlarm #74

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

Merged
merged 1 commit into from
Jul 18, 2022
Merged

Use the correct object for PinAlarm and TouchAlarm #74

merged 1 commit into from
Jul 18, 2022

Conversation

timwoj
Copy link
Contributor

@timwoj timwoj commented Jul 16, 2022

Creating pin alarms using create_pin_alarm results in this:

Traceback (most recent call last):
  File "code.py", line 130, in <module>
  File "adafruit_portalbase/__init__.py", line 371, in create_pin_alarm
AttributeError: 'module' object has no attribute 'PinAlarm'

Looking into it, the code is using the wrong object to create both pin and touch alarms.

@tekktrik
Copy link
Member

tekktrik commented Jul 18, 2022

@timwoj Thanks for the fix! It looks like the CI is failing, but not because of changes here. I added the fix as #75, so either that can get merged and then I can merge this PR, or if you want to add those changes to this PR and it passes CI, I can merge them both :)

@tekktrik tekktrik self-requested a review July 18, 2022 03:30
@timwoj
Copy link
Contributor Author

timwoj commented Jul 18, 2022

I went ahead and rebased on top of upstream. I'll keep an eye on the tests.

@tekktrik
Copy link
Member

We may use a different solution to this it seems, should know more shortly, but its definitely not related to this PR. You can follow along here if you want: #75

Sorry for the misleading information on the solution!

@timwoj
Copy link
Contributor Author

timwoj commented Jul 18, 2022

No worries! Let me know when you've got it sorted and I can just rebase again 😃

@tekktrik
Copy link
Member

Alright you should be good to rebase off of main now 😁

Copy link
Member

@tekktrik tekktrik left a comment

Choose a reason for hiding this comment

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

Most excellent!

@tekktrik tekktrik merged commit 499526b into adafruit:main Jul 18, 2022
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Jul 19, 2022
Updating https://github.com/adafruit/Adafruit_CircuitPython_PortalBase to 1.13.5 from 1.13.4:
  > Merge pull request adafruit/Adafruit_CircuitPython_PortalBase#74 from timwoj/main
  > Merge pull request adafruit/Adafruit_CircuitPython_PortalBase#76 from tekktrik/main
  > Merge pull request adafruit/Adafruit_CircuitPython_PortalBase#75 from tekktrik/fix/add-esp32spi-req
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.

2 participants