working, white/black

Author: Matt Land

adafruit_imageload/pnm/__init__.py

@@ -42,21 +42,25 @@ def load(file, header, *, bitmap=None, palette=None):
         # We have all we need at length 3
         if len(pnm_header) == 3:
             break
-        if len(pnm_header) == 2:
+        if len(pnm_header) == 2 and (
+            magic_number.startswith(b"P1") or magic_number.startswith(b"P4")
+        ):
+            bitmap = bitmap(pnm_header[0], pnm_header[1], 1)
+            if palette:
+                palette = palette(1)
+                palette[0] = 0xFFFFFF
             if magic_number.startswith(b"P1"):
                 from . import pbm_ascii
 
-                bitmap = bitmap(pnm_header[0], pnm_header[1], 1)
                 return pbm_ascii.load(
                     file, pnm_header[0], pnm_header[1], bitmap=bitmap, palette=palette
                 )
-            if magic_number.startswith(b"P4"):
-                from . import pbm_binary
 
-                bitmap = bitmap(pnm_header[0], pnm_header[1], 1)
-                return pbm_binary.load(
-                    file, pnm_header[0], pnm_header[1], bitmap=bitmap, palette=palette
-                )
+            from . import pbm_binary
+
+            return pbm_binary.load(
+                file, pnm_header[0], pnm_header[1], bitmap=bitmap, palette=palette
+            )
 
         next_byte = file.read(1)
         if next_byte == b"#":
@@ -85,15 +89,11 @@ def load(file, header, *, bitmap=None, palette=None):
     if magic_number.startswith(b"P2") or magic_number.startswith(b"P5"):
         from . import pgm
 
-        return pgm.load(
-            file, magic_number, pnm_header, bitmap=bitmap, palette=palette
-        )
+        return pgm.load(file, magic_number, pnm_header, bitmap=bitmap, palette=palette)
 
     if magic_number.startswith(b"P3") or magic_number.startswith(b"P6"):
         from . import ppm
 
-        return ppm.load(
-            file, magic_number, pnm_header, bitmap=bitmap, palette=palette
-        )
+        return ppm.load(file, magic_number, pnm_header, bitmap=bitmap, palette=palette)
 
     raise RuntimeError("Unsupported image format")

docs/pbm_test_code.py

@@ -0,0 +1,40 @@
+"""
+Testing script for PBM
+Tested with Feather M4 Express and 2.4" Featherwing
+1. Flash board to 4x
+2. add 'adafruit_ili9341.mpy' for 4x firmware to /lib/ on board
+3. add /examples/images to /images on board
+4. copy ./adafruit_imageload to /lib/ on the board
+5. paste this file into code.py
+
+"""
+
+import board
+import displayio
+import adafruit_ili9341
+import adafruit_imageload
+
+spi = board.SPI()
+tft_cs = board.D9
+tft_dc = board.D10
+
+displayio.release_displays()
+display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs)
+
+display = adafruit_ili9341.ILI9341(display_bus, width=320, height=240)
+
+# Make the display context
+splash = displayio.Group(max_size=10)
+display.show(splash)
+
+
+bitmap, palette = adafruit_imageload.load(
+    "images/netpbm_p1_mono.pbm", bitmap=displayio.Bitmap, palette=displayio.Palette
+)
+
+
+bg_sprite = displayio.TileGrid(bitmap, pixel_shader=palette, x=0, y=0)
+splash.append(bg_sprite)
+
+while True:
+    pass