Skip to content

Commit 22be262

Browse files
committed
Merge branch 'ofw_dev' into dev [ci skip]
2 parents a2739ab + 7fc4ba7 commit 22be262

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

.vscode/example/cpptools/c_cpp_properties.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,24 @@
55
"compilerPath": "${workspaceFolder}/toolchain/x86_64-windows/bin/arm-none-eabi-gcc.exe",
66
"intelliSenseMode": "gcc-arm",
77
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
8-
"configurationProvider": "ms-vscode.cpptools",
9-
"cStandard": "gnu17",
10-
"cppStandard": "c++17"
8+
"cStandard": "gnu23",
9+
"cppStandard": "c++20"
1110
},
1211
{
1312
"name": "Linux",
1413
"compilerPath": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gcc",
1514
"intelliSenseMode": "gcc-arm",
1615
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
17-
"configurationProvider": "ms-vscode.cpptools",
18-
"cStandard": "gnu17",
19-
"cppStandard": "c++17"
16+
"cStandard": "gnu23",
17+
"cppStandard": "c++20"
2018
},
2119
{
2220
"name": "Mac",
2321
"compilerPath": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gcc",
2422
"intelliSenseMode": "gcc-arm",
2523
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
26-
"configurationProvider": "ms-vscode.cpptools",
27-
"cStandard": "gnu17",
28-
"cppStandard": "c++17"
24+
"cStandard": "gnu23",
25+
"cppStandard": "c++20"
2926
}
3027
],
3128
"version": 4

.vscode/example/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"C_Cpp.default.cStandard": "gnu17",
3-
"C_Cpp.default.cppStandard": "c++17",
2+
"C_Cpp.default.cStandard": "gnu23",
3+
"C_Cpp.default.cppStandard": "c++20",
44
"python.formatting.provider": "black",
55
"workbench.tree.indent": 12,
66
"cortex-debug.enableTelemetry": false,

scripts/ufbt/project_template/.vscode/c_cpp_properties.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
"compilerPath": "@UFBT_TOOLCHAIN_GCC@",
66
"intelliSenseMode": "gcc-arm",
77
"compileCommands": "${workspaceFolder}/.vscode/compile_commands.json",
8-
"configurationProvider": "ms-vscode.cpptools",
9-
"cStandard": "gnu17",
10-
"cppStandard": "c++17"
8+
"cStandard": "gnu23",
9+
"cppStandard": "c++20"
1110
}
1211
],
1312
"version": 4

0 commit comments

Comments
 (0)