Skip to content

Conversation

@jepler
Copy link

@jepler jepler commented Aug 11, 2019

I only touched the areas that I believe are specific to circuitpython, so as to reduce the chances of merge conflicts with upstream, so there are uses of the deprecated (to us) macro remaining.

Closes: #2013

jepler added 6 commits August 11, 2019 08:53
In adafruit#2013, @danh says:
    My choice of where to put the semicolon is deliberate,
    so that we can say

        RUN_BACKGROUND_TASKS;

    not have a redundant semicolon, and not confuse C code formatting.
@jepler jepler requested a review from dhalbert August 11, 2019 13:57
@jerryneedell
Copy link
Collaborator

jerryneedell commented Aug 11, 2019

should this also be applied to HID as in #2050 ? Or is that outside the scope of your intent per your initial comment.

@jepler
Copy link
Author

jepler commented Aug 11, 2019

@jerryneedell yes, #2050 would need further (trivial) modification if this goes in first. good catch.

@dhalbert
Copy link
Collaborator

I’ll review this by Tuesday. Thanks!

dhalbert
dhalbert previously approved these changes Aug 19, 2019
Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

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

OK, looks good - thank you! I'll push a change to fix the merge conflicts.

The indented XXX_MODULE entries in py/circuitpy_mpconfig.h were meant to show prerequisites, e.g. FONTIO_MODULE and TERMINAL_MODULE depend on DISPLAYIO_MODULE.

Restore dependencies indicated by indentation in circuitpy_mpconfig.h.
@dhalbert
Copy link
Collaborator

something weird about tinyusb update; investigating; don't merge yet

@jepler
Copy link
Author

jepler commented Aug 19, 2019

Ouch, I obviously made a mistake in my git use. Do you want me to re-roll this whole PR to also get rid of the "reorder and reindent" part? @dhalbert

Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

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

OK, all set. The tinyusb commit was your change commit to tinyusb with the MIDI fix, but not the merge commit to the tinyusb repo that merged that in to the tip of master. That included a bunch of new changes to tinyusb: we'll have to update some code to handle those. I'll do another PR for that.

@dhalbert dhalbert merged commit 0ddfbb0 into adafruit:master Aug 19, 2019
@jepler jepler deleted the run-background-tasks branch November 3, 2021 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Replace most uses of MICROPY_VM_HOOK_LOOP with RUN_BACKGROUND_TASKS

4 participants