From 2bb22a86d74c54e819c922149f2b95834cee182d Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 8 May 2018 18:23:27 +0300
Subject: [PATCH] New UI for PIO Unified Debugger and VSCode

---
 docs                                          |  2 +-
 .../ide/tpls/vscode/.vscode/launch.json.tpl   | 19 ++++---------------
 platformio/managers/core.py                   |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/docs b/docs
index 92493e4c..6f9634bb 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 92493e4cc2ebee904b6c24570b47ef8c1c282081
+Subproject commit 6f9634bb82aeaa8b249de08b367441497900da66
diff --git a/platformio/ide/tpls/vscode/.vscode/launch.json.tpl b/platformio/ide/tpls/vscode/.vscode/launch.json.tpl
index fc6de3b4..541e2485 100644
--- a/platformio/ide/tpls/vscode/.vscode/launch.json.tpl
+++ b/platformio/ide/tpls/vscode/.vscode/launch.json.tpl
@@ -2,8 +2,8 @@
 
 // PIO Unified Debugger
 //
-// http://docs.platformio.org/page/plus/debugging.html
-// http://docs.platformio.org/page/section_env_debug.html#projectconf-debug-tool
+// Documentation: http://docs.platformio.org/page/plus/debugging.html
+// Configuration: http://docs.platformio.org/page/projectconf/section_env_debug.html
 
 % from os.path import dirname, join
 %
@@ -14,21 +14,10 @@
 {
     "version": "0.2.0",
     "configurations": [
-        {
-            "type": "gdb",
-            "request": "launch",
-            "cwd": "${workspaceRoot}",
-            "name": "PlatformIO Debugger",
-            "target": "{{ _escape_path(prog_path) }}",
-            "gdbpath": "{{ _escape_path(join(dirname(platformio_path), "piodebuggdb")) }}",
-            "autorun": [ "source .pioinit" ],
-            "preLaunchTask": "PlatformIO: Pre-Debug",
-            "internalConsoleOptions": "openOnSessionStart"
-        },
         {
             "type": "platformio-debug",
             "request": "launch",
-            "name": "PlatformIO Debugger (Dev)",
+            "name": "PlatformIO Debugger",
             "executable": "{{ _escape_path(prog_path) }}",
             "toolchainBinDir": "{{ _escape_path(dirname(gdb_path)) }}",
 % if svd_path:
@@ -40,7 +29,7 @@
         {
             "type": "platformio-debug",
             "request": "launch",
-            "name": "PlatformIO Debugger (Dev) (Quick)",
+            "name": "PlatformIO Debugger (Skip Pre-Debug)",
             "executable": "{{ _escape_path(prog_path) }}",
             "toolchainBinDir": "{{ _escape_path(dirname(gdb_path)) }}",
 % if svd_path:
diff --git a/platformio/managers/core.py b/platformio/managers/core.py
index 2b18b2ba..c5fb0084 100644
--- a/platformio/managers/core.py
+++ b/platformio/managers/core.py
@@ -23,7 +23,7 @@ from platformio.managers.package import PackageManager
 CORE_PACKAGES = {
     "contrib-piohome": ">=0.9.5,<2",
     "contrib-pysite": ">=0.2.0,<2",
-    "tool-pioplus": ">=1.2.1,<2",
+    "tool-pioplus": ">=1.3.0,<2",
     "tool-unity": "~1.20403.0",
     "tool-scons": "~2.20501.4"
 }