diff --git a/.vscode/launch.json b/.vscode/launch.json
index 19c3088ec87671ea1b8e7480b93c2fa9351a4aea..726924350d50a4d6aa45f59f3e880aee4ce25ee9 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -59,7 +59,7 @@
"preLaunchTask": "cargo build --example itm",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/itm",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -89,7 +89,7 @@
"preLaunchTask": "cargo build --example panic",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/panic",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -119,7 +119,7 @@
"preLaunchTask": "cargo build --example exception_itm --release",
"executable": "./target/thumbv7em-none-eabihf/release/examples/exception_itm",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"swoConfig": {
@@ -145,7 +145,7 @@
"preLaunchTask": "cargo build --example exception_itm_raw",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/exception_itm_raw",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"swoConfig": {
@@ -302,7 +302,7 @@
"preLaunchTask": "cargo build --example bare0",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/bare0",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"cwd": "${workspaceRoot}"
@@ -331,7 +331,7 @@
]
},
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"cwd": "${workspaceRoot}"
@@ -360,7 +360,7 @@
]
},
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"cwd": "${workspaceRoot}"
@@ -389,7 +389,7 @@
]
},
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"cwd": "${workspaceRoot}"
@@ -418,7 +418,7 @@
]
},
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"cwd": "${workspaceRoot}"
@@ -434,7 +434,7 @@
"monitor arm semihosting enable"
],
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"cwd": "${workspaceRoot}"
@@ -450,7 +450,7 @@
"monitor arm semihosting enable"
],
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"cwd": "${workspaceRoot}"
@@ -466,7 +466,7 @@
"monitor arm semihosting enable"
],
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"cwd": "${workspaceRoot}"
@@ -482,7 +482,7 @@
"monitor arm semihosting enable"
],
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"cwd": "${workspaceRoot}"
@@ -495,7 +495,7 @@
"preLaunchTask": "cargo build --example bare6",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/bare6",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -524,7 +524,7 @@
"preLaunchTask": "cargo build --example bare6",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/bare6",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -585,7 +585,7 @@
"preLaunchTask": "cargo build --example bare7",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/bare7",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -616,7 +616,7 @@
"executable": "./target/thumbv7em-none-eabihf/debug/examples/bare7",
// uses local config files
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -646,7 +646,7 @@
"preLaunchTask": "cargo build --example bare8",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/bare8",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"swoConfig": {
@@ -673,7 +673,7 @@
"preLaunchTask": "cargo build --example bare9",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/bare9",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"swoConfig": {
@@ -700,7 +700,7 @@
"preLaunchTask": "cargo build --example bare9 --release",
"executable": "./target/thumbv7em-none-eabihf/release/examples/bare9",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"swoConfig": {
@@ -727,7 +727,7 @@
"preLaunchTask": "cargo build --example bare10 --release",
"executable": "./target/thumbv7em-none-eabihf/release/examples/bare10",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"swoConfig": {
@@ -759,7 +759,7 @@
"preLaunchTask": "cargo build --example bare10",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/bare10",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"swoConfig": {
@@ -791,7 +791,7 @@
"preLaunchTask": "cargo build --example marcus --release",
"executable": "./target/thumbv7em-none-eabihf/release/examples/marcus",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"swoConfig": {
@@ -823,7 +823,7 @@
"preLaunchTask": "cargo build --example equivalence --release",
"executable": "./target/thumbv7em-none-eabihf/release/examples/equivalence",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"swoConfig": {
diff --git a/examples/bare0.rs b/examples/bare0.rs
index eef66f54ef142f84629473b2677374a48b2da98b..25b5ad67a79c5464720fc82249f6d5685e0b96c3 100644
--- a/examples/bare0.rs
+++ b/examples/bare0.rs
@@ -48,18 +48,18 @@ fn main() -> ! {
// 1. Run the program in the debugger, let the program run for a while and
// then press pause. Look in the (Local -vscode) Variables view what do you find.
//
-// ** your answer here **
+// *** x: 962669 ***
//
// In the Expressions (WATCH -vscode) view add X and Y
// what do you find
//
-// ** your answer here **
+// *** -var-create: unable to create variable object (from var-create watch_X @ "X") ***
//
// Step through one complete iteration of the loop
// and see how the (Local) Variables are updated
// can you foresee what will eventually happen?
//
-// ** place your answer here **
+// *** x is incremented. Eventually x will wrap. ***
//
// Commit your answers (bare0_1)
//
diff --git a/openocd.cfg b/openocd.cfg
index f6a81487a5e9553eaae35d02e0e275e26a1a38b5..33144c56d3770bed679dd89ca5ac0f593c90088b 100644
--- a/openocd.cfg
+++ b/openocd.cfg
@@ -3,6 +3,6 @@
# Depending on the hardware revision you got you'll have to pick ONE of these
# interfaces. At any time only one interface should be commented out.
-source [find interface/stlink.cfg]
+source [find interface/stlink-v2-1.cfg]
source [find target/stm32f4x.cfg]