liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
hedger 2022-10-26 19:18:06 +04:00 committed by GitHub
parent 5c8df66b7c
commit a8edb41eae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/example/tasks.json vendored
View File

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

2
documentation/fbt.md
View File

@ -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) - `blackmagic` - debug firmware with Blackmagic probe (WiFi dev board)
- `openocd` - just start OpenOCD - `openocd` - just start OpenOCD
- `get_blackmagic` - output blackmagic address in gdb remote format. Useful for IDE integration - `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`, `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 - `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 - `cli` - start Flipper CLI session over USB

3
firmware.scons
View File

@ -292,9 +292,10 @@ Alias(fwenv["FIRMWARE_BUILD_CFG"] + "_all", fw_artifacts)
if fwenv["IS_BASE_FIRMWARE"]: if fwenv["IS_BASE_FIRMWARE"]:
sdk_source = fwenv.SDKPrebuilder( sdk_source = fwenv.SDKPrebuilder(
"sdk_origin", "sdk_origin",
# Deps on root SDK headers and generated files
(fwenv["SDK_HEADERS"], fwenv["FW_ASSETS_HEADERS"]), (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")) Depends(sdk_source, fwenv.ProcessSdkDepends("sdk_origin.d"))
fwenv["SDK_DIR"] = fwenv.Dir("sdk") fwenv["SDK_DIR"] = fwenv.Dir("sdk")