Skip to content

Commit

Permalink
fbt, docs: typo fixes; vscode: fixed deprecated target names (flipper…
Browse files Browse the repository at this point in the history
…devices#1926)

Co-authored-by: あく <[email protected]>
  • Loading branch information
hedger and skotopes authored Oct 26, 2022
1 parent 5c8df66 commit a8edb41
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .vscode/example/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion documentation/fbt.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion firmware.scons
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit a8edb41

Please sign in to comment.