5 files changed, 11 insertions, 36 deletions
diff --git a/readme.txt b/readme.txt
index b37d92457..f36cd96ed 100644
--- a/readme.txt
+++ b/readme.txt
@@ -89,6 +89,7 @@
 *****************************************************************************
 
 *** Next ***
+- NEW: Improved external tools launch configuration for OpenOCD.
 - NEW: Added circular continuous mode to the SPI driver.
 - NEW: Added callbacks capability to the CAN driver.
 - NEW: Added initial STM32H7xx support.
diff --git a/tools/eclipse/debug/OpenOCD on ST-Link V2 (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD (prompts for .cfg target configuration).launch
index 52a239749..01e1a2578 100644
--- a/tools/eclipse/debug/OpenOCD on ST-Link V2 (prompts for .cfg target configuration).launch
+++ b/tools/eclipse/debug/OpenOCD (prompts for .cfg target configuration).launch
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;/ChibiStudio/tools/openocd/scripts&quot; -f &quot;interface/stlink-v2.cfg&quot; -f &quot;${file_prompt}&quot;"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${eclipse_home}\..\tools\openocd\bin\openocd.exe"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;/ChibiStudio/tools/openocd/scripts&quot; -f &quot;${file_prompt}&quot;"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${eclipse_home}\..\tools\openocd\bin\"/>
+</launchConfiguration>
diff --git a/tools/eclipse/debug/OpenOCD on Olimex ARM-USB-OCD (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD on Olimex ARM-USB-OCD (prompts for .cfg target configuration).launch
deleted file mode 100644
index fd552ce4b..000000000
--- a/tools/eclipse/debug/OpenOCD on Olimex ARM-USB-OCD (prompts for .cfg target configuration).launch
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -f &quot;interface/olimex-arm-usb-ocd.cfg&quot; -f &quot;${file_prompt}&quot;"/>
-</launchConfiguration>
diff --git a/tools/eclipse/debug/OpenOCD on ST-Link V1 (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD on ST-Link V1 (prompts for .cfg target configuration).launch
deleted file mode 100644
index 9c0956353..000000000
--- a/tools/eclipse/debug/OpenOCD on ST-Link V1 (prompts for .cfg target configuration).launch
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -f &quot;interface/stlink-v1.cfg&quot; -f &quot;${file_prompt}&quot;"/>
-</launchConfiguration>
diff --git a/tools/eclipse/debug/OpenOCD on ST-Link V2-1 (prompts for .cfg target configuration).launch b/tools/eclipse/debug/OpenOCD on ST-Link V2-1 (prompts for .cfg target configuration).launch
deleted file mode 100644
index f316e62f8..000000000
--- a/tools/eclipse/debug/OpenOCD on ST-Link V2-1 (prompts for .cfg target configuration).launch
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${env_var:OPENOCD}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-c &quot;telnet_port 4444&quot; -s &quot;/ChibiStudio/tools/openocd/scripts&quot; -f &quot;interface/stlink-v2-1.cfg&quot; -f &quot;${file_prompt}&quot;"/>
-</launchConfiguration>