From 6356e49fddf0bbcb24f1adf8adbdd855e307661d Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 9 Apr 2016 18:39:10 +0300
Subject: [PATCH] Automatically reboot Teensy board after upload when Teensy
 Loader GUI is used // Resolve #609

---
 HISTORY.rst                          | 6 +++++-
 platformio/__init__.py               | 2 +-
 platformio/builder/scripts/teensy.py | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index f6a48ece..4fb70fce 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,11 +4,15 @@ Release Notes
 PlatformIO 2.0
 --------------
 
-2.8.7 (2016-??-??)
+2.9.0 (2016-04-??)
 ~~~~~~~~~~~~~~~~~~
 
 * Project generator for `CodeBlocks IDE <http://docs.platformio.org/en/latest/ide/codeblocks.html>`__
   (`issue #600 <https://github.com/platformio/platformio/issues/600>`_)
+* Updated native SDK for ESP8266 to 1.5
+  (`issue #366 <https://github.com/platformio/platformio/issues/366>`_)
+* Automatically reboot Teensy board after upload when Teensy Loader GUI is used
+  (`issue #609 <https://github.com/platformio/platformio/issues/609>`_)
 * Forced ``-std=gnu++11`` for Atmel SAM development platform
   (`issue #601 <https://github.com/platformio/platformio/issues/601>`_)
 * Don't check OS type for ARM mbed-enabled boards and ST STM32 development
diff --git a/platformio/__init__.py b/platformio/__init__.py
index fc08468a..61d83191 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 8, "7.dev0")
+VERSION = (2, 9, "0.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/scripts/teensy.py b/platformio/builder/scripts/teensy.py
index 7f9b52c8..739e5423 100644
--- a/platformio/builder/scripts/teensy.py
+++ b/platformio/builder/scripts/teensy.py
@@ -65,6 +65,8 @@ if isfile(env.subst(join(
     )
 else:
     env.Append(
+        REBOOTER=join(
+            "$PIOPACKAGES_DIR", "tool-teensy", "teensy_reboot"),
         UPLOADER=join(
             "$PIOPACKAGES_DIR", "tool-teensy", "teensy_post_compile"),
         UPLOADERFLAGS=[
@@ -101,7 +103,8 @@ AlwaysBuild(target_size)
 # Target: Upload by default firmware file
 #
 
-upload = env.Alias(["upload", "uploadlazy"], target_firm, "$UPLOADHEXCMD")
+upload = env.Alias(["upload", "uploadlazy"], target_firm,
+    ["$UPLOADHEXCMD"] + (["$REBOOTER"] if "REBOOTER" in env else []))
 AlwaysBuild(upload)
 
 #