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

Update the pixel_shader usage of OnDiskBitmap #24

Merged
merged 1 commit into from
Jul 22, 2021

Conversation

lesamouraipourpre
Copy link
Contributor

OnDiskBitmap has had incompatible changes in 7.0.0-alpha.3 - Ref: adafruit/circuitpython#4823
This PR is part of a group of updates for this change - adafruit/circuitpython#4982

This PR updates the library to the combined usage for CP6 & CP7 with a TODO to remove the CP6 compatibility in the future. It has been tested on a PyPortal with 6.3.0 and 7.0.0-alpha.4

Copy link
Member

@jepler jepler left a comment

Choose a reason for hiding this comment

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

Looks good, thanks! I did not test.

Copy link
Contributor

@FoamyGuy FoamyGuy left a comment

Choose a reason for hiding this comment

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

Changes look good to me. I tested this successfully using the simpletest in this repo with a PyPortal on CircuitPython 7.0.0-alpha.4

@FoamyGuy FoamyGuy merged commit d5db09a into adafruit:main Jul 22, 2021
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Jul 23, 2021
Updating https://github.com/adafruit/Adafruit_CircuitPython_CircuitPlayground to 4.4.1 from 4.4.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_CircuitPlayground#107 from adafruit/remove-gamepad-from-mock-imports

Updating https://github.com/adafruit/Adafruit_CircuitPython_EPD to 2.9.5 from 2.9.4:
  > Merge pull request adafruit/Adafruit_CircuitPython_EPD#51 from icegoat9/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_MONSTERM4SK to 0.2.0 from 0.1.4:
  > Merge pull request adafruit/Adafruit_CircuitPython_MONSTERM4SK#8 from lesamouraipourpre/max-size

Updating https://github.com/adafruit/Adafruit_CircuitPython_SSD1325 to 1.3.0 from 1.2.5:
  > Merge pull request adafruit/Adafruit_CircuitPython_SSD1325#11 from lesamouraipourpre/max-size

Updating https://github.com/adafruit/Adafruit_CircuitPython_ST7735R to 1.5.0 from 1.4.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_ST7735R#25 from lesamouraipourpre/max-size

Updating https://github.com/adafruit/Adafruit_CircuitPython_AdafruitIO to 5.5.0 from 5.4.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_AdafruitIO#78 from ryanplusplus/patch-1

Updating https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_Layout to 1.10.1 from 1.10.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_DisplayIO_Layout#41 from FoamyGuy/fix_odb

Updating https://github.com/adafruit/Adafruit_CircuitPython_PortalBase to 1.9.1 from 1.9.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_PortalBase#44 from lesamouraipourpre/ondiskbitmap-changes

Updating https://github.com/adafruit/Adafruit_CircuitPython_PYOA to 2.4.0 from 2.3.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_PYOA#24 from lesamouraipourpre/ondiskbitmap-changes

Updating https://github.com/adafruit/Adafruit_CircuitPython_Requests to 1.10.0 from 1.9.9:
  > Merge pull request adafruit/Adafruit_CircuitPython_Requests#77 from mogenson/redirect-support
  > Moved default branch to main
  > Moved CI to Python 3.7
  > Added help text and problem matcher
  > Added pull request template

Updating https://github.com/adafruit/Adafruit_CircuitPython_Slideshow to 1.6.0 from 1.5.7:
  > Merge pull request adafruit/Adafruit_CircuitPython_Slideshow#36 from lesamouraipourpre/ondiskbitmap-changes
  > Moved default branch to main
  > Moved CI to Python 3.7
  > Added help text and problem matcher
  > Added pull request template
  > "Increase duplicate code check threshold "

Updating https://github.com/adafruit/Adafruit_CircuitPython_T to 0.9.2 from 0.9.0:
  > Merge pull request adafruit/Adafruit_CircuitPython_T#1 from adafruit/fix-no-monotonic-ns

Updating https://github.com/adafruit/Adafruit_CircuitPython_Bundle/circuitpython_library_list.md to NA from NA:
  > Added the following libraries: Adafruit_CircuitPython_Ticks
@lesamouraipourpre lesamouraipourpre deleted the ondiskbitmap-changes branch August 9, 2021 09:20
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.

3 participants