From 73b1d9ccd59818410b1c60675e0ac1f2e1dc8465 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 1 May 2018 21:09:32 +0300
Subject: [PATCH] Configure a custom path to SVD file using "debug_svd_path"
 option

---
 HISTORY.rst                        | 4 +++-
 docs                               | 2 +-
 platformio/builder/main.py         | 2 +-
 platformio/builder/tools/pioide.py | 4 ++++
 platformio/commands/run.py         | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 0497745e..d72c208d 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -13,9 +13,11 @@ PlatformIO 3.0
   - "Recent News" block on "Welcome" page
   - Direct import of development platform's example
 
+* Configure a custom path to SVD file using `debug_svd_path <http://docs.platformio.org/page/projectconf/section_env_debug.html#debug-svd-path>`__
+  option
 * Describe your project with a new
   `description <http://docs.platformio.org/en/latest/projectconf/section_platformio.html#description>`_
-  option for `Project Configuration File "platformio.ini" <http://docs.platformio.org/page/projectconf/section_platformio.html#build-dir>`__ (information will be used by
+  option from `Project Configuration File "platformio.ini" <http://docs.platformio.org/page/projectconf/section_platformio.html#build-dir>`__ (information will be used by
   `PlatformIO Home <http://docs.platformio.org/page/home/index.html>`_)
 * Updated Unity tool to 2.4.3
 * Improved support for Black Magic Probe in "uploader" role
diff --git a/docs b/docs
index a3f4e765..84fd5fe4 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit a3f4e765e5d146df43b13719782d213cb2658359
+Subproject commit 84fd5fe430a964c1ebc9d28b2380da166a753afd
diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index 8da01270..7618853e 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -68,7 +68,7 @@ commonvars.AddVariables(
 
     # debug options
     ("DEBUG_TOOL",),
-
+    ("DEBUG_SVD_PATH",),
 
 )  # yapf: disable
 
diff --git a/platformio/builder/tools/pioide.py b/platformio/builder/tools/pioide.py
index d8b5591a..75687360 100644
--- a/platformio/builder/tools/pioide.py
+++ b/platformio/builder/tools/pioide.py
@@ -108,6 +108,10 @@ def _dump_defines(env):
 
 
 def _get_svd_path(env):
+    svd_path = env.subst("$DEBUG_SVD_PATH")
+    if svd_path and isfile(svd_path):
+        return abspath(svd_path)
+
     if "BOARD" not in env:
         return None
     try:
diff --git a/platformio/commands/run.py b/platformio/commands/run.py
index 98c29dda..e0fe7707 100644
--- a/platformio/commands/run.py
+++ b/platformio/commands/run.py
@@ -143,8 +143,8 @@ class EnvironmentProcessor(object):
                          "test_port", "test_speed", "debug_tool", "debug_port",
                          "debug_init_cmds", "debug_extra_cmds", "debug_server",
                          "debug_init_break", "debug_load_cmd",
-                         "debug_load_mode", "monitor_port", "monitor_baud",
-                         "monitor_rts", "monitor_dtr")
+                         "debug_load_mode", "debug_svd_path", "monitor_port",
+                         "monitor_baud", "monitor_rts", "monitor_dtr")
 
     IGNORE_BUILD_OPTIONS = ("test_transport", "test_filter", "test_ignore",
                             "test_port", "test_speed", "debug_port",