From 3147fb952d49433b985b1fd8e1c49eb683d95fbe Mon Sep 17 00:00:00 2001
From: sheepwall <a.sve@live.se>
Date: Wed, 20 Feb 2019 17:00:32 +0100
Subject: [PATCH] updated hardware crates
---
.vscode/launch.json | 56 ++++++++++++++++++++++-----------------------
Cargo.toml | 4 ++--
examples/itm.rs | 2 +-
stlink.cfg | 3 ++-
stm32f4x.cfg | 4 ++--
5 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 19c3088..73b60ab 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,7 +12,7 @@
"preLaunchTask": "cargo build --example hello",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/hello",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -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": {
@@ -171,7 +171,7 @@
"preLaunchTask": "cargo build --example crash --release",
"executable": "./target/thumbv7em-none-eabihf/release/examples/crash",
"configFiles": [
- "interface/stlink.cfg",
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -216,7 +216,7 @@
"executable": "./target/thumbv7em-none-eabihf/debug/examples/device",
// uses local config files
"configFiles": [
- "./stlink.cfg",
+ "./stlink-v2-1.cfg",
"./stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -275,7 +275,7 @@
"executable": "./target/thumbv7em-none-eabihf/debug/examples/rtfm_blinky",
// uses local config files
"configFiles": [
- "./stlink.cfg",
+ "./stlink-v2-1.cfg",
"./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/Cargo.toml b/Cargo.toml
index 3089f34..8ce85aa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,13 +34,13 @@ version = "0.5.8"
# alloc-cortex-m = "0.3.5"
[dependencies.stm32f4]
-version = "0.5.0"
+version = "0.6.0"
features = ["stm32f413", "rt"]
optional = true
[dependencies.stm32f4xx-hal]
git = "https://github.com/stm32-rs/stm32f4xx-hal.git"
-version = "0.2.8"
+version = "0.3.0"
features = ["stm32f413", "rt"]
optional = true
diff --git a/examples/itm.rs b/examples/itm.rs
index b4c9401..e41bb5b 100644
--- a/examples/itm.rs
+++ b/examples/itm.rs
@@ -22,6 +22,6 @@ fn main() -> ! {
let mut p = Peripherals::take().unwrap();
let stim = &mut p.ITM.stim[0];
- iprintln!(stim, "Hello, again!");
+ iprintln!(stim, "Hello, again! {:x}", 10);
loop {}
}
diff --git a/stlink.cfg b/stlink.cfg
index 735ad5a..abe45a8 100644
--- a/stlink.cfg
+++ b/stlink.cfg
@@ -6,7 +6,8 @@
interface hla
hla_layout stlink
hla_device_desc "ST-LINK"
-hla_vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753
+hla_vid_pid 0x0483 0x374b
+# 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753
# Optionally specify the serial number of ST-LINK/V2 usb device. ST-LINK/V2
# devices seem to have serial numbers with unreadable characters. ST-LINK/V2
diff --git a/stm32f4x.cfg b/stm32f4x.cfg
index b8e8146..d7c58d0 100644
--- a/stm32f4x.cfg
+++ b/stm32f4x.cfg
@@ -56,7 +56,7 @@ flash bank $_FLASHNAME stm32f2x 0 0 0 0 $_TARGETNAME
# bit more to be on the safe side. Perhaps superstition, but if are
# running off a crystal, we can run closer to the limit. Note
# that there can be a pretty wide band where things are more or less stable.
-adapter_khz 2000
+adapter_khz 1800
adapter_nsrst_delay 100
if {[using_jtag]} {
@@ -103,5 +103,5 @@ $_TARGETNAME configure -event reset-init {
$_TARGETNAME configure -event reset-start {
# Reduce speed since CPU speed will slow down to 16MHz with the reset
- adapter_khz 2000
+ adapter_khz 1800
}
--
GitLab