aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.vscode/launch.json8
-rw-r--r--.vscode/tasks.json30
2 files changed, 25 insertions, 13 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json
index e580e37..ddfe500 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,9 +9,11 @@
"type": "cortex-debug",
"runToEntryPoint": "main",
"servertype": "stlink",
- "armToolchainPath": "C:/msys64/mingw64/bin",
- "stlinkPath": "C:/msys64/mingw64/bin/st-util.exe",
- "gdbPath": "C:/msys64/mingw64/bin/gdb-multiarch.exe"
+ "windows": {
+ "armToolchainPath": "C:/msys64/mingw64/bin",
+ "stlinkPath": "C:/msys64/mingw64/bin/st-util.exe",
+ "gdbPath": "C:/msys64/mingw64/bin/gdb-multiarch.exe"
+ },
}
]
} \ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index fcf4120..2bffcc7 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,11 +1,13 @@
{
"version": "2.0.0",
- "options": {
- "cwd": "${workspaceFolder}",
- "shell": {
- "executable": "C:/msys64/msys2_shell.cmd",
- "args": [ "-defterm", "-no-start", "-mingw64", "-shell", "sh", "-here", "-c" ],
- }
+ "windows": {
+ "options": {
+ "cwd": "${workspaceFolder}",
+ "shell": {
+ "executable": "C:/msys64/msys2_shell.cmd",
+ "args": [ "-defterm", "-no-start", "-mingw64", "-shell", "sh", "-here", "-c" ]
+ },
+ },
},
"tasks": [
{
@@ -26,8 +28,12 @@
"kind": "test"
},
"options": { "cwd": "${workspaceFolder}/stm32f091" },
- "command": "make flash",
- "args": [ "" ],
+ "windows": {
+ "command": "make flash",
+ "args": [ "" ],
+ },
+ "command": "make",
+ "args": [ "flash" ],
"type": "shell"
},
{
@@ -37,8 +43,12 @@
"kind": "test"
},
"options": { "cwd": "${workspaceFolder}/stm32f091" },
- "command": "make compile_commands",
- "args": [ "" ],
+ "windows": {
+ "command": "make compile_commands",
+ "args": [ "" ],
+ },
+ "command": "make",
+ "args": [ "compile_commands" ],
"type": "shell"
}
]