Skip to content

Commit 9b488cd

Browse files
RusticPotateoRusticPotateo
committed
Update include paths in c_cpp_properties.json
1 parent dd79b34 commit 9b488cd

File tree

5 files changed

+47
-49
lines changed

5 files changed

+47
-49
lines changed

‎.vscode/c_cpp_properties.json

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@
33
{
44
"name": "Linux",
55
"includePath": [
6-
"${workspaceRoot}/**",
7-
// "${env:PICO_SDK_PATH}/**",
8-
// "${env:PICO_EXTRAS_PATH}/**",
9-
// "${env:PICO_EXAMPLES_PATH}/**",
10-
// "${env:PICO_PLAYGROUND_PATH}/**",
11-
"${workspaceRoot}/pico-sdk/**",
12-
"${workspaceRoot}/pico-extras/**",
13-
"${workspaceRoot}/pico-playground/**",
14-
"${workspaceRoot}/pico-project-generator/**",
15-
"${workspaceRoot}/picoprobe/**",
16-
"${workspaceRoot}/picotool/**"
6+
"${workspaceFolder}/**",
7+
"${workspaceFolder}/pico-sdk/**",
8+
"${workspaceFolder}/pico-extras/**",
9+
"${workspaceFolder}/pico-playground/**",
10+
"${workspaceFolder}/pico-project-generator/**",
11+
"${workspaceFolder}/picoprobe/**",
12+
"${workspaceFolder}/picotool/**"
1713
],
1814
"defines": [],
1915
"compilerPath": "/usr/bin/arm-none-eabi-gcc",
@@ -25,13 +21,13 @@
2521
{
2622
"name": "M1",
2723
"includePath": [
28-
"${workspaceRoot}/**",
29-
"${workspaceRoot}/pico-sdk/**",
30-
"${workspaceRoot}/pico-extras/**",
31-
"${workspaceRoot}/pico-playground/**",
32-
"${workspaceRoot}/pico-project-generator/**",
33-
"${workspaceRoot}/picoprobe/**",
34-
"${workspaceRoot}/picotool/**"
24+
"${workspaceFolder}/**",
25+
"${workspaceFolder}/pico-sdk/**",
26+
"${workspaceFolder}/pico-extras/**",
27+
"${workspaceFolder}/pico-playground/**",
28+
"${workspaceFolder}/pico-project-generator/**",
29+
"${workspaceFolder}/picoprobe/**",
30+
"${workspaceFolder}/picotool/**"
3531
],
3632
"defines": [],
3733
"compilerPath": "/opt/homebrew/bin/arm-none-eabi-gcc",

‎app/.vscode/c_cpp_properties.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
// "${env:PICO_EXTRAS_PATH}/**",
99
// "${env:PICO_EXAMPLES_PATH}/**",
1010
// "${env:PICO_PLAYGROUND_PATH}/**",
11-
"${workspaceFolder}/pico-sdk/**",
12-
"${workspaceFolder}/pico-extras/**",
13-
"${workspaceFolder}/pico-playground/**",
14-
"${workspaceFolder}/pico-project-generator/**",
15-
"${workspaceFolder}/picoprobe/**",
16-
"${workspaceFolder}/picotool/**"
11+
"${workspaceFolder}/../pico-sdk/**",
12+
"${workspaceFolder}/../pico-extras/**",
13+
"${workspaceFolder}/../pico-playground/**",
14+
"${workspaceFolder}/../pico-project-generator/**",
15+
"${workspaceFolder}/../picoprobe/**",
16+
"${workspaceFolder}/../picotool/**"
1717
],
1818
"defines": [],
1919
"compilerPath": "/usr/bin/arm-none-eabi-gcc",

‎app/.vscode/settings.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2+
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
3+
"cmake.buildBeforeRun": true,
24
"cmake.configureOnOpen": false,
3-
// "cmake.buildBeforeRun": true,
4-
// "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
55
"cmake.environment": {
6-
"PATH": "${env:PATH}:${workspaceFolder}/picotool/build",
7-
"PICO_EXTRAS_PATH": "${workspaceFolder}/pico-extras",
8-
"PICO_SDK_PATH": "${workspaceFolder}/pico-sdk"
6+
"PATH": "${env:PATH}:${workspaceFolder}/../picotool/build",
7+
"PICO_EXTRAS_PATH": "${workspaceFolder}/../pico-extras",
8+
"PICO_SDK_PATH": "${workspaceFolder}/../pico-sdk"
99
},
1010
"cmake.options.advanced": {
1111
"build": {
@@ -34,18 +34,18 @@
3434
"python.languageServer": "Pylance",
3535
"python.linting.enabled": true,
3636
"terminal.integrated.env.linux": {
37-
"PATH": "${env:PATH}:${workspaceFolder}/picotool/build",
38-
"PICO_EXTRAS_PATH": "${workspaceFolder}/pico-extras",
39-
"PICO_SDK_PATH": "${workspaceFolder}/pico-sdk"
37+
"PATH": "${env:PATH}:${workspaceFolder}/../picotool/build",
38+
"PICO_EXTRAS_PATH": "${workspaceFolder}/../pico-extras",
39+
"PICO_SDK_PATH": "${workspaceFolder}/../pico-sdk"
4040
},
4141
"terminal.integrated.env.osx": {
42-
"PATH": "${env:PATH}:${workspaceFolder}/picotool/build",
43-
"PICO_EXTRAS_PATH": "${workspaceFolder}/pico-extras",
44-
"PICO_SDK_PATH": "${workspaceFolder}/pico-sdk"
42+
"PATH": "${env:PATH}:${workspaceFolder}/../picotool/build",
43+
"PICO_EXTRAS_PATH": "${workspaceFolder}/../pico-extras",
44+
"PICO_SDK_PATH": "${workspaceFolder}/../pico-sdk"
4545
},
4646
"terminal.integrated.env.windows": {
47-
"PATH": "${env:PATH}:${workspaceFolder}\\picotool\\build",
48-
"PICO_EXTRAS_PATH": "${workspaceFolder}\\pico-extras",
49-
"PICO_SDK_PATH": "${workspaceFolder}\\pico-sdk"
47+
"PATH": "${env:PATH}:${workspaceFolder}\\..\\picotool\\build",
48+
"PICO_EXTRAS_PATH": "${workspaceFolder}\\..\\pico-extras",
49+
"PICO_SDK_PATH": "${workspaceFolder}\\..\\pico-sdk"
5050
}
51-
}
51+
}

‎app/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 17)
77

