Skip to content

Commit 190b511

Browse files
radurentearadurentea
committed
Revert "Replace config variables with env variables"
This reverts commit 1cee854.
1 parent 94dda21 commit 190b511

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎testFiles/gcov/.vscode/c_cpp_properties.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
"cStandard": "c11",
77
"cppStandard": "c++17",
88
"includePath": [
9-
"${env:idf.espIdfPath}/components/**",
10-
"${env:idf.espIdfPathWin}/components/**",
11-
"${env:idf.espAdfPath}/components/**",
12-
"${env:idf.espAdfPathWin}/components/**",
9+
"${config:idf.espIdfPath}/components/**",
10+
"${config:idf.espIdfPathWin}/components/**",
11+
"${config:idf.espAdfPath}/components/**",
12+
"${config:idf.espAdfPathWin}/components/**",
1313
"${workspaceFolder}/**"
1414
],
1515
"browse": {
1616
"path": [
17-
"${env:idf.espIdfPath}/components",
18-
"${env:idf.espIdfPathWin}/components",
19-
"${env:idf.espAdfPath}/components/**",
20-
"${env:idf.espAdfPathWin}/components/**",
17+
"${config:idf.espIdfPath}/components",
18+
"${config:idf.espIdfPathWin}/components",
19+
"${config:idf.espAdfPath}/components/**",
20+
"${config:idf.espAdfPathWin}/components/**",
2121
"${workspaceFolder}"
2222
],
2323
"limitSymbolsToIncludedHeaders": false

‎testFiles/gcov/.vscode/tasks.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
{
55
"label": "Build - Build project",
66
"type": "shell",
7-
"command": "${env:idf.pythonBinPath} ${env:idf.espIdfPath}/tools/idf.py build",
7+
"command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py build",
88
"windows": {
9-
"command": "${env:idf.pythonBinPathWin} ${env:idf.espIdfPathWin}\\tools\\idf.py build",
9+
"command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py build",
1010
"options": {
1111
"env": {
12-
"PATH": "${env:PATH};${env:idf.customExtraPaths}"
12+
"PATH": "${env:PATH};${config:idf.customExtraPaths}"
1313
}
1414
}
1515
},
1616
"options": {
1717
"env": {
18-
"PATH": "${env:PATH}:${env:idf.customExtraPaths}"
18+
"PATH": "${env:PATH}:${config:idf.customExtraPaths}"
1919
}
2020
},
2121
"problemMatcher": [
@@ -72,18 +72,18 @@
7272
{
7373
"label": "Clean - Clean the project",
7474
"type": "shell",
75-
"command": "${env:idf.pythonBinPath} ${env:idf.espIdfPath}/tools/idf.py fullclean",
75+
"command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py fullclean",
7676
"windows": {
77-
"command": "${env:idf.pythonBinPathWin} ${env:idf.espIdfPathWin}\\tools\\idf.py fullclean",
77+
"command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py fullclean",
7878
"options": {
7979
"env": {
80-
"PATH": "${env:PATH};${env:idf.customExtraPaths}"
80+
"PATH": "${env:PATH};${config:idf.customExtraPaths}"
8181
}
8282
}
8383
},
8484
"options": {
8585
"env": {
86-
"PATH": "${env:PATH}:${env:idf.customExtraPaths}"
86+
"PATH": "${env:PATH}:${config:idf.customExtraPaths}"
8787
}
8888
},
8989
"problemMatcher": [
@@ -119,18 +119,18 @@
119119
{
120120
"label": "Flash - Flash the device",
121121
"type": "shell",
122-
"command": "${env:idf.pythonBinPath} ${env:idf.espIdfPath}/tools/idf.py -p ${env:idf.port} -b ${env:idf.flashBaudRate} flash",
122+
"command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py -p ${config:idf.port} -b ${config:idf.flashBaudRate} flash",
123123
"windows": {
124-
"command": "${env:idf.pythonBinPathWin} ${env:idf.espIdfPathWin}\\tools\\idf.py flash -p ${env:idf.portWin} -b ${env:idf.flashBaudRate}",
124+
"command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py flash -p ${config:idf.portWin} -b ${config:idf.flashBaudRate}",
125125
"options": {
126126
"env": {
127-
"PATH": "${env:PATH};${env:idf.customExtraPaths}"
127+
"PATH": "${env:PATH};${config:idf.customExtraPaths}"
128128
}
129129
}
130130
},
131131
"options": {
132132
"env": {
133-
"PATH": "${env:PATH}:${env:idf.customExtraPaths}"
133+
"PATH": "${env:PATH}:${config:idf.customExtraPaths}"
134134
}
135135
},
136136
"problemMatcher": [
@@ -166,18 +166,18 @@
166166
{
167167
"label": "Monitor: Start the monitor",
168168
"type": "shell",
169-
"command": "${env:idf.pythonBinPath} ${env:idf.espIdfPath}/tools/idf.py -p ${env:idf.port} monitor",
169+
"command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py -p ${config:idf.port} monitor",
170170
"windows": {
171-
"command": "${env:idf.pythonBinPathWin} ${env:idf.espIdfPathWin}\\tools\\idf.py -p ${env:idf.portWin} monitor",
171+
"command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py -p ${config:idf.portWin} monitor",
172172
"options": {
173173
"env": {
174-
"PATH": "${env:PATH};${env:idf.customExtraPaths}"
174+
"PATH": "${env:PATH};${config:idf.customExtraPaths}"
175175
}
176176
}
177177
},
178178
"options": {
179179
"env": {
180-
"PATH": "${env:PATH}:${env:idf.customExtraPaths}"
180+
"PATH": "${env:PATH}:${config:idf.customExtraPaths}"
181181
}
182182
},
183183
"problemMatcher": [
@@ -225,13 +225,13 @@
225225
"command": "openocd.exe -s ${command:espIdf.getOpenOcdScriptValue} ${command:espIdf.getOpenOcdConfigs}",
226226
"options": {
227227
"env": {
228-
"PATH": "${env:PATH};${env:idf.customExtraPaths}"
228+
"PATH": "${env:PATH};${config:idf.customExtraPaths}"
229229
}
230230
}
231231
},
232232
"options": {
233233
"env": {
234-
"PATH": "${env:PATH}:${env:idf.customExtraPaths}"
234+
"PATH": "${env:PATH}:${config:idf.customExtraPaths}"
235235
}
236236
},
237237
"problemMatcher": {
@@ -250,11 +250,11 @@
250250
{
251251
"label": "adapter",
252252
"type": "shell",
253-
"command": "${env:idf.pythonBinPath}",
253+
"command": "${config:idf.pythonBinPath}",
254254
"isBackground": true,
255255
"options": {
256256
"env": {
257-
"PATH": "${env:PATH}:${env:idf.customExtraPaths}",
257+
"PATH": "${env:PATH}:${config:idf.customExtraPaths}",
258258
"PYTHONPATH": "${command:espIdf.getExtensionPath}/esp_debug_adapter/debug_adapter"
259259
}
260260
},
@@ -282,15 +282,15 @@
282282
"-ip",
283283
"localhost",
284284
"-dn",
285-
"${env:idf.adapterTargetName}",
285+
"${config:idf.adapterTargetName}",
286286
"-om",
287287
"connect_to_instance"
288288
],
289289
"windows": {
290-
"command": "${env:idf.pythonBinPathWin}",
290+
"command": "${config:idf.pythonBinPathWin}",
291291
"options": {
292292
"env": {
293-
"PATH": "${env:PATH};${env:idf.customExtraPaths}",
293+
"PATH": "${env:PATH};${config:idf.customExtraPaths}",
294294
"PYTHONPATH": "${command:espIdf.getExtensionPath}/esp_debug_adapter/debug_adapter"
295295
}
296296
}

0 commit comments

Comments
 (0)