From 2e2215b890240af81af1589d0ad98d1cda1b36dc Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 21 Feb 2024 18:51:55 -0600 Subject: [PATCH] Rename examples & tweak slightly --- examples/{ipcam => web_camera}/code.py | 13 ++++++++++--- examples/{ipcam2 => web_settings_explorer}/code.py | 1 + .../htdocs/index.html | 0 .../htdocs/index.js | 0 .../htdocs/metadata.js | 0 .../make_web_metadata.py | 0 6 files changed, 11 insertions(+), 3 deletions(-) rename examples/{ipcam => web_camera}/code.py (80%) rename examples/{ipcam2 => web_settings_explorer}/code.py (98%) rename examples/{ipcam2 => web_settings_explorer}/htdocs/index.html (100%) rename examples/{ipcam2 => web_settings_explorer}/htdocs/index.js (100%) rename examples/{ipcam2 => web_settings_explorer}/htdocs/metadata.js (100%) rename examples/{ipcam2 => web_settings_explorer}/make_web_metadata.py (100%) diff --git a/examples/ipcam/code.py b/examples/web_camera/code.py similarity index 80% rename from examples/ipcam/code.py rename to examples/web_camera/code.py index 49865b8..55cc82b 100644 --- a/examples/ipcam/code.py +++ b/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()) diff --git a/examples/ipcam2/code.py b/examples/web_settings_explorer/code.py similarity index 98% rename from examples/ipcam2/code.py rename to examples/web_settings_explorer/code.py index 9d93434..696e584 100644 --- a/examples/ipcam2/code.py +++ b/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) diff --git a/examples/ipcam2/htdocs/index.html b/examples/web_settings_explorer/htdocs/index.html similarity index 100% rename from examples/ipcam2/htdocs/index.html rename to examples/web_settings_explorer/htdocs/index.html diff --git a/examples/ipcam2/htdocs/index.js b/examples/web_settings_explorer/htdocs/index.js similarity index 100% rename from examples/ipcam2/htdocs/index.js rename to examples/web_settings_explorer/htdocs/index.js diff --git a/examples/ipcam2/htdocs/metadata.js b/examples/web_settings_explorer/htdocs/metadata.js similarity index 100% rename from examples/ipcam2/htdocs/metadata.js rename to examples/web_settings_explorer/htdocs/metadata.js diff --git a/examples/ipcam2/make_web_metadata.py b/examples/web_settings_explorer/make_web_metadata.py similarity index 100% rename from examples/ipcam2/make_web_metadata.py rename to examples/web_settings_explorer/make_web_metadata.py