V52 Release (#479)

.github/FUNDING.yml

@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: CynthiaLabs
+patreon: crazyco
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

.github/workflow_data/devbuild.py

@@ -12,6 +12,12 @@
         event = json.load(f)
 
     client = nextcloud_client.Client(os.environ["NC_HOST"])
+    _session = requests.session
+    def session(*args, **kwargs):
+        s = _session(*args, **kwargs)
+        s.headers["User-Agent"] = os.environ["NC_USERAGENT"]
+        return s
+    requests.session = session
     client.login(os.environ["NC_USER"], os.environ["NC_PASS"])
 
     for file in (

.github/workflow_data/webhook.py

@@ -36,56 +36,56 @@
             for i, commit in enumerate(event["commits"]):
                 msg = commit['message'].splitlines()[0].replace("`", "")
                 msg = msg[:50] + ("..." if len(msg) > 50 else "")
-                desc += f"\n[`{commit['id'][:7]}`]({commit['url']}): {msg} - [__{commit['author']['username']}__](https://github.com/{commit['author']['username']})"
+                desc += f"\n[`{commit['id'][:7]}`]({commit['url']}): {msg} - [__{commit['author'].get('username')}__](https://github.com/{commit['author'].get('username')})"
                 if len(desc) > 2020:
                     desc = desc.rsplit("\n", 1)[0] + f"\n+ {count - i} more commits"
                     break
             url = event["compare"]
             color = 16723712 if event["forced"] else 3669797
 
-        case "pull_request":
-            pr = event["pull_request"]
-            url = pr["html_url"]
-            branch = pr["base"]["ref"] + (
-                ""
-                if pr["base"]["repo"]["full_name"] != pr["head"]["repo"]["full_name"]
-                else f" <- {pr['head']['ref']}"
-            )
-            name = pr["title"][:50] + ("..." if len(pr["title"]) > 50 else "")
-            title = f"Pull Request {event['action'].title()} ({branch}): {name}"
-            match event["action"]:
-                case "opened":
-                    desc = (pr["body"][:2045] + "...") if len(pr["body"]) > 2048 else pr["body"]
-                    color = 3669797
+        # case "pull_request":
+        #     pr = event["pull_request"]
+        #     url = pr["html_url"]
+        #     branch = pr["base"]["ref"] + (
+        #         ""
+        #         if pr["base"]["repo"]["full_name"] != pr["head"]["repo"]["full_name"]
+        #         else f" <- {pr['head']['ref']}"
+        #     )
+        #     name = pr["title"][:50] + ("..." if len(pr["title"]) > 50 else "")
+        #     title = f"Pull Request {event['action'].title()} ({branch}): {name}"
+        #     match event["action"]:
+        #         case "opened":
+        #             desc = (pr["body"][:2045] + "...") if len(pr["body"]) > 2048 else pr["body"]
+        #             color = 3669797
 
-                    fields.append(
-                        {
-                            "name": "Changed Files:",
-                            "value": str(pr["changed_files"]),
-                            "inline": True,
-                        }
-                    )
-                    fields.append(
-                        {
-                            "name": "Added:",
-                            "value": "+" + str(pr["additions"]),
-                            "inline": True,
-                        }
-                    )
-                    fields.append(
-                        {
-                            "name": "Removed:",
-                            "value": "-" + str(pr["deletions"]),
-                            "inline": True,
-                        }
-                    )
+        #             fields.append(
+        #                 {
+        #                     "name": "Changed Files:",
+        #                     "value": str(pr["changed_files"]),
+        #                     "inline": True,
+        #                 }
+        #             )
+        #             fields.append(
+        #                 {
+        #                     "name": "Added:",
+        #                     "value": "+" + str(pr["additions"]),
+        #                     "inline": True,
+        #                 }
+        #             )
+        #             fields.append(
+        #                 {
+        #                     "name": "Removed:",
+        #                     "value": "-" + str(pr["deletions"]),
+        #                     "inline": True,
+        #                 }
+        #             )
 
-                case "closed":
-                    color = 16723712
-                case "reopened":
-                    color = 16751872
-                case _:
-                    sys.exit(1)
+        #         case "closed":
+        #             color = 16723712
+        #         case "reopened":
+        #             color = 16751872
+        #         case _:
+        #             sys.exit(1)
 
         case "release":
             match event["action"]:

.github/workflow_data/webupdater.py

@@ -1,9 +1,16 @@
 import nextcloud_client
+import requests
 import json
 import os
 
 if __name__ == "__main__":
     client = nextcloud_client.Client(os.environ["NC_HOST"])
+    _session = requests.session
+    def session(*args, **kwargs):
+        s = _session(*args, **kwargs)
+        s.headers["User-Agent"] = os.environ["NC_USERAGENT"]
+        return s
+    requests.session = session
     client.login(os.environ["NC_USER"], os.environ["NC_PASS"])
 
     file = os.environ["ARTIFACT_TGZ"]

.github/workflows/build.yml

@@ -16,14 +16,15 @@ concurrency:
 env:
   TARGETS: f7
   DEFAULT_TARGET: f7
+  FBT_GIT_SUBMODULE_SHALLOW: 1
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
 
       - name: 'Checkout code'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
@@ -57,6 +58,7 @@ jobs:
         if: "github.event_name == 'push' && github.ref_name == 'dev' && !contains(github.event.head_commit.message, '--nobuild')"
         env:
           NC_HOST: "https://cloud.cynthialabs.net/"
+          NC_USERAGENT: "${{ secrets.NC_USERAGENT }}"
           NC_USER: "${{ secrets.NC_USER }}"
           NC_PASS: "${{ secrets.NC_PASS }}"
           BUILD_WEBHOOK: ${{ secrets.BUILD_WEBHOOK }}

.github/workflows/hotfix.yml

@@ -59,6 +59,7 @@ jobs:
       - name: "Upload to webupdater"
         env:
           NC_HOST: "https://cloud.cynthialabs.net/"
+          NC_USERAGENT: "${{ secrets.NC_USERAGENT }}"
           NC_USER: "${{ secrets.NC_USER }}"
           NC_PASS: "${{ secrets.NC_PASS }}"
         run: |

.github/workflows/release.yml

@@ -55,6 +55,7 @@ jobs:
       - name: "Upload to webupdater"
         env:
           NC_HOST: "https://cloud.cynthialabs.net/"
+          NC_USERAGENT: "${{ secrets.NC_USERAGENT }}"
           NC_USER: "${{ secrets.NC_USER }}"
           NC_PASS: "${{ secrets.NC_PASS }}"
         run: |

.github/workflows/sonarcloud.yaml

@@ -2,8 +2,8 @@ name: 'SonarCloud'
 
 on:
   workflow_dispatch:
-  pull_request:
-    types: [opened, synchronize, reopened]
+  # pull_request:
+  #   types: [opened, synchronize, reopened]
 
 env:
   TARGETS: f7

.github/workflows/webhook.yml

@@ -2,11 +2,11 @@ name: 'Webhook'
 
 on:
   push:
-  pull_request:
-    types:
-      - "opened"
-      - "closed"
-      - "reopened"
+  # pull_request:
+  #   types:
+  #     - "opened"
+  #     - "closed"
+  #     - "reopened"
   release:
     types:
       - "published"

.gitignore

@@ -68,17 +68,3 @@ PVS-Studio.log
 .gdbinit
 
 /fbt_options_local.py
-
-# XFW-specific:
-
-# Automate files, etc
-automate.py
-deployments/
-commitnotes.md
-fbt_options.py
-
-# Asset packs
-assets/asset_packs/*
-!assets/asset_packs/WatchDogs/
-!assets/asset_packs/ReadMe.md
-assets/resources/asset_packs/

.gitmodules

@@ -1,3 +1,6 @@
+[submodule "applications/external"]
+	path = applications/external
+	url = https://github.com/Flipper-XFW/Xtreme-Apps.git
 [submodule "lib/mlib"]
 	path = lib/mlib
 	url = https://github.com/P-p-H-d/mlib.git
@@ -26,9 +29,6 @@
 [submodule "lib/cxxheaderparser"]
 	path = lib/cxxheaderparser
 	url = https://github.com/robotpy/cxxheaderparser.git
-[submodule "applications/external/dap_link/lib/free-dap"]
-	path = applications/external/dap_link/lib/free-dap
-	url = https://github.com/ataradov/free-dap.git
 [submodule "lib/heatshrink"]
 	path = lib/heatshrink
 	url = https://github.com/flipperdevices/heatshrink.git
@@ -41,6 +41,3 @@
 [submodule "lib/stm32wb_copro"]
 	path = lib/stm32wb_copro
 	url = https://github.com/flipperdevices/stm32wb_copro.git
-[submodule "applications/external/totp/lib/wolfssl"]
-	path = applications/external/totp/lib/wolfssl
-	url = https://github.com/wolfSSL/wolfssl.git

.pvsoptions

@@ -1 +1 @@
---ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/cmsis_core -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/ST25RFAL002 -e lib/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/xtreme -e lib/nanopb -e */arm-none-eabi/* -e applications/external/dap_link/lib/free-dap
+--ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/cmsis_core -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/microtar -e lib/mlib -e lib/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/*

ReadMe.md

@@ -219,9 +219,9 @@ $ ./fbt launch APPSRC=some_appid
 ## ❤️ Support
 If you like what you're seeing, **please consider donating to us**. We won't ever put this behind a paywall, but we'd still appreciate a few bucks!
 
-- **[Patreon](https://patreon.com/CynthiaLabs)**: ❤️ Account needed, subscription with perks across my entire org.
+- **[Patreon](https://patreon.com/crazyco)**: ❤️ Account needed, subscription with perks across my entire org.
 - **[Wire-transfer](https://bunq.me/ClaraK)**: No account needed, one-time
-- **[Paypal](https://paypal.me/RdX2020)**: Account needed, one-time
+- **[Paypal](https://paypal.me/ClaraCrazy)**: Account needed, one-time
 - **[ko-fi](https://ko-fi.com/cynthialabs)**: No account needed, one-time
 - **Monero**: `41kyWeeoVdK4quzQ4M9ikVGs6tCQCLfdx8jLExTNsAu2SF1QAyDqRdjfGM6EL8L9NpXwt89HJeAoGf1aoArk7nDr4AMMV4T`