FBT: Optimize icons blob -4KB DFU, scrub unused icons (#291)

* Unused icons to check later

* Exclude disabled icons from firmware

* Format

* Also report free flash in gh comment

* Fix free flash calc

* Fix?

* Fix??

* Split to next line

* Remove dead icons

* Some spring cleaning of icons cooker

* Improve unused icons script

* Disable icons that cant be used in asset packs

* These will need a workaround for external

* Revert "These will need a workaround for external"

This reverts commit fb23d97.

* Here's the workaround: split assets lib

now there is "assets" and "fwassets"

firmware links with fwassets and includes all icons
however not all of them are exposed to api

if an app needs a firmware icon not in api, it can use fap_libs=["assets"]
this will link against this dummy assets lib
it only contains the icons that arent exposed to api

this way, an app using assets lib will still benefit from asset packs
but at same time, we can remove pointless icons from dfu blob

* Update changelog

Author: WillyJL

.github/workflows/build.yml

@@ -128,11 +128,22 @@ jobs:
           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}B | sed -r 's/^([0-9]+)([0-9]{2})([0-9])B/\1.\2K/')
-          DFU_DIFF=$(echo ${dfu_size_diff}B | sed -r 's/^(-?[0-9]+)([0-9]{2})([0-9])B/\1.\2K/' | sed -r 's/^([^-])/+\1/')
+          DFU_SIZE=$(echo $dfu_size_new | numfmt --to=iec --format=%.2f)
+          DFU_DIFF=$(echo $dfu_size_diff | numfmt --to=iec --format=%.2f | 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 --format=%.2f)
+          FLASH_USABLE=$(echo $flash_free_usable | numfmt --to=iec --format=%.2f)
+          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 }}
@@ -170,6 +181,7 @@ jobs:
             - [☁️ 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

CHANGELOG.md

@@ -133,9 +133,6 @@
   - UL: W5500 Ethernet: Various fixes and improvements (by @xMasterX)
   - OFW: SPI Mem Manager: Fixed UI rendering bug related to line breaks (by @portasynthinca3)
   - OFW: USB/BT Remote: Mouse clicker option to click as fast as possible (by @sumukhj1219)
-- CLI:
-  - Print plugin name on load fail (by @Willy-JL)
-  - Move more commands as plugins on SD, refactor plugin wrapper (#276 by @Willy-JL)
 - NFC:
   - NDEF Parser:
     - Mifare Classic support (#265 by @luu176), protocol-agnostic rewrite and more improvements (#265 by @Willy-JL)
@@ -166,6 +163,10 @@
   - OFW: Add TCL 75S451 to TV universal remote (by @christhetech131)
   - OFW: Universal remote additions (by @jaylikesbunda)
   - OFW: Heavily Expand Universal Remotes (by @jaylikesbunda)
+- CLI:
+  - Print plugin name on load fail (by @Willy-JL)
+  - Move more commands as plugins on SD, refactor plugin wrapper (#276 by @Willy-JL)
+- FBT: Optimize icons blob, scrub unused icons (#291 by @Willy-JL)
 - OFW: BadKB: Improve ChromeOS and GNOME demo scripts (by @kowalski7cc)
 - OFW: GUI: Change dialog_ex text ownership model (by @skotopes)
 - OFW: CCID: App changes and improvements (by @kidbomb)

applications/main/nfc/application.fam

@@ -13,7 +13,7 @@ App(
         "!plugins",
         "!nfc_cli.c",
     ],
-    fap_libs=["mbedtls"],
+    fap_libs=["assets", "mbedtls"],
     fap_icon="icon.png",
     fap_category="NFC",
 )

applications/settings/about/application.fam

@@ -12,4 +12,5 @@ App(
     stack_size=1 * 1024,
     order=1000,
     fap_category="assets",
+    fap_libs=["assets"],
 )

applications/settings/power_settings_app/application.fam

@@ -12,4 +12,5 @@ App(
     stack_size=1 * 1024,
     order=40,
     fap_category="assets",
+    fap_libs=["assets"],
 )

applications/settings/storage_settings/application.fam

@@ -8,4 +8,5 @@ App(
     stack_size=2 * 1024,
     order=30,
     fap_category="assets",
+    fap_libs=["assets"],
 )

applications/system/js_app/application.fam

@@ -5,6 +5,7 @@ App(
     cdefines=["JS_RUNNER_FAP"],
     fap_icon="icon.png",
     fap_category="assets",
+    fap_libs=["assets"],
     entry_point="js_app",
     stack_size=2 * 1024,
     resources="examples",
@@ -35,6 +36,7 @@ App(
         "modules/js_flipper.c",
         "modules/js_tests.c",
     ],
+    fap_libs=["assets"],
 )
 
 App(

assets/SConscript

@@ -14,9 +14,26 @@ icons_path = (
     if assetsenv["IS_BASE_FIRMWARE"]
     else assetsenv["ASSETS_WORK_DIR"]
 )
-icons = assetsenv.CompileIcons(icons_path, assetsenv["ASSETS_SRC_DIR"].Dir("icons"))
+icons = assetsenv.CompileIcons(
+    icons_path,
+    assetsenv["ASSETS_SRC_DIR"].Dir("icons"),
+    fw_bundle=True,
+)
 assetsenv.Alias("icons", icons)
 
+# Extra icons lib so apps don't override asset packs to use fw icons not exposed to api
+# Not used anywhere in code, apps still reference assets_icons.h, but if one of the
+# icons they need is not exposed in api, they can link with fap_libs=["assets"] which
+# will use this lib purely for linking as a drop-in for missing symbols.
+# Should mean that apps made for OFW with fap_libs=["assets"], when compiled with
+# this FBT, will still use asset packs at runtime and only link non-exposed icons.
+if assetsenv["IS_BASE_FIRMWARE"]:
+    dropin_icons = assetsenv.CompileIcons(
+        assetsenv["ASSETS_WORK_DIR"],
+        assetsenv["ASSETS_SRC_DIR"].Dir("icons"),
+        icon_bundle_name="_assets_icons_dropin",
+    )
+
 
 # Protobuf .proto -> .c + .h
 proto_src = assetsenv.Glob("protobuf/*.proto", source=True)
@@ -59,9 +76,14 @@ assetsenv.Alias("proto_ver", proto_ver)
 assets_parts = (icons, proto, dolphin_blocking, dolphin_internal, proto_ver)
 env.Replace(FW_ASSETS_HEADERS=assets_parts)
 
-assetslib = assetsenv.Library("${FW_LIB_NAME}", assets_parts)
+assetslib = assetsenv.Library("fw${FW_LIB_NAME}", assets_parts)
 assetsenv.Install("${LIB_DIST_DIR}", assetslib)
 
+if assetsenv["IS_BASE_FIRMWARE"]:
+    dropin_parts = (dropin_icons, proto, dolphin_blocking, dolphin_internal, proto_ver)
+    dropin_assetslib = assetsenv.Library("${FW_LIB_NAME}", dropin_parts)
+    assetsenv.Install("${LIB_DIST_DIR}", dropin_assetslib)
+
 
 # Resources for SD card
 if assetsenv["IS_BASE_FIRMWARE"]: