From b793907e4e3eab71eaf330356a8ba2eb10cb25d1 Mon Sep 17 00:00:00 2001 From: Per Lindgren <per.lindgren@ltu.se> Date: Fri, 26 Feb 2021 15:30:50 +0100 Subject: [PATCH] task definitions updated --- .vscode/launch.json | 24 +----------------------- .vscode/tasks.json | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index b122074..d78df7a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -78,28 +78,6 @@ }, "executable": "./target/thumbv7em-none-eabihf/release/examples/${fileBasenameNoExtension}", "cpu": "cortex-m4", - }, - { - "type": "cortex-debug", - "request": "launch", - "name": "Cortex Nightly", - "servertype": "openocd", - "cwd": "${workspaceRoot}", - "preLaunchTask": "cargo build --example --release --nightly", - "runToMain": true, - "svdFile": "${workspaceRoot}/.vscode/STM32F401.svd", - "configFiles": [ - "interface/stlink-v2-1.cfg", - "target/stm32f4x.cfg" - ], - "preRestartCommands": [ - "load", - ], - "postLaunchCommands": [ - "monitor arm semihosting enable" - ], - "executable": "./target/thumbv7em-none-eabihf/release/examples/${fileBasenameNoExtension}", - "cpu": "cortex-m4", - }, + } ] } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 774d4cf..00cee24 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,31 +4,31 @@ "version": "2.0.0", "tasks": [ { - "type": "cargo", - "command": "build --example ${fileBasenameNoExtension}", - "problemMatcher": [ - "$rustc" + "label": "cargo build --example", + "command": "cargo", + "args": [ + "build", + "--example", + "${fileBasenameNoExtension}" ], - "group": "build", - "label": "cargo build --example" - }, - { - "type": "cargo", - "command": "build --example ${fileBasenameNoExtension} --release", "problemMatcher": [ "$rustc" ], "group": "build", - "label": "cargo build --example --release" }, { - "type": "cargo", - "command": "build --example ${fileBasenameNoExtension} --release --features nightly", + "label": "cargo build --example --release", + "command": "cargo", + "args": [ + "build", + "--example", + "${fileBasenameNoExtension}", + "--release" + ], "problemMatcher": [ "$rustc" ], "group": "build", - "label": "cargo build --example --release --nightly" - } + }, ] } \ No newline at end of file -- GitLab