mirror of
https://github.com/DarkFlippers/unleashed-firmware.git
synced 2025-12-12 12:42:30 +04:00
Merge branch 'ofw_dev' into dev [ci skip]
This commit is contained in:
15
.vscode/example/cpptools/c_cpp_properties.json
vendored
15
.vscode/example/cpptools/c_cpp_properties.json
vendored
@@ -5,27 +5,24 @@
|
|||||||
"compilerPath": "${workspaceFolder}/toolchain/x86_64-windows/bin/arm-none-eabi-gcc.exe",
|
"compilerPath": "${workspaceFolder}/toolchain/x86_64-windows/bin/arm-none-eabi-gcc.exe",
|
||||||
"intelliSenseMode": "gcc-arm",
|
"intelliSenseMode": "gcc-arm",
|
||||||
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
|
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
|
||||||
"configurationProvider": "ms-vscode.cpptools",
|
"cStandard": "gnu23",
|
||||||
"cStandard": "gnu17",
|
"cppStandard": "c++20"
|
||||||
"cppStandard": "c++17"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Linux",
|
"name": "Linux",
|
||||||
"compilerPath": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gcc",
|
"compilerPath": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gcc",
|
||||||
"intelliSenseMode": "gcc-arm",
|
"intelliSenseMode": "gcc-arm",
|
||||||
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
|
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
|
||||||
"configurationProvider": "ms-vscode.cpptools",
|
"cStandard": "gnu23",
|
||||||
"cStandard": "gnu17",
|
"cppStandard": "c++20"
|
||||||
"cppStandard": "c++17"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Mac",
|
"name": "Mac",
|
||||||
"compilerPath": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gcc",
|
"compilerPath": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gcc",
|
||||||
"intelliSenseMode": "gcc-arm",
|
"intelliSenseMode": "gcc-arm",
|
||||||
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
|
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
|
||||||
"configurationProvider": "ms-vscode.cpptools",
|
"cStandard": "gnu23",
|
||||||
"cStandard": "gnu17",
|
"cppStandard": "c++20"
|
||||||
"cppStandard": "c++17"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"version": 4
|
"version": 4
|
||||||
|
|||||||
4
.vscode/example/settings.json
vendored
4
.vscode/example/settings.json
vendored
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"C_Cpp.default.cStandard": "gnu17",
|
"C_Cpp.default.cStandard": "gnu23",
|
||||||
"C_Cpp.default.cppStandard": "c++17",
|
"C_Cpp.default.cppStandard": "c++20",
|
||||||
"python.formatting.provider": "black",
|
"python.formatting.provider": "black",
|
||||||
"workbench.tree.indent": 12,
|
"workbench.tree.indent": 12,
|
||||||
"cortex-debug.enableTelemetry": false,
|
"cortex-debug.enableTelemetry": false,
|
||||||
|
|||||||
@@ -5,9 +5,8 @@
|
|||||||
"compilerPath": "@UFBT_TOOLCHAIN_GCC@",
|
"compilerPath": "@UFBT_TOOLCHAIN_GCC@",
|
||||||
"intelliSenseMode": "gcc-arm",
|
"intelliSenseMode": "gcc-arm",
|
||||||
"compileCommands": "${workspaceFolder}/.vscode/compile_commands.json",
|
"compileCommands": "${workspaceFolder}/.vscode/compile_commands.json",
|
||||||
"configurationProvider": "ms-vscode.cpptools",
|
"cStandard": "gnu23",
|
||||||
"cStandard": "gnu17",
|
"cppStandard": "c++20"
|
||||||
"cppStandard": "c++17"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"version": 4
|
"version": 4
|
||||||
|
|||||||
Reference in New Issue
Block a user