88
# Initialise pico_sdk from installed location
99
# (note this can come from environment, CMake cache etc)
10-
set(PICO_SDK_PATH "${CMAKE_CURRENT_LIST_DIR}/pico-sdk")
10+
set(PICO_SDK_PATH "${PICO_SDK_PATH}" )
1111

1212
set(PICO_BOARD pico CACHE STRING "Board type")
1313

‎pico-project-generator-app.code-workspace

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,22 @@
2424
"statusBarVisibility": "hidden"
2525
}
2626
},
27+
"cmake.buildBeforeRun": true,
28+
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
2729
"terminal.integrated.env.linux": {
28-
"PICO_SDK_PATH": "${workspaceRoot}/pico-sdk",
29-
"PICO_EXTRAS_PATH": "${workspaceRoot}/pico-extras",
30-
"PATH": "${env:PATH}:${workspaceRoot}/picotool/build"
30+
"PICO_SDK_PATH": "${workspaceFolder}/pico-sdk",
31+
"PICO_EXTRAS_PATH": "${workspaceFolder}/pico-extras",
32+
"PATH": "${env:PATH}:${workspaceFolder}/picotool/build"
3133
},
3234
"terminal.integrated.env.windows": {
33-
"PICO_SDK_PATH": "${workspaceRoot}\\pico-sdk",
34-
"PICO_EXTRAS_PATH": "${workspaceRoot}\\pico-extras",
35-
"PATH": "${env:PATH}:${workspaceRoot}\\picotool\\build"
35+
"PICO_SDK_PATH": "${workspaceFolder}\\pico-sdk",
36+
"PICO_EXTRAS_PATH": "${workspaceFolder}\\pico-extras",
37+
"PATH": "${env:PATH}:${workspaceFolder}\\picotool\\build"
3638
},
3739
"terminal.integrated.env.osx": {
38-
"PICO_SDK_PATH": "${workspaceRoot}/pico-sdk",
39-
"PICO_EXTRAS_PATH": "${workspaceRoot}/pico-extras",
40-
"PATH": "${env:PATH}:${workspaceRoot}/picotool/build"
40+
"PICO_SDK_PATH": "${workspaceFolder}/pico-sdk",
41+
"PICO_EXTRAS_PATH": "${workspaceFolder}/pico-extras",
42+
"PATH": "${env:PATH}:${workspaceFolder}/picotool/build"
4143
},
4244
"cortex-debug.gdbPath": "arm-none-eabi-gdb",
4345
"python.languageServer": "Pylance"

0 commit comments

Comments
 (0)