Pixel shader fix #1604
Merged
Pixel shader fix #1604
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jepler
approved these changes
Jul 20, 2021
There was a problem hiding this comment.
I skimmed and didn't see any problems with the changes. However, there are merge conflicts which will need to be addressed, I think because I also merged some PRs to fix the max group size. This may indicate needing to work more closely with @lesamouraipourpre when both kinds of updates affect a single file. In any case, thank you!
|
I will resolve the merge conflicts tonight to get this back to passing. |
# Conflicts: # Buckaroo_Plant_Care_Bot/buckaroo_plant_care_bot.py
16 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These changes update all projects that use OnDiskBitmap to use the new pixel_shader method from adafruit/circuitpython#4823
These changes are necessary in order to run the projects on CircuitPython 7.0.0.beta-3 and newer.
Once support for CircuitPython 6.x is dropped these could be amended further to remove the getattr call and instead just directly pass
bitmap.pixel_shaderIn the meantime the changes in this PR allow the projects to work on both older versions and newer versions of CircuitPython