From 518e95cdffd8c05bac569a0fc5c3863362cefaa9 Mon Sep 17 00:00:00 2001
From: 97gushan <97gustavh@gmail.com>
Date: Wed, 5 Feb 2020 09:40:13 +0100
Subject: [PATCH] fix config issues
---
.vscode/launch.json | 15 +++++----------
openocd.cfg | 5 ++---
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6ed0aed..4904bcb 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -16,8 +16,7 @@
"preLaunchTask": "cargo build",
"executable": "./target/thumbv7em-none-eabihf/debug/app",
"configFiles": [
- "interface/stlink.cfg",
- // "interface/stlink-v2-1.cfg", // deprecated setup script
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -39,8 +38,7 @@
"preLaunchTask": "cargo build --example",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/${fileBasenameNoExtension}",
"configFiles": [
- "interface/stlink.cfg",
- // "interface/stlink-v2-1.cfg", // deprecated setup script
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -75,8 +73,7 @@
"preLaunchTask": "cargo build --example",
"executable": "./target/thumbv7em-none-eabihf/debug/examples/${fileBasenameNoExtension}",
"configFiles": [
- "interface/stlink.cfg",
- // "interface/stlink-v2-1.cfg", // deprecated setup script
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -150,8 +147,7 @@
"preLaunchTask": "cargo build --example --release",
"executable": "./target/thumbv7em-none-eabihf/release/examples/${fileBasenameNoExtension}",
"configFiles": [
- "interface/stlink.cfg",
- // "interface/stlink-v2-1.cfg", // deprecated setup script
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
@@ -175,8 +171,7 @@
"preLaunchTask": "cargo build --example --release --features stm32f4",
"executable": "./target/thumbv7em-none-eabihf/release/examples/${fileBasenameNoExtension}",
"configFiles": [
- "interface/stlink.cfg",
- // "interface/stlink-v2-1.cfg", // deprecated setup script
+ "interface/stlink-v2-1.cfg",
"target/stm32f4x.cfg"
],
"postLaunchCommands": [
diff --git a/openocd.cfg b/openocd.cfg
index 12d6eb5..b168324 100644
--- a/openocd.cfg
+++ b/openocd.cfg
@@ -1,6 +1,5 @@
-source [find interface/stlink.cfg]
-# deprecated
-# source [find interface/stlink-v2-1.cfg]
+source [find interface/stlink-v2-1.cfg]
+
transport select hla_swd
# increase working area to 64KB
--
GitLab