diff --git a/circup_requirements.txt b/circup_requirements.txt new file mode 100644 index 0000000..33cdda0 --- /dev/null +++ b/circup_requirements.txt @@ -0,0 +1 @@ +adafruit_requests==2.0.5 diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 393f729..034e3d0 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -24,8 +24,12 @@ fi echo "Found device at $device_path" echo 'Copying application code...' -rsync --verbose --recursive --delete --checksum \ +rsync --verbose --recursive --delete --checksum --times --modify-window=1 \ --include '/._*' --exclude '/.*' \ - --exclude '/boot_out.txt' --exclude '/settings.toml' \ + --exclude '/boot_out.txt' --exclude '/settings.toml' --exclude '/lib' \ "$project_directory/src/" "$device_path" echo 'Finished copying application code' + +echo 'Installing libraries with circup' +circup install --requirement circup_requirements.txt +echo 'Finished installing libraries with circup' diff --git a/src/code.py b/src/code.py index 47f3341..dc035ae 100644 --- a/src/code.py +++ b/src/code.py @@ -7,7 +7,17 @@ import supervisor import wifi -from adafruit_httpserver.server import HTTPServer +from adafruit_httpserver.server import Server as HTTPServer +from adafruit_httpserver.response import Response + + +def index(request): + u = os.uname() + return Response( + request, + content_type="text/plain", + body=f"Hello from {u.machine} running CircuitPython {u.version}!\n", + ) def main() -> None: @@ -24,7 +34,8 @@ def main() -> None: host = str(wifi.radio.ipv4_address) pool = socketpool.SocketPool(wifi.radio) http_server = HTTPServer(pool) - http_server.start(host, port=80, root_path="public_html") + http_server.route("/")(index) + http_server.start(host, port=80) ssl_context = ssl.create_default_context() # The Pico is the server and does not require a certificate from the client, so disable @@ -35,7 +46,8 @@ def main() -> None: ) tls_pool = TLSServerSocketPool(pool, ssl_context) https_server = HTTPServer(tls_pool) - https_server.start(host, port=443, root_path="public_html") + https_server.route("/")(index) + https_server.start(host, port=443) print() print("The web server is listening on:") diff --git a/src/lib/adafruit_httpserver/__init__.mpy b/src/lib/adafruit_httpserver/__init__.mpy deleted file mode 100755 index 4a3525c..0000000 Binary files a/src/lib/adafruit_httpserver/__init__.mpy and /dev/null differ diff --git a/src/lib/adafruit_httpserver/headers.mpy b/src/lib/adafruit_httpserver/headers.mpy deleted file mode 100755 index 1e1681e..0000000 Binary files a/src/lib/adafruit_httpserver/headers.mpy and /dev/null differ diff --git a/src/lib/adafruit_httpserver/methods.mpy b/src/lib/adafruit_httpserver/methods.mpy deleted file mode 100755 index 2cde619..0000000 Binary files a/src/lib/adafruit_httpserver/methods.mpy and /dev/null differ diff --git a/src/lib/adafruit_httpserver/mime_type.mpy b/src/lib/adafruit_httpserver/mime_type.mpy deleted file mode 100755 index 4264449..0000000 Binary files a/src/lib/adafruit_httpserver/mime_type.mpy and /dev/null differ diff --git a/src/lib/adafruit_httpserver/request.mpy b/src/lib/adafruit_httpserver/request.mpy deleted file mode 100755 index 46ebd25..0000000 Binary files a/src/lib/adafruit_httpserver/request.mpy and /dev/null differ diff --git a/src/lib/adafruit_httpserver/response.mpy b/src/lib/adafruit_httpserver/response.mpy deleted file mode 100755 index 3e8ff22..0000000 Binary files a/src/lib/adafruit_httpserver/response.mpy and /dev/null differ diff --git a/src/lib/adafruit_httpserver/route.mpy b/src/lib/adafruit_httpserver/route.mpy deleted file mode 100755 index 9eb6da8..0000000 Binary files a/src/lib/adafruit_httpserver/route.mpy and /dev/null differ diff --git a/src/lib/adafruit_httpserver/server.mpy b/src/lib/adafruit_httpserver/server.mpy deleted file mode 100755 index a2c4883..0000000 Binary files a/src/lib/adafruit_httpserver/server.mpy and /dev/null differ diff --git a/src/lib/adafruit_httpserver/status.mpy b/src/lib/adafruit_httpserver/status.mpy deleted file mode 100755 index 0dc04dd..0000000 Binary files a/src/lib/adafruit_httpserver/status.mpy and /dev/null differ diff --git a/src/public_html/index.html b/src/public_html/index.html deleted file mode 100644 index 73fb978..0000000 --- a/src/public_html/index.html +++ /dev/null @@ -1,3 +0,0 @@ - -Hello world · Raspberry Pi Pico W -

Hello world from Raspberry Pi Pico W!