From 6717497144f76a9aaac3fab5db7b5297374badbc Mon Sep 17 00:00:00 2001
From: "henthe-5@student.ltu.se" <henthe-5@student.ltu.se>
Date: Thu, 28 Mar 2019 12:45:52 +0100
Subject: [PATCH] Added missing tasks and updated crate dependencies
---
.vscode/launch.json | 27 +++++++++++++++++++++++++++
.vscode/tasks.json | 12 ++++++++++++
Cargo.toml | 3 ++-
3 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7269243..0972c47 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -665,6 +665,33 @@
"svdFile": "STM32F413.svd",
"cwd": "${workspaceRoot}"
},
+ {
+ "type": "cortex-debug",
+ "request": "launch",
+ "servertype": "openocd",
+ "name": "bare8 (release)",
+ "preLaunchTask": "cargo build --example bare8 --release",
+ "executable": "./target/thumbv7em-none-eabihf/release/examples/bare8",
+ "configFiles": [
+ "interface/stlink-v2-1.cfg",
+ "target/stm32f4x.cfg"
+ ],
+ "swoConfig": {
+ "enabled": true,
+ "cpuFrequency": 16000000,
+ "swoFrequency": 2000000,
+ "source": "probe",
+ "decoders": [
+ {
+ "type": "console",
+ "label": "ITM",
+ "port": 0
+ }
+ ]
+ },
+ "svdFile": "STM32F413.svd",
+ "cwd": "${workspaceRoot}"
+ },
{
"type": "cortex-debug",
"request": "launch",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index db1e201..224b6c8 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -291,6 +291,18 @@
"isDefault": true
}
},
+ {
+ "type": "shell",
+ "label": "cargo build --example bare8 --release",
+ "command": "cargo build --example bare8 --release --features \"hal rtfm\"",
+ "problemMatcher": [
+ "$rustc"
+ ],
+ "group": {
+ "kind": "build",
+ "isDefault": true
+ }
+ },
{
"type": "shell",
"label": "cargo build --example bare9",
diff --git a/Cargo.toml b/Cargo.toml
index fd63391..fe101b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,8 @@ nb = "0.1.1"
heapless = "0.4.1"
[dependencies.cortex-m-rtfm]
-version = "0.4.0"
+version = "0.4.2"
+features = ["timer-queue"]
optional = true
[dependencies.cortex-m]
--
GitLab