Simplify load and use [] on the bitmap #7
Merged
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
|
Tested with the 3 BMPs in this repo's example folder - worked. Loaded and displayed correctly. Press any key to enter the REPL. Use CTRL-D to reload.
Adafruit CircuitPython 4.0.0-beta.6 on 2019-03-30; Adafruit PyPortal with samd51j20
>>> import board
>>> import displayio
>>> import adafruit_imageload
>>> group = displayio.Group()
>>> board.DISPLAY.show(group)
>>> image, palette = adafruit_imageload.load("/1bit.bmp", bitmap=displayio.Bitmap, palette=displayio.Palette)
>>> tg = displayio.TileGrid(image, pixel_shader=palette)
>>> group.append(tg)
>>> However, try same with this BMP: |
|
@caternuson I don't crash with an equivalent code.py. I get: Do you get a safe mode with Beta 7? |
|
Sorry, forgot that I had rotated the image in gimp. I probably changed it to indexed at the same time. So was not working with that exact BMP that I linked. I do get the same thing you get if I try the original file. Here's the actual file I was using: Just tested this again with beta 7 and guess what - it works! Press any key to enter the REPL. Use CTRL-D to reload.
Adafruit CircuitPython 4.0.0-beta.7 on 2019-04-13; Adafruit PyPortal with samd51j20
>>> import board
>>> import displayio
>>> import adafruit_imageload
>>> group = displayio.Group()
>>> board.DISPLAY.show(group)
>>> image, palette = adafruit_imageload.load("/purple.bmp", bitmap=displayio.Bitmap, palette=displayio.Palette)
>>> tg = displayio.TileGrid(image, pixel_shader=palette)
>>> group.append(tg)
>>> |
|
@tannewt I'd say it's working...
|
caternuson
approved these changes
Apr 19, 2019
|
Looks like the red and blue channels are getting swapped. import board
import displayio
import adafruit_imageload
display = board.DISPLAY
bitmap, palette = adafruit_imageload.load("/color_test.bmp",
bitmap=displayio.Bitmap,
palette=displayio.Palette)
tile_grid = displayio.TileGrid(bitmap, pixel_shader=palette)
group = displayio.Group()
group.append(tile_grid)
display.show(group)
while True:
passPyPortal running 4.0 beta 7: |
to show the complete color wheel.
…uit_CircuitPython_ImageLoad into use_bitmap_subscr
Use bitmap subscr
|
Ok, this now includes a fix for the color order. |
matt-land
reviewed
May 14, 2019
| color_depth = int.from_bytes(file.read(2), 'little') | ||
| file.seek(46) | ||
| colors = int.from_bytes(file.read(4), 'little') | ||
|
|
There was a problem hiding this comment.
These values all look correct to the spec.
Suggestion (no change needed):
It might be easier to maintain and check this section if the seek values are given in hex, so they match up with the documentation.
file.seek(0x12) # Width of the bitmap in pixels
file.seek(0x1C) # Number of bits per pixel
|
Nice! Same check as above looks better now. |
adafruit-adabot
added a commit
to adafruit/Adafruit_CircuitPython_Bundle
that referenced
this pull request
Jun 1, 2019
Updating https://github.com/adafruit/Adafruit_CircuitPython_CharLCD to 3.2.1 from 3.2.0: > Merge pull request adafruit/Adafruit_CircuitPython_CharLCD#39 from caternuson/iss36 Updating https://github.com/adafruit/Adafruit_CircuitPython_ST7735 to 1.0.2 from 1.0.1: > Merge pull request adafruit/Adafruit_CircuitPython_ST7735#5 from makermelissa/master Updating https://github.com/adafruit/Adafruit_CircuitPython_ST7735R to 1.0.2 from 1.0.1: > Merge pull request adafruit/Adafruit_CircuitPython_ST7735R#6 from makermelissa/master Updating https://github.com/adafruit/Adafruit_CircuitPython_AzureIoT to 1.0.2 from 1.0.1: > Merge pull request adafruit/Adafruit_CircuitPython_AzureIoT#3 from brentru/patch-return-message Updating https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad to 0.9.1 from 0.8.1: > Merge pull request adafruit/Adafruit_CircuitPython_ImageLoad#14 from tannewt/move_tests > Merge pull request adafruit/Adafruit_CircuitPython_ImageLoad#12 from crookedstorm/feature-tests > Merge pull request adafruit/Adafruit_CircuitPython_ImageLoad#13 from matt-land/bugfix-fix-the-build-sphinx > Merge pull request adafruit/Adafruit_CircuitPython_ImageLoad#7 from tannewt/use_bitmap_subscr > Merge pull request adafruit/Adafruit_CircuitPython_ImageLoad#11 from crookedstorm/docs-add-development-guide Updating https://github.com/adafruit/Adafruit_CircuitPython_Motor to 2.0.0 from 1.5.1: > Merge pull request adafruit/Adafruit_CircuitPython_Motor#30 from adafruit/revert-29-master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.