Merge pull request #2109 from makermelissa/main

Updated PyPortal Google Calendar example to make better use of PyPort…

Author: TheKitty

PyPortal_Google_Calendar/authenticator/code.py

@@ -1,18 +1,10 @@
 # SPDX-FileCopyrightText: 2021 Brent Rubell, written for Adafruit Industries
 #
 # SPDX-License-Identifier: Unlicense
-import board
-import busio
-from digitalio import DigitalInOut
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_esp32spi import adafruit_esp32spi
-import adafruit_requests as requests
-import displayio
 from adafruit_display_text.label import Label
 from adafruit_bitmap_font import bitmap_font
-import adafruit_miniqr
 from adafruit_oauth2 import OAuth2
-
+from adafruit_pyportal import Network, Graphics
 
 # Add a secrets.py to your filesystem that has a dictionary called secrets with "ssid" and
 # "password" keys with your WiFi credentials. DO NOT share that file or commit it into Git or other
@@ -24,25 +16,10 @@
     print("WiFi secrets are kept in secrets.py, please add them there!")
     raise
 
-esp32_cs = DigitalInOut(board.ESP_CS)
-esp32_ready = DigitalInOut(board.ESP_BUSY)
-esp32_reset = DigitalInOut(board.ESP_RESET)
-
-spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
-esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
-
-print("Connecting to AP...")
-while not esp.is_connected:
-    try:
-        esp.connect_AP(secrets["ssid"], secrets["password"])
-    except RuntimeError as e:
-        print("could not connect to AP, retrying: ", e)
-        continue
-print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
+network = Network()
+network.connect()
 
-# Initialize a requests object with a socket and esp32spi interface
-socket.set_interface(esp)
-requests.set_socket(socket, esp)
+graphics = Graphics()
 
 # DisplayIO Setup
 # Set up fonts
@@ -53,50 +30,31 @@
 font_small.load_glyphs(glyphs)
 font_large.load_glyphs(glyphs)
 
-group_verification = displayio.Group()
 label_overview_text = Label(
     font_large, x=0, y=45, text="To authorize this device with Google:"
 )
-group_verification.append(label_overview_text)
+graphics.splash.append(label_overview_text)
 
 label_verification_url = Label(font_small, x=0, y=100, line_spacing=1)
-group_verification.append(label_verification_url)
+graphics.splash.append(label_verification_url)
 
 label_user_code = Label(font_small, x=0, y=150)
-group_verification.append(label_user_code)
+graphics.splash.append(label_user_code)
 
 label_qr_code = Label(font_small, x=0, y=190, text="Or scan the QR code:")
-group_verification.append(label_qr_code)
-
-
-### helper methods ###
-def bitmap_QR(matrix):
-    # monochome (2 color) palette
-    BORDER_PIXELS = 2
-
-    # bitmap the size of the screen, monochrome (2 colors)
-    bitmap = displayio.Bitmap(
-        matrix.width + 2 * BORDER_PIXELS, matrix.height + 2 * BORDER_PIXELS, 2
-    )
-    # raster the QR code
-    for y in range(matrix.height):  # each scanline in the height
-        for x in range(matrix.width):
-            if matrix[x, y]:
-                bitmap[x + BORDER_PIXELS, y + BORDER_PIXELS] = 1
-            else:
-                bitmap[x + BORDER_PIXELS, y + BORDER_PIXELS] = 0
-    return bitmap
-
+graphics.splash.append(label_qr_code)
 
 # Set scope(s) of access required by the API you're using
 scopes = ["https://www.googleapis.com/auth/calendar.readonly"]
 
 # Initialize an oauth2 object
 google_auth = OAuth2(
-    requests, secrets["google_client_id"], secrets["google_client_secret"], scopes
+    network.requests,
+    secrets["google_client_id"],
+    secrets["google_client_secret"],
+    scopes,
 )
 
-
 # Request device and user codes
 # https://developers.google.com/identity/protocols/oauth2/limited-input-device#step-1:-request-device-and-user-codes
 google_auth.request_codes()
@@ -119,24 +77,8 @@ def bitmap_QR(matrix):
 label_user_code.text = "2. Enter code: %s" % google_auth.user_code
 
 # Create a QR code
-qr = adafruit_miniqr.QRCode(qr_type=3, error_correct=adafruit_miniqr.L)
-qr.add_data(google_auth.verification_url.encode())
-qr.make()
-
-# generate the 1-pixel-per-bit bitmap
-qr_bitmap = bitmap_QR(qr.matrix)
-# we'll draw with a classic black/white palette
-palette = displayio.Palette(2)
-palette[0] = 0xFFFFFF
-palette[1] = 0x000000
-# we'll scale the QR code as big as the display can handle
-scale = 15
-# then center it!
-qr_img = displayio.TileGrid(qr_bitmap, pixel_shader=palette, x=170, y=165)
-group_verification.append(qr_img)
-# show the group
-board.DISPLAY.show(group_verification)
-
+graphics.qrcode(google_auth.verification_url.encode(), qr_size=2, x=170, y=165)
+graphics.display.show(graphics.splash)
 
 # Poll Google's authorization server
 print("Waiting for browser authorization...")
@@ -150,9 +92,9 @@ def bitmap_QR(matrix):
 print("\t'google_access_token' " + ":" + " '%s'," % google_auth.access_token)
 print("\t'google_refresh_token' " + ":" + " '%s'" % google_auth.refresh_token)
 # Remove QR code and code/verification labels
-group_verification.pop()
-group_verification.pop()
-group_verification.pop()
+graphics.splash.pop()
+graphics.splash.pop()
+graphics.splash.pop()
 
 label_overview_text.text = "Successfully Authenticated!"
 label_verification_url.text = (

PyPortal_Google_Calendar/code.py

@@ -2,16 +2,8 @@
 #
 # SPDX-License-Identifier: Unlicense
 import time
-import board
-import busio
-from digitalio import DigitalInOut
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_esp32spi import adafruit_esp32spi
-import adafruit_requests as requests
 from adafruit_oauth2 import OAuth2
 from adafruit_display_shapes.line import Line
-from adafruit_bitmap_font import bitmap_font
-from adafruit_display_text import label
 from adafruit_pyportal import PyPortal
 import rtc
 
@@ -60,35 +52,17 @@
     print("WiFi secrets are kept in secrets.py, please add them there!")
     raise
 
-# If you are using a board with pre-defined ESP32 Pins:
-esp32_cs = DigitalInOut(board.ESP_CS)
-esp32_ready = DigitalInOut(board.ESP_BUSY)
-esp32_reset = DigitalInOut(board.ESP_RESET)
-
-spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
-esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
-
-print("Connecting to AP...")
-while not esp.is_connected:
-    try:
-        esp.connect_AP(secrets["ssid"], secrets["password"])
-    except RuntimeError as e:
-        print("could not connect to AP, retrying: ", e)
-        continue
-print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
-
 # Create the PyPortal object
-pyportal = PyPortal(esp=esp, external_spi=spi)
+pyportal = PyPortal()
 r = rtc.RTC()
 
-# Initialize a requests object with a socket and esp32spi interface
-socket.set_interface(esp)
-requests.set_socket(socket, esp)
+pyportal.network.connect()
+
 
 # Initialize an OAuth2 object with GCal API scope
 scopes = ["https://www.googleapis.com/auth/calendar.readonly"]
 google_auth = OAuth2(
-    requests,
+    pyportal.network.requests,
     secrets["google_client_id"],
     secrets["google_client_secret"],
     scopes,
@@ -105,15 +79,17 @@ def get_current_time(time_max=False):
     cur_time = r.datetime
     if time_max:  # maximum time to fetch events is midnight (4:59:59UTC)
         cur_time_max = time.struct_time(
-            cur_time[0],
-            cur_time[1],
-            cur_time[2] + 1,
-            4,
-            59,
-            59,
-            cur_time[6],
-            cur_time[7],
-            cur_time[8],
+            (
+                cur_time[0],
+                cur_time[1],
+                cur_time[2] + 1,
+                4,
+                59,
+                59,
+                cur_time[6],
+                cur_time[7],
+                cur_time[8],
+            )
         )
         cur_time = cur_time_max
     cur_time = "{:04d}-{:02d}-{:02d}T{:02d}:{:02d}:{:02d}{:s}".format(
@@ -145,7 +121,7 @@ def get_calendar_events(calendar_id, max_events, time_min):
         "/events?maxResults={1}&timeMin={2}&timeMax={3}&orderBy=startTime"
         "&singleEvents=true".format(calendar_id, max_events, time_min, time_max)
     )
-    resp = requests.get(url, headers=headers)
+    resp = pyportal.network.requests.get(url, headers=headers)
     resp_json = resp.json()
     if "error" in resp_json:
         raise RuntimeError("Error:", resp_json)
@@ -191,6 +167,22 @@ def format_datetime(datetime, pretty_date=False):
     return formatted_time
 
 
+def create_event_labels():
+    for event_idx in range(MAX_EVENTS):
+        event_start_label = pyportal.add_text(
+            text_font=font_events,
+            text_position=(7, 70 + (event_idx * 40)),
+            text_color=0x000000,
+        )
+        event_text_label = pyportal.add_text(
+            text_font=font_events,
+            text_position=(88, 70 + (event_idx * 40)),
+            text_color=0x000000,
+            line_spacing=0.75,
+        )
+        event_labels.append((event_start_label, event_text_label))
+
+
 def display_calendar_events(resp_events):
     # Display all calendar events
     for event_idx in range(len(resp_events)):
@@ -203,39 +195,31 @@ def display_calendar_events(resp_events):
         print("Event Description: ", event_name)
         print("Event Time:", format_datetime(event_start))
         print("-" * 40)
-        # Generate labels holding event info
-        label_event_time = label.Label(
-            font_events,
-            x=7,
-            y=70 + (event_idx * 40),
-            color=0x000000,
-            text=format_datetime(event_start),
-        )
-        pyportal.splash.append(label_event_time)
-
-        label_event_desc = label.Label(
-            font_events,
-            x=88,
-            y=70 + (event_idx * 40),
-            color=0x000000,
-            text=event_name,
-            line_spacing=0.75,
-        )
-        pyportal.splash.append(label_event_desc)
+        pyportal.set_text(format_datetime(event_start), event_labels[event_idx][0])
+        pyportal.set_text(event_name, event_labels[event_idx][1])
+
+    # Clear any unused labels
+    for event_idx in range(len(resp_events), MAX_EVENTS):
+        pyportal.set_text("", event_labels[event_idx][0])
+        pyportal.set_text("", event_labels[event_idx][1])
 
 
 pyportal.set_background(0xFFFFFF)
 
+# Set up calendar event fonts
+font_events = "fonts/Arial-14.pcf"
+
 # Add the header
 line_header = Line(0, 50, 320, 50, color=0x000000)
 pyportal.splash.append(line_header)
 
-font_h1 = bitmap_font.load_font("fonts/Arial-18.pcf")
-label_header = label.Label(font_h1, x=10, y=30, color=0x000000)
-pyportal.splash.append(label_header)
-
-# Set up calendar event fonts
-font_events = bitmap_font.load_font("fonts/Arial-14.pcf")
+label_header = pyportal.add_text(
+    text_font="fonts/Arial-18.pcf",
+    text_position=(10, 30),
+    text_color=0x000000,
+)
+event_labels = []
+create_event_labels()
 
 if not google_auth.refresh_access_token():
     raise RuntimeError("Unable to refresh access token - has the token been revoked?")
@@ -260,20 +244,13 @@ def display_calendar_events(resp_events):
     now = get_current_time()
 
     # setup header label
-    label_header.text = format_datetime(now, pretty_date=True)
-
-    # remove previous event time labels and event description labels
-    for _ in range(len(events * 2)):
-        print("removing event label...")
-        pyportal.splash.pop()
+    pyportal.set_text(format_datetime(now, pretty_date=True), label_header)
 
     print("fetching calendar events...")
     events = get_calendar_events(CALENDAR_ID, MAX_EVENTS, now)
 
     print("displaying events")
     display_calendar_events(events)
 
-    board.DISPLAY.show(pyportal.splash)
-
     print("Sleeping for %d minutes" % REFRESH_TIME)
     time.sleep(REFRESH_TIME * 60)