Merge pull request #237 from pimoroni/patch/examples-4colour

Examples: updated for compatibility with 4 colour display

Author: helgibbons

examples/phat/calendar-phat.py

@@ -27,19 +27,22 @@
 except TypeError:
     raise TypeError("You need to update the Inky library to >= v1.1.0")
 
+flip = inky_display.eeprom.display_variant == 23
+BLACK = inky_display.BLACK if not flip else inky_display.WHITE
+WHITE = inky_display.WHITE if not flip else inky_display.BLACK
 
 if inky_display.resolution not in ((212, 104), (250, 122)):
     w, h = inky_display.resolution
     raise RuntimeError("This example does not support {}x{}".format(w, h))
 
-inky_display.set_border(inky_display.BLACK)
+inky_display.set_border(BLACK)
 
 # Uncomment the following if you want to rotate the display 180 degrees
 # inky_display.h_flip = True
 # inky_display.v_flip = True
 
 
-def create_mask(source, mask=(inky_display.WHITE, inky_display.BLACK, inky_display.RED)):
+def create_mask(source, mask=(WHITE, BLACK, inky_display.RED)):
     """Create a transparency mask.
 
     Takes a paletized source image and converts it into a mask
@@ -88,7 +91,7 @@ def print_number(position, number, colour):
 
 # Load our sprite sheet and prepare a mask
 text = Image.open(os.path.join(PATH, "resources/calendar.png"))
-text_mask = create_mask(text, [inky_display.WHITE])
+text_mask = create_mask(text, [WHITE])
 
 # Note: The mask determines which pixels from our sprite sheet we want
 # to actually use when calling img.paste().
@@ -116,7 +119,7 @@ def print_number(position, number, colour):
 cal_y = 2
 
 # Paint out a black rectangle onto which we'll draw our canvas
-draw.rectangle((cal_x, cal_y, cal_x + cal_w - 1, cal_y + cal_h - 1), fill=inky_display.BLACK, outline=inky_display.WHITE)
+draw.rectangle((cal_x, cal_y, cal_x + cal_w - 1, cal_y + cal_h - 1), fill=BLACK, outline=WHITE)
 
 # The starting position of the months in our spritesheet
 months_x = 2
@@ -145,10 +148,10 @@ def print_number(position, number, colour):
 monthyear_x = 28
 
 # Paste in the month name we grabbed from our sprite sheet
-img.paste(inky_display.WHITE, (monthyear_x, cal_y + 4), month_mask)
+img.paste(WHITE, (monthyear_x, cal_y + 4), month_mask)
 
 # Print the year right below the month
-print_number((monthyear_x, cal_y + 5 + col_h), now.year, inky_display.WHITE)
+print_number((monthyear_x, cal_y + 5 + col_h), now.year, WHITE)
 
 # Draw the vertical lines which separate the columns
 # and also draw the day names into the table header
@@ -162,7 +165,7 @@ def print_number(position, number, colour):
     # Crop the relevant day name from our text image
     crop_region = (crop_x, 0, crop_x + 16, 9)
     day_mask = text_mask.crop(crop_region)
-    img.paste(inky_display.WHITE, (o_x + 4, cal_y + 2), day_mask)
+    img.paste(WHITE, (o_x + 4, cal_y + 2), day_mask)
 
     # Offset to the right side of the column and draw the vertical line
     o_x += col_w + 1
@@ -187,13 +190,13 @@ def print_number(position, number, colour):
         # Draw in the day name.
         # If it's the current day, invert the calendar background and text
         if (day.day, day.month) == (now.day, now.month):
-            draw.rectangle((x, y, x + col_w - 1, y + col_h - 1), fill=inky_display.WHITE)
-            print_number((x + 3, y + 3), day.day, inky_display.BLACK)
+            draw.rectangle((x, y, x + col_w - 1, y + col_h - 1), fill=WHITE)
+            print_number((x + 3, y + 3), day.day, BLACK)
 
         # If it's any other day, paint in as white if it's in the current month
         # and red if it's in the previous or next month
         else:
-            print_number((x + 3, y + 3), day.day, inky_display.WHITE if day.month == now.month else inky_display.RED)
+            print_number((x + 3, y + 3), day.day, WHITE if day.month == now.month else inky_display.RED)
 
 # Display the completed calendar on Inky pHAT
 inky_display.set_image(img)

examples/phat/hello-world-4-colour.py

@@ -0,0 +1,27 @@
+# This basic example shows how to draw shapes and text on Inky pHAT using PIL.
+
+from font_fredoka_one import FredokaOne
+from PIL import Image, ImageDraw, ImageFont
+
+from inky.auto import auto
+
+inky_display = auto(ask_user=True, verbose=True)
+
+WIDTH, HEIGHT = inky_display.width, inky_display.height
+
+# Create new PIL image with a white background
+image = Image.new("P", (WIDTH, HEIGHT), inky_display.WHITE)
+draw = ImageDraw.Draw(image)
+
+font = ImageFont.truetype(FredokaOne, 18)
+
+# draw some shapes
+draw.rectangle((100, 0, 170, 50), fill=inky_display.YELLOW)  # Rectangle
+draw.ellipse((90, 90, 180, 180), fill=inky_display.RED)  # Circle (ellipse)
+
+
+# draw some text
+draw.text((80, 60), "Hello, World!", inky_display.BLACK, font)
+
+inky_display.set_image(image)
+inky_display.show()

examples/phat/weather-phat.py

@@ -53,6 +53,10 @@
 
 inky_display.set_border(inky_display.BLACK)
 
+flip = inky_display.eeprom.display_variant == 23
+BLACK = inky_display.BLACK if not flip else inky_display.WHITE
+WHITE = inky_display.WHITE if not flip else inky_display.BLACK
+
 # Details to customise your weather display
 
 CITY = "Sheffield"
@@ -83,7 +87,7 @@ def get_weather(address):
         return weather
 
 
-def create_mask(source, mask=(inky_display.WHITE, inky_display.BLACK, inky_display.RED)):
+def create_mask(source, mask=(WHITE, BLACK, inky_display.RED)):
     """Create a transparency mask.
 
     Takes a paletized source image and converts it into a mask
