From 1c8ac970734f0c93eaaf953f8b27c343ee2ce766 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 6 Jul 2018 15:25:26 +0300
Subject: [PATCH 1/2] Update core dependencies

---
 docs                        | 2 +-
 platformio/managers/core.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs b/docs
index a23b54ff..9d8e84d5 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit a23b54ff4e52bec425969c3a338c5c8de8b1193d
+Subproject commit 9d8e84d527aa83f19ce402e0c55964a1655535eb
diff --git a/platformio/managers/core.py b/platformio/managers/core.py
index 9bead905..0dee74fc 100644
--- a/platformio/managers/core.py
+++ b/platformio/managers/core.py
@@ -21,9 +21,9 @@ from platformio import __version__, exception, util
 from platformio.managers.package import PackageManager
 
 CORE_PACKAGES = {
-    "contrib-piohome": ">=0.9.5,<2",
-    "contrib-pysite": ">=0.2.0,<2",
-    "tool-pioplus": ">=1.3.1,<2",
+    "contrib-piohome": ">=0.9.6,<2",
+    "contrib-pysite": ">=0.3.0,<2",
+    "tool-pioplus": ">=1.3.6,<2",
     "tool-unity": "~1.20403.0",
     "tool-scons": "~2.20501.4"
 }

From c1f4b729eac0a3c098460f3a9a22b38074176516 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 6 Jul 2018 15:25:51 +0300
Subject: [PATCH 2/2] Export extra flash images for IDE

---
 platformio/builder/tools/pioide.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platformio/builder/tools/pioide.py b/platformio/builder/tools/pioide.py
index 89b49e3d..ec1134b2 100644
--- a/platformio/builder/tools/pioide.py
+++ b/platformio/builder/tools/pioide.py
@@ -152,6 +152,10 @@ def DumpIDEData(env):
         util.where_is_program(env.subst("$GDB"), env.subst("${ENV['PATH']}")),
         "prog_path":
         env.subst("$PROG_PATH"),
+        "flash_extra_images": [{
+            "offset": item[0],
+            "path": env.subst(item[1])
+        } for item in env.get("FLASH_EXTRA_IMAGES", [])],
         "svd_path":
         _get_svd_path(env),
         "compiler_type":