Merge branch 'fz-dev' into dev

scripts/fbt_tools/fbt_apps.py

@@ -9,6 +9,7 @@ from SCons.Action import Action
 from SCons.Builder import Builder
 from SCons.Errors import StopError
 from SCons.Warnings import WarningOnByDefault, warn
+from SCons.Script import GetOption
 
 # Adding objects for application management to env
 #  AppManager env["APPMGR"] - loads all manifests; manages list of known apps
@@ -28,7 +29,8 @@ def LoadAppManifest(env, entry):
         env["APPMGR"].load_manifest(app_manifest_file_path, entry)
         env.Append(PY_LINT_SOURCES=[app_manifest_file_path])
     except FlipperManifestException as e:
-        warn(WarningOnByDefault, str(e))
+        if not GetOption("silent"):
+            warn(WarningOnByDefault, str(e))
 
 
 def PrepareApplicationsBuild(env):

scripts/fbt_tools/fbt_help.py

@@ -34,6 +34,9 @@ Other:
     firmware_pvs:
         generate a PVS-Studio report
 
+How to open a shell with toolchain environment and other build tools:
+    In your shell, type "source `./fbt -s env`". You can also use "." instead of "source".
+
 For more targets & info, see documentation/fbt.md
 """
 

scripts/flipper/storage.py

@@ -1,12 +1,13 @@
-import os
-import sys
-import serial
-import time
-import hashlib
-import math
-import logging
-import posixpath
 import enum
+import hashlib
+import logging
+import math
+import os
+import posixpath
+import sys
+import time
+
+import serial
 
 
 def timing(func):
@@ -236,6 +237,7 @@ class FlipperStorage:
             filesize = os.fstat(file.fileno()).st_size
 
             buffer_size = self.chunk_size
+            start_time = time.time()
             while True:
                 filedata = file.read(buffer_size)
                 size = len(filedata)
@@ -254,11 +256,13 @@ class FlipperStorage:
                 self.port.write(filedata)
                 self.read.until(self.CLI_PROMPT)
 
-                percent = str(math.ceil(file.tell() / filesize * 100))
+                ftell = file.tell()
+                percent = str(math.ceil(ftell / filesize * 100))
                 total_chunks = str(math.ceil(filesize / buffer_size))
-                current_chunk = str(math.ceil(file.tell() / buffer_size))
+                current_chunk = str(math.ceil(ftell / buffer_size))
+                approx_speed = ftell / (time.time() - start_time + 0.0001)
                 sys.stdout.write(
-                    f"\r{percent}%, chunk {current_chunk} of {total_chunks}"
+                    f"\r{percent}%, chunk {current_chunk} of {total_chunks} @ {approx_speed/1024:.2f} kb/s"
                 )
                 sys.stdout.flush()
         print()

scripts/selfupdate.py

@@ -15,7 +15,7 @@ class Main(App):
 
         self.parser.add_argument("manifest_path", help="Manifest path")
         self.parser.add_argument(
-            "--pkg_dir_name", help="Update dir name", default="pcbundle", required=False
+            "--pkg_dir_name", help="Update dir name", default=None, required=False
         )
         self.parser.set_defaults(func=self.install)
 

scripts/ufbt/SConstruct

@@ -380,8 +380,9 @@ dist_env.Alias("vscode_dist", vscode_dist)
 # Creating app from base template
 
 dist_env.SetDefault(FBT_APPID=appenv.subst("$APPID") or "template")
+app_template_dir = project_template_dir.Dir("app_template")
 app_template_dist = []
-for template_file in project_template_dir.Dir("app_template").glob("*"):
+for template_file in app_template_dir.glob("*"):
     dist_file_name = dist_env.subst(template_file.name)
     if template_file.name.endswith(".png"):
         app_template_dist.append(
@@ -397,12 +398,13 @@ for template_file in project_template_dir.Dir("app_template").glob("*"):
                 },
             )
         )
-
 AddPostAction(
     app_template_dist[-1],
     [
         Mkdir(original_app_dir.Dir("images")),
         Touch(original_app_dir.Dir("images").File(".gitkeep")),
+        # scons' glob ignores .dot directories, so we need to copy .github manually
+        Copy(original_app_dir.Dir(".github"), app_template_dir.Dir(".github")),
     ],
 )
 dist_env.Precious(app_template_dist)
@@ -440,3 +442,8 @@ else:
         raise UserError(f"Dolphin folder not found: {dolphin_src_dir}")
 
     dist_env.PhonyTarget("dolphin_ext", Action(missing_dolphin_folder, None))
+
+dist_env.PhonyTarget(
+    "env",
+    "@echo $( ${FBT_SCRIPT_DIR}/toolchain/fbtenv.sh $)",
+)

scripts/ufbt/project_template/.vscode/extensions.json

@@ -8,7 +8,8 @@
 		"amiralizadeh9480.cpp-helper",
 		"marus25.cortex-debug",
 		"zxh404.vscode-proto3",
-		"augustocdias.tasks-shell-input"
+		"augustocdias.tasks-shell-input",
+		"rioj7.command-variable"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [

scripts/ufbt/project_template/app_template/.github/workflows/build.yml

@@ -0,0 +1,41 @@
+name: "FAP: Build for multiple SDK sources"
+# This will build your app for dev and release channels on GitHub. 
+# It will also build your app every day to make sure it's up to date with the latest SDK changes.
+# See https://github.com/marketplace/actions/build-flipper-application-package-fap for more information
+
+on:
+  push:
+    ## put your main branch name under "braches"
+    #branches: 
+    #  - master 
+  pull_request:
+  schedule: 
+    # do a build every day
+    - cron: "1 1 * * *"
+
+jobs:
+  ufbt-build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - name: dev channel
+            sdk-channel: dev
+          - name: release channel
+            sdk-channel: release
+          # You can add unofficial channels here. See ufbt action docs for more info.
+    name: 'ufbt: Build for ${{ matrix.name }}'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build with ufbt
+        uses: flipperdevices/flipperzero-ufbt-action@v0.1.1
+        id: build-app
+        with:
+          sdk-channel: ${{ matrix.sdk-channel }}
+      - name: Upload app artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          # See ufbt action docs for other output variables
+          name: ${{ github.event.repository.name }}-${{ steps.build-app.outputs.suffix }}
+          path: ${{ steps.build-app.outputs.fap-artifacts }}

scripts/ufbt/site_tools/ufbt_help.py

@@ -40,6 +40,9 @@ How to create a new application:
     2. Run `ufbt vscode_dist create APPID=myapp`
     3. In VSCode, open the folder and start editing.
     4. Run `ufbt launch` to build and upload your application.
+
+How to open a shell with toolchain environment and other build tools:
+    In your shell, type "source `ufbt -s env`". You can also use "." instead of "source".
 """