@@ -165,13 +169,13 @@ def create_mask(source, mask=(inky_display.WHITE, inky_display.BLACK, inky_displ
 # Write text with weather values to the canvas
 datetime = time.strftime("%d/%m %H:%M")
 
-draw.text((41, 12), datetime, inky_display.WHITE, font=font)
+draw.text((41, 12), datetime, WHITE, font=font)
 
-draw.text((72, 34), "T", inky_display.WHITE, font=font)
-draw.text((92, 34), "{}°C".format(temperature), inky_display.WHITE if temperature < WARNING_TEMP else inky_display.RED, font=font)
+draw.text((72, 34), "T", WHITE, font=font)
+draw.text((92, 34), "{}°C".format(temperature), WHITE if temperature < WARNING_TEMP else inky_display.RED, font=font)
 
-draw.text((72, 58), "W", inky_display.WHITE, font=font)
-draw.text((92, 58), "{}kmh".format(windspeed), inky_display.WHITE, font=font)
+draw.text((72, 58), "W", WHITE, font=font)
+draw.text((92, 58), "{}kmh".format(windspeed), WHITE, font=font)
 
 # Draw the current weather icon over the backdrop
 if weather_icon is not None:

examples/what/dither-image-what.py

@@ -53,10 +53,13 @@
 
 img = img.crop((x0, y0, x1, y1))
 
-# Convert the image to use a white / black / red colour palette
+# Convert the image to use a white / black / red/yellow colour palette
 
 pal_img = Image.new("P", (1, 1))
-pal_img.putpalette((255, 255, 255, 0, 0, 0, 255, 0, 0) + (0, 0, 0) * 252)
+if inky_display.colour == "red/yellow":
+    pal_img.putpalette((0, 0, 0, 255, 255, 255, 255, 255, 0, 255, 0, 0) + (0, 0, 0) * 251)
+else:
+    pal_img.putpalette((255, 255, 255, 0, 0, 0, 255, 0, 0) + (0, 0, 0) * 252)
 
 img = img.convert("RGB").quantize(palette=pal_img)
 

examples/what/hello-world-4-colour.py

@@ -0,0 +1,26 @@
+# This basic example shows how to draw shapes and text on Inky wHAT using PIL.
+
+from font_fredoka_one import FredokaOne
+from PIL import Image, ImageDraw, ImageFont
+
+from inky.auto import auto
+
+inky_display = auto(ask_user=True, verbose=True)
+
+WIDTH, HEIGHT = inky_display.width, inky_display.height
+
+# Create new PIL image with a white background
+image = Image.new("P", (WIDTH, HEIGHT), inky_display.WHITE)
+draw = ImageDraw.Draw(image)
+
+font = ImageFont.truetype(FredokaOne, 28)
+
+# draw some shapes
+draw.rectangle((0, 0, 200, 200), fill=inky_display.YELLOW)  # Rectangle
+draw.ellipse((200, 200, 400, 400), fill=inky_display.RED)  # Circle (ellipse)
+
+# draw some text
+draw.text((120, 130), "Hello, World!", inky_display.BLACK, font)
+
+inky_display.set_image(image)
+inky_display.show()

examples/what/quotes-what.py

@@ -32,10 +32,12 @@
 inky_display.set_border(inky_display.WHITE)
 # inky_display.set_rotation(180)
 
+
 def getsize(font, text):
     _, _, right, bottom = font.getbbox(text)
     return (right, bottom)
 
+
 # This function will take a quote as a string, a width to fit
 # it into, and a font (one that's been loaded) and then reflow
 # that quote with newlines to fit into the space required.
@@ -65,7 +67,7 @@ def reflow_quote(quote, width, font):
 
 # Create a new canvas to draw on
 
-img = Image.new("P", (WIDTH, HEIGHT))
+img = Image.new("P", (WIDTH, HEIGHT), inky_display.WHITE)
 draw = ImageDraw.Draw(img)
 
 # Load the fonts