mirrors/unleashed-firmware
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2025-12-12 20:49:49 +04:00
Code Issues Activity

ufbt: fixes for generated vscode project (#3547)

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
hedger
2024-03-29 05:47:43 +04:00
committed by GitHub
parent 74cda02368
commit 538422e2a9
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/example/settings.json vendored
View File

@@ -14,7 +14,7 @@
"*.scons": "python", "*.scons": "python",
"SConscript": "python", "SConscript": "python",
"SConstruct": "python", "SConstruct": "python",
"*.fam": "python", "*.fam": "python"
}, },
"clangd.arguments": [ "clangd.arguments": [
// We might be able to tighten this a bit more to only include the correct toolchain. // We might be able to tighten this a bit more to only include the correct toolchain.

4
scripts/ufbt/SConstruct
View File

@@ -393,7 +393,9 @@ for template_file in project_template_dir.Dir(".vscode").glob("*"):
), ),
"@UFBT_APP_DIR@": PosixPathWrapper.fix_path(original_app_dir.abspath), "@UFBT_APP_DIR@": PosixPathWrapper.fix_path(original_app_dir.abspath),
"@UFBT_ROOT_DIR@": PosixPathWrapper.fix_path(Dir("#").abspath), "@UFBT_ROOT_DIR@": PosixPathWrapper.fix_path(Dir("#").abspath),
"@UFBT_DEBUG_DIR@": dist_env.subst("FBT_DEBUG_DIR"), "@UFBT_DEBUG_DIR@": PosixPathWrapper.fix_path(
dist_env.subst("$FBT_DEBUG_DIR")
),
"@UFBT_DEBUG_ELF_DIR@": PosixPathWrapper.fix_path( "@UFBT_DEBUG_ELF_DIR@": PosixPathWrapper.fix_path(
dist_env["FBT_FAP_DEBUG_ELF_ROOT"].abspath dist_env["FBT_FAP_DEBUG_ELF_ROOT"].abspath
), ),

22
scripts/ufbt/project_template/.vscode/tasks.json vendored
View File

@@ -31,29 +31,23 @@
"command": "ufbt -c" "command": "ufbt -c"
}, },
{ {
"label": "Flash FW (ST-Link)", "label": "Flash FW (SWD)",
"group": "build", "group": "build",
"type": "shell", "type": "shell",
"command": "ufbt FORCE=1 flash" "command": "ufbt FORCE=1 flash"
}, },
{
"label": "Flash FW (blackmagic)",
"group": "build",
"type": "shell",
"command": "ufbt flash_blackmagic"
},
{
"label": "Flash FW (JLink)",
"group": "build",
"type": "shell",
"command": "ufbt FORCE=1 jflash"
},
{ {
"label": "Flash FW (USB, with resources)", "label": "Flash FW (USB, with resources)",
"group": "build", "group": "build",
"type": "shell", "type": "shell",
"command": "ufbt FORCE=1 flash_usb" "command": "ufbt FORCE=1 flash_usb"
}, },
{
"label": "Open Flipper CLI session",
"group": "build",
"type": "shell",
"command": "ufbt cli"
},
{ {
"label": "Update uFBT SDK", "label": "Update uFBT SDK",
"group": "build", "group": "build",
@@ -61,7 +55,7 @@
"command": "ufbt update" "command": "ufbt update"
}, },
{ {
"label": "Update VSCode config for current SDK", "label": "Update VSCode config",
"group": "build", "group": "build",
"type": "shell", "type": "shell",
"command": "ufbt vscode_dist" "command": "ufbt vscode_dist"