Use lib_deps instead of git submodules

Author: IngmarStein

.github/workflows/main.yaml

@@ -14,8 +14,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
       - uses: actions/cache@v4
         with:

.github/workflows/pull-request.yaml

@@ -11,8 +11,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
       - uses: actions/cache@v4
         with:

.gitmodules

@@ -23,8 +23,6 @@ To get started, you will need to download [PlatformIO Core][2] on your computer.
 Additionally, this firmware is designed to work with https://github.com/tronbyt/server or
 you can point this firmware at any URL that hosts a WebP image that is optimized for the Tidbyt display.
 
-Begin with checking out the git submodules: `git submodule update --init`.
-
 To flash the custom firmware on your device, run the following after replacing
 the variables in secrets.json.example with your desired own information and renaming it to `secrets.json`
 If using tidbyt_manager in docker replace the ip address to the docker host's ip address.

README.md

@@ -1,30 +1,43 @@
 #!/usr/bin/env python3
 
-import os,json
+import os
+import json
 
 Import("env")
 
+
 def main() -> None:
+    # copy libwebp's library.json to the lib directory
+    env.Execute(Copy("$PROJECT_LIBDEPS_DIR/$PIOENV/libwebp/library.json", "$PROJECT_DIR/lib/webp/library.json"))
+
     # if secrets.h file exists
     if os.path.exists("secrets.json"):
         # read secrets.h file
         with open("secrets.json", "r") as f:
             json_config = json.load(f)
 
-            tidbyt_wifi_ssid = json_config.get("TIDBYT_WIFI_SSID","")
-            tidbyt_wifi_password= json_config.get("TIDBYT_WIFI_PASSWORD","")
+            tidbyt_wifi_ssid = json_config.get("TIDBYT_WIFI_SSID", "")
+            tidbyt_wifi_password = json_config.get("TIDBYT_WIFI_PASSWORD", "")
             tidbyt_remote_url = json_config.get("TIDBYT_REMOTE_URL", "")
-            tidbyt_refresh_interval_seconds = json_config.get("TIDBYT_REFRESH_INTERVAL_SECONDS",10)
-            tidbyt_default_brightness = json_config.get("TIDBYT_DEFAULT_BRIGHTNESS",10)
+            tidbyt_refresh_interval_seconds = json_config.get(
+                "TIDBYT_REFRESH_INTERVAL_SECONDS", 10
+            )
+            tidbyt_default_brightness = json_config.get("TIDBYT_DEFAULT_BRIGHTNESS", 10)
 
-    else: # use environment variables
-        print("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\nWARNING : edit secrets.json.example and save as secrets.json\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+    else:  # use environment variables
+        print(
+            "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\nWARNING : edit secrets.json.example and save as secrets.json\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+        )
         print("Using Xplaceholder values for direct firmware.bin modification.")
         tidbyt_wifi_ssid = "XplaceholderWIFISSID________________________________"
         tidbyt_wifi_password = "XplaceholderWIFIPASSWORD____________________________"
         tidbyt_remote_url = "XplaceholderREMOTEURL_________________________________________________________________________________________"
-        tidbyt_refresh_interval_seconds = 10 #int(os.environ.get("TIDBYT_REFRESH_INTERVAL_SECONDS"))
-        tidbyt_default_brightness = 30 # int(os.environ.get("TIDBYT_DEFAULT_BRIGHTNESS"))
+        tidbyt_refresh_interval_seconds = (
+            10  # int(os.environ.get("TIDBYT_REFRESH_INTERVAL_SECONDS"))
+        )
+        tidbyt_default_brightness = (
+            30  # int(os.environ.get("TIDBYT_DEFAULT_BRIGHTNESS"))
+        )
 
     env.Append(
         CCFLAGS=[
@@ -40,4 +53,5 @@ def main() -> None:
         ],
     )
 
+
 main()

extra_scripts/pre.py

@@ -1,8 +1,8 @@
-Import("env")
-
 import os.path
 import requests
 
+Import("env")
+
 PRODUCTION_VERSION = {
     "tidbyt": "v10/35833",
     "tidbyt-gen2": "v11/35369"

extra_scripts/reset.py

@@ -1,11 +1,16 @@
 {
     "name": "libwebp",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/webmproject/libwebp.git",
+        "branch": "main"
+    },
     "build": {
         "srcFilter": [
             "+<src/**/*.c>"
         ],
-        "includeDir": "libwebp/src",
-        "srcDir": "libwebp",
+        "includeDir": "./src",
+        "srcDir": ".",
         "flags": [
             "-I include"
         ]