Jelajahi Sumber

fbt, docs: typo fixes; vscode: fixed deprecated target names (#1926)

Co-authored-by: あく <alleteam@gmail.com>
hedger 3 tahun lalu
induk
melakukan
a8edb41eae
3 mengubah file dengan 5 tambahan dan 4 penghapusan
  1. 2 2
      .vscode/example/tasks.json
  2. 1 1
      documentation/fbt.md
  3. 2 1
      firmware.scons

+ 2 - 2
.vscode/example/tasks.json

@@ -109,13 +109,13 @@
             "label": "[Debug] Build FAPs",
             "group": "build",
             "type": "shell",
-            "command": "./fbt plugin_dist"
+            "command": "./fbt fap_dist"
         },
         {
             "label": "[Release] Build FAPs",
             "group": "build",
             "type": "shell",
-            "command": "./fbt COMPACT=1 DEBUG=0 plugin_dist"
+            "command": "./fbt COMPACT=1 DEBUG=0 fap_dist"
         },
         {
             "label": "[Debug] Launch App on Flipper",

+ 1 - 1
documentation/fbt.md

@@ -54,7 +54,7 @@ To run cleanup (think of `make clean`) for specified targets, add `-c` option.
 - `blackmagic` - debug firmware with Blackmagic probe (WiFi dev board)
 - `openocd` - just start OpenOCD
 - `get_blackmagic` - output blackmagic address in gdb remote format. Useful for IDE integration
-- `get_stlink` - output serial numbers for attached STLink probes. Ued for `OPENOCD_ADAPTER_SERIAL=...`.
+- `get_stlink` - output serial numbers for attached STLink probes. Used for specifying an adapter with `OPENOCD_ADAPTER_SERIAL=...`.
 - `lint`, `format` - run clang-format on C source code to check and reformat it according to `.clang-format` specs
 - `lint_py`, `format_py` - run [black](https://black.readthedocs.io/en/stable/index.html) on Python source code, build system files & application manifests 
 - `cli` - start Flipper CLI session over USB

+ 2 - 1
firmware.scons

@@ -292,9 +292,10 @@ Alias(fwenv["FIRMWARE_BUILD_CFG"] + "_all", fw_artifacts)
 if fwenv["IS_BASE_FIRMWARE"]:
     sdk_source = fwenv.SDKPrebuilder(
         "sdk_origin",
+        # Deps on root SDK headers and generated files
         (fwenv["SDK_HEADERS"], fwenv["FW_ASSETS_HEADERS"]),
     )
-    # Extra deps for root headers and generated files
+    # Extra deps on headers included in deeper levels
     Depends(sdk_source, fwenv.ProcessSdkDepends("sdk_origin.d"))
 
     fwenv["SDK_DIR"] = fwenv.Dir("sdk")