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

Merge remote-tracking branch 'OFW/dev' into dev

Browse Source
This commit is contained in:
MX
2024-07-31 22:38:15 +03:00
parent b2305ce5c7 56fef61c66
commit e74e6cdd02
45 changed files with 492 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/toolchain/fbtenv.cmd
View File

@@ -13,7 +13,7 @@ if not ["%FBT_NOENV%"] == [""] (
exit /b 0
)
set "FLIPPER_TOOLCHAIN_VERSION=38"
set "FLIPPER_TOOLCHAIN_VERSION=39"
if ["%FBT_TOOLCHAIN_PATH%"] == [""] (
set "FBT_TOOLCHAIN_PATH=%FBT_ROOT%"

2
scripts/toolchain/fbtenv.sh
View File

@@ -4,7 +4,7 @@
# public variables
DEFAULT_SCRIPT_PATH="$(pwd -P)";
FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"38"}";
FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"39"}";
if [ -z ${FBT_TOOLCHAIN_PATH+x} ] ; then
FBT_TOOLCHAIN_PATH_WAS_SET=0;

2
scripts/ufbt/project_template/.vscode/settings.json vendored
View File

@@ -19,7 +19,7 @@
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
},
// "clangd.path": "@UFBT_TOOLCHAIN_CLANGD@",
"clangd.path": "@UFBT_TOOLCHAIN_CLANGD@",
"clangd.arguments": [
"--query-driver=**/arm-none-eabi-*",
"--compile-commands-dir=${workspaceFolder}/.vscode",