Merge branch 'dev' into add_fast_selector

Next-Flip · Nov 13, 2024 · 16e7e5f · 16e7e5f
2 parents f28862a + c06c7c9
commit 16e7e5f
Show file tree

Hide file tree

Showing 252 changed files with 7,475 additions and 1,729 deletions.
diff --git a/.github/workflow_data/devbuild.py b/.github/workflow_data/devbuild.py
@@ -4,8 +4,9 @@
 import json
 import os
 
-artifact_tgz = f"{os.environ['INDEXER_URL']}/firmware/dev/{os.environ['ARTIFACT_TAG']}.tgz"
-artifact_sdk = f"{os.environ['INDEXER_URL']}/firmware/dev/{os.environ['ARTIFACT_TAG'].replace('update', 'sdk')}.zip"
+base_url = f"{os.environ['INDEXER_URL']}/builds/firmware/dev"
+artifact_tgz = f"{base_url}/{os.environ['ARTIFACT_TAG']}.tgz"
+artifact_sdk = f"{base_url}/{os.environ['ARTIFACT_TAG'].replace('update', 'sdk')}.zip"
 artifact_lab = f"https://lab.flipper.net/?url={artifact_tgz}&channel=dev-cfw&version={os.environ['VERSION_TAG']}"
 
 
@@ -41,28 +42,34 @@
                     "fields": [
                         {
                             "name": "Code Diff:",
-                            "value": "\n".join([
-                                f"[From last release ({release} to {after[:8]})]({compare}/{release}...{after})",
-                                f"[From last build ({before[:8]} to {after[:8]})]({compare}/{before}...{after})",
-                            ])
+                            "value": "\n".join(
+                                [
+                                    f"[From last release ({release} to {after[:8]})]({compare}/{release}...{after})",
+                                    f"[From last build ({before[:8]} to {after[:8]})]({compare}/{before}...{after})",
+                                ]
+                            ),
                         },
                         {
                             "name": "Changelog:",
-                            "value": "\n".join([
-                                f"[Since last release ({release})]({event['repository']['html_url']}/blob/{after}/CHANGELOG.md)",
-                            ])
+                            "value": "\n".join(
+                                [
+                                    f"[Since last release ({release})]({event['repository']['html_url']}/blob/{after}/CHANGELOG.md)",
+                                ]
+                            ),
                         },
                         {
                             "name": "Firmware Artifacts:",
-                            "value": "\n".join([
-                                f"- [🖥️ Install with Web Updater](https://momentum-fw.dev/update)",
-                                f"- [☁️ Open in Flipper Lab/App]({artifact_lab})",
-                                f"- [🐬 Download Firmware TGZ]({artifact_tgz})",
-                                f"- [🛠️ SDK (for development)]({artifact_sdk})",
-                            ])
-                        }
+                            "value": "\n".join(
+                                [
+                                    f"- [🖥️ Install with Web Updater](https://momentum-fw.dev/update)",
+                                    f"- [☁️ Open in Flipper Lab/App]({artifact_lab})",
+                                    f"- [🐬 Download Firmware TGZ]({artifact_tgz})",
+                                    f"- [🛠️ SDK (for development)]({artifact_sdk})",
+                                ]
+                            ),
+                        },
                     ],
-                    "timestamp": dt.datetime.utcnow().isoformat()
+                    "timestamp": dt.datetime.utcnow().isoformat(),
                 }
             ],
         },

diff --git a/.github/workflow_data/release.md b/.github/workflow_data/release.md
@@ -1,7 +1,7 @@
 ## ⬇️ Download
 >### [🖥️ Web Updater (chrome)](https://momentum-fw.dev/update) [recommended]
 
->### [☁️ Flipper Lab/App (chrome/mobile)](https://lab.flipper.net/?url=https://up.momentum-fw.dev/firmware/{VERSION_TAG}/flipper-z-f7-update-{VERSION_TAG}.tgz&channel=release-cfw&version={VERSION_TAG})
+>### [☁️ Flipper Lab/App (chrome/mobile)](https://lab.flipper.net/?url=https://up.momentum-fw.dev/builds/firmware/{VERSION_TAG}/flipper-z-f7-update-{VERSION_TAG}.tgz&channel=release-cfw&version={VERSION_TAG})
 
 >### [🐬 qFlipper Package (.tgz)](https://github.com/Next-Flip/Momentum-Firmware/releases/download/{VERSION_TAG}/flipper-z-f7-update-{VERSION_TAG}.tgz)
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -119,6 +119,31 @@ jobs:
           tar czpf "artifacts/flipper-z-any-scripts-${SUFFIX}.tgz" scripts
           cp build/core2_firmware.tgz "artifacts/flipper-z-any-core2_firmware-${SUFFIX}.tgz"
 
+      - name: "Calculate DFU sizes"
+        env:
+          INDEXER_URL: ${{ secrets.INDEXER_URL }}
+        if: ${{ env.INDEXER_URL != '' && github.event.pull_request && matrix.target == env.DEFAULT_TARGET }}
+        run: |
+          curl -L "${{ secrets.INDEXER_URL }}"/firmware/development/f7/full_dfu -o dev.dfu
+          dfu_size_new=$(du --apparent-size -B 1 artifacts/flipper-z-${TARGET}-full-*.dfu | cut -f1)
+          dfu_size_dev=$(du --apparent-size -B 1 dev.dfu | cut -f1)
+          dfu_size_diff=$((dfu_size_new - dfu_size_dev))
+          DFU_SIZE=$(echo $dfu_size_new | numfmt --to=iec-i --format=%.2fB | sed 's/.00B$/B/')
+          DFU_DIFF=$(echo $dfu_size_diff | numfmt --to=iec-i --format=%.2fB | sed 's/.00B$/B/' | sed -r 's/^([^-])/+\1/')
+          echo "DFU_SIZE=$DFU_SIZE" >> $GITHUB_ENV
+          echo "DFU_DIFF=$DFU_DIFF" >> $GITHUB_ENV
+
+          tar xzf build/core2_firmware.tgz
+          radio_addr=$(jq -r '.copro.radio.files[0].address' core2_firmware/Manifest.json)
+          flash_base=0x8000000
+          min_gap=$((2 * 4 * 1024))
+          flash_free_total=$((radio_addr - flash_base - dfu_size_new))
+          flash_free_usable=$((flash_free_total - min_gap))
+          FLASH_FREE=$(echo $flash_free_total | numfmt --to=iec-i --format=%.2fB | sed 's/.00B$/B/')
+          FLASH_USABLE=$(echo $flash_free_usable | numfmt --to=iec-i --format=%.2fB | sed 's/.00B$/B/')
+          echo "FLASH_FREE=$FLASH_FREE" >> $GITHUB_ENV
+          echo "FLASH_USABLE=$FLASH_USABLE" >> $GITHUB_ENV
+
       - name: "Upload artifacts to update server"
         env:
           INDEXER_URL: ${{ secrets.INDEXER_URL }}
@@ -153,8 +178,10 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             **Compiled ${{ matrix.target }} firmware for commit `${{steps.names.outputs.commit_sha}}`:**
-            - [☁️ Flipper Lab/App](https://lab.flipper.net/?url=${{secrets.INDEXER_URL}}/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz&channel=mntm-${{steps.names.outputs.branch_name}}&version=${{steps.names.outputs.commit_sha}})
-            - [📦 qFlipper Package](${{secrets.INDEXER_URL}}/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz)
+            - [☁️ Flipper Lab/App](https://lab.flipper.net/?url=${{secrets.INDEXER_URL}}/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz&channel=mntm-${{steps.names.outputs.branch_name}}&version=${{steps.names.outputs.commit_sha}})
+            - [📦 qFlipper Package](${{secrets.INDEXER_URL}}/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz)
+            - DFU Size: `${{ env.DFU_SIZE }}` (`${{ env.DFU_DIFF }}` from dev)
+            - Free Flash: `${{ env.FLASH_FREE }}` (`${{ env.FLASH_USABLE }}` usable)
           edit-mode: replace
 
       - name: Send devbuild webhook

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,9 +25,9 @@ jobs:
       - name: "Download release assets from tag build"
         run: |
           set -e
-          wget "${{ secrets.INDEXER_URL }}"/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-update-${{ github.event.release.tag_name }}.tgz
-          wget "${{ secrets.INDEXER_URL }}"/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-update-${{ github.event.release.tag_name }}.zip
-          wget "${{ secrets.INDEXER_URL }}"/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-sdk-${{ github.event.release.tag_name }}.zip
+          wget "${{ secrets.INDEXER_URL }}"/builds/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-update-${{ github.event.release.tag_name }}.tgz
+          wget "${{ secrets.INDEXER_URL }}"/builds/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-update-${{ github.event.release.tag_name }}.zip
+          wget "${{ secrets.INDEXER_URL }}"/builds/firmware/${{ github.event.release.tag_name }}/flipper-z-f7-sdk-${{ github.event.release.tag_name }}.zip
 
       - name: "Update release with assets and notes"
         uses: "softprops/action-gh-release@v1"

diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,6 @@ PVS-Studio.log
 .gdbinit
 
 /fbt_options_local.py
+
+# JS packages
+node_modules/