Skip to content

Commit 592e84f

Browse files
committed
Merge branch 'dev' into release-candidate
2 parents 50c9400 + 9a45f3c commit 592e84f

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ To see other available commands and options, run `ufbt -h`.
3131

3232
### Debugging
3333

34-
In order to debug your application, you need to be running the firmware distributed alongside with current SDK version. You can flash it to your Flipper using `ufbt flash` (over ST-Link), `ufbt flash_usb` (over USB) or `ufbt flash_blackmagic` (using Wi-Fi dev board running Blackmagic firmware).
34+
In order to debug your application, you need to be running the firmware distributed alongside with current SDK version. You can flash it to your Flipper using `ufbt flash` (using a supported SWD probe), `ufbt flash_usb` (over USB).
3535

36-
You can attach to running firmware using `ufbt debug` (for ST-Link) or `ufbt blackmagic` (for Wi-Fi dev board).
36+
For other flashing and debugging options, see `ufbt -h`.
3737

3838
### VSCode integration
3939

@@ -48,7 +48,8 @@ Application manifests are explained in the [FBT documentation](https://github.co
4848
### Other
4949

5050
* `ufbt cli` starts a CLI session with the device;
51-
* `ufbt lint`, `ufbt format` run clang-format on application's sources.
51+
* `ufbt lint`, `ufbt format` run clang-format on application's sources;
52+
* You can temporarily add toolchain binaries (compiler, linter, OpenOCD and others) to your PATH. See `ufbt --help` for more information.
5253

5354
## Managing the SDK
5455

ufbt/bootstrap.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,13 +794,16 @@ def _func(self, args) -> int:
794794
default_sdk_deployer = UfbtSdkDeployer(args.ufbt_home)
795795

796796
env_sdk_deployer.ufbt_state_dir.mkdir(parents=True, exist_ok=True)
797-
if not args.no_link_toolchain:
797+
if args.no_link_toolchain:
798+
log.info("Skipping toolchain directory linking")
799+
else:
798800
env_sdk_deployer.ufbt_state_dir.mkdir(parents=True, exist_ok=True)
799801
default_sdk_deployer.toolchain_dir.mkdir(parents=True, exist_ok=True)
800802
self._link_dir(
801803
str(env_sdk_deployer.toolchain_dir.absolute()),
802804
str(default_sdk_deployer.toolchain_dir.absolute()),
803805
)
806+
log.info("To use a local copy, specify --no-link-toolchain")
804807

805808
env_vars = {
806809
"UFBT_HOME": args.state_dir,
@@ -811,6 +814,7 @@ def _func(self, args) -> int:
811814
for key, value in env_vars.items():
812815
f.write(f"{key}={value}\n")
813816

817+
log.info(f"Created {ENV_FILE_NAME} file in {os.getcwd()}")
814818
return 0
815819

816820

0 commit comments

Comments
 (0)