Merge branch 'main' into overlays

Author: dhalbert

adafruit_pycamera/__init__.py

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 """Library for the Adafruit PyCamera with OV5640 autofocus module"""
+
 # pylint: disable=too-many-lines
 import gc
 import os
@@ -283,6 +284,32 @@ def make_debounced_expander_pin(pin_no):
 
         self.mute = make_expander_output(_AW_MUTE, False)
 
+        self.check_for_update_needed()
+
+    def check_for_update_needed(self):
+        """Check whether CIRCUITPY is too big, indicating it was created
+        by a version of CircuitPython older than 9.0.0 beta 2.
+        If so display and print a message and hang.
+        """
+        circuitpy_stat = os.statvfs("/")
+        # CIRCUITPY should be 960KB or so. >1MB is too large
+        # and indicates an older version of CircuitPython
+        # created the filesystem.
+        if circuitpy_stat[1] * circuitpy_stat[2] > 1000000:
+            message = """\
+CIRCUITPY problem.
+Backup. Update CPy
+to >= 9.0.0-beta.2.
+Reformat:
+ import storage
+ storage.erase_
+filesystem()
+See Learn Guide."""
+            self.display_message(message, color=0xFFFFFF, scale=2, full_screen=True)
+            print(message)
+            while True:
+                pass
+
     def make_camera_ui(self):
         """Create displayio widgets for the standard camera UI"""
         self._sd_label = label.Label(
@@ -685,13 +712,15 @@ def deinit_display(self):
         self._display_bus = None
         self.display = None
 
-    def display_message(self, message, color=0xFF0000, scale=3):
+    def display_message(self, message, color=0xFF0000, scale=3, full_screen=False):
         """Display a message on the TFT"""
         text_area = label.Label(terminalio.FONT, text=message, color=color, scale=scale)
-        text_area.anchor_point = (0.5, 0.5)
+        text_area.anchor_point = (0, 0) if full_screen else (0.5, 0.5)
         if not self.display:
             self.init_display()
-        text_area.anchored_position = (self.display.width / 2, self.display.height / 2)
+        text_area.anchored_position = (
+            (0, 0) if full_screen else (self.display.width / 2, self.display.height / 2)
+        )
 
         # Show it
         self.splash.append(text_area)
@@ -1101,6 +1130,7 @@ def __init__(self, init_autofocus=True):
         self.init_neopixel()
         self.init_display()
         self.init_camera(init_autofocus)
+
         try:
             self.mount_sd_card()
         except Exception as exc:  # pylint: disable=broad-exception-caught

examples/ipcam/code.py renamed to examples/web_camera/code.py

@@ -22,7 +22,14 @@
 pycam.camera.quality = 6
 
 server = Server(socketpool.SocketPool(wifi.radio))
-PORT = 81
+if wifi.radio.ipv4_address:
+    # use alt port if web workflow enabled
+    port = 8080
+else:
+    # connect to wifi and use standard http port otherwise
+    wifi.radio.connect(os.getenv("WIFI_SSID"), os.getenv("WIFI_PASSWORD"))
+    port = 80
+
 BOUNDARY = b"FRAME" + binascii.hexlify(os.urandom(8))
 
 
@@ -51,7 +58,7 @@ def body():
 
 
 async def poll(interval):
-    server.start(str(wifi.radio.ipv4_address), port=PORT)
+    server.start(str(wifi.radio.ipv4_address), port=port)
     while True:
         try:
             server.poll()
@@ -65,6 +72,6 @@ async def main():
     await asyncio.gather(poll_task)
 
 
-pycam.display_message(f"{wifi.radio.ipv4_address}:{PORT}/", scale=2)
+pycam.display_message(f"{wifi.radio.ipv4_address}:{port}/", scale=2)
 
 asyncio.run(main())

examples/ipcam2/code.py renamed to examples/web_settings_explorer/code.py

@@ -119,4 +119,5 @@ def property_common(obj, request):
         return JSONResponse(request, {"error": str(exc)}, status=BAD_REQUEST_400)
 
 
+pycam.display_message(f"{wifi.radio.ipv4_address}:{port}/", scale=2)
 server.serve_forever(str(wifi.radio.ipv4_address), port)