Merge branch 'dev' into release-candidate

README.md

@@ -31,9 +31,9 @@ To see other available commands and options, run `ufbt -h`.
 
 ### Debugging
 
-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).
+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). 
 
-You can attach to running firmware using `ufbt debug` (for ST-Link) or `ufbt blackmagic` (for Wi-Fi dev board).
+For other flashing and debugging options, see `ufbt -h`.
 
 ### VSCode integration
 
@@ -48,7 +48,8 @@ Application manifests are explained in the [FBT documentation](https://github.co
 ### Other
 
  * `ufbt cli` starts a CLI session with the device;
- * `ufbt lint`, `ufbt format` run clang-format on application's sources.
+ * `ufbt lint`, `ufbt format` run clang-format on application's sources;
+ * You can temporarily add toolchain binaries (compiler, linter, OpenOCD and others) to your PATH. See `ufbt --help` for more information.
 
 ## Managing the SDK
 

ufbt/bootstrap.py

@@ -794,13 +794,16 @@ def _func(self, args) -> int:
         default_sdk_deployer = UfbtSdkDeployer(args.ufbt_home)
 
         env_sdk_deployer.ufbt_state_dir.mkdir(parents=True, exist_ok=True)
-        if not args.no_link_toolchain:
+        if args.no_link_toolchain:
+            log.info("Skipping toolchain directory linking")
+        else:
             env_sdk_deployer.ufbt_state_dir.mkdir(parents=True, exist_ok=True)
             default_sdk_deployer.toolchain_dir.mkdir(parents=True, exist_ok=True)
             self._link_dir(
                 str(env_sdk_deployer.toolchain_dir.absolute()),
                 str(default_sdk_deployer.toolchain_dir.absolute()),
             )
+            log.info("To use a local copy, specify --no-link-toolchain")
 
         env_vars = {
             "UFBT_HOME": args.state_dir,
@@ -811,6 +814,7 @@ def _func(self, args) -> int:
             for key, value in env_vars.items():
                 f.write(f"{key}={value}\n")
 
+        log.info(f"Created {ENV_FILE_NAME} file in {os.getcwd()}")
         return 0