From 442da3611524ae38573c67559ee4ebb8f95514b5 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 4 Mar 2015 21:06:35 +0200
Subject: [PATCH] Added support for "SainSmart" boards to  "atmelsam"
 development platform

---
 HISTORY.rst                            |  4 ++++
 docs/platforms/atmelsam.rst            | 20 +++++++++++++++++++-
 platformio/builder/scripts/atmelavr.py |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 1f32c398..cf42ba19 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,9 +4,13 @@ Release History
 1.0.2 (2015-03-??)
 ------------------
 
+* Added support for *SainSmart* boards to
+  `atmelsam <http://docs.platformio.org/en/latest/platforms/atmelsam.html#boards>`__
+  development platform
 * Fixed firmware uploading for
   `atmelavr <http://docs.platformio.org/en/latest/platforms/atmelavr.html#boards>`__
   boards which work within ``usbtiny`` protocol
+* Fixed uploading for *Digispark* board (`issue #106 <https://github.com/ivankravets/platformio/issues/106>`_)
 
 1.0.1 (2015-02-27)
 ------------------
diff --git a/docs/platforms/atmelsam.rst b/docs/platforms/atmelsam.rst
index 9070424f..14363615 100644
--- a/docs/platforms/atmelsam.rst
+++ b/docs/platforms/atmelsam.rst
@@ -70,7 +70,13 @@ Boards
       - Flash
       - RAM
     * - ``due``
-      - `Arduino Due <http://arduino.cc/en/Main/arduinoBoardDue>`_
+      - `Arduino Due (Programming Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
+      - at91sam3x8e ``cortex-m3``
+      - 84 MHz ``84000000L``
+      - 512 Kb
+      - 32 Kb
+    * - ``dueUSB``
+      - `Arduino Due (USB Native Port) <http://arduino.cc/en/Main/arduinoBoardDue>`_
       - at91sam3x8e ``cortex-m3``
       - 84 MHz ``84000000L``
       - 512 Kb
@@ -81,6 +87,18 @@ Boards
       - 84 MHz ``84000000L``
       - 512 kb
       - 32 Kb
+    * - ``sainSmartDue``
+      - `SainSmart Due (Programming Port) <http://www.sainsmart.com/arduino/control-boards/sainsmart-due-atmel-sam3x8e-arm-cortex-m3-board-black.html>`_
+      - at91sam3x8e ``cortex-m3``
+      - 84 MHz ``84000000L``
+      - 512 Kb
+      - 32 Kb
+    * - ``sainSmartDueUSB``
+      - `SainSmart Due (USB Native Port) <http://www.sainsmart.com/arduino/control-boards/sainsmart-due-atmel-sam3x8e-arm-cortex-m3-board-black.html>`_
+      - at91sam3x8e ``cortex-m3``
+      - 84 MHz ``84000000L``
+      - 512 Kb
+      - 32 Kb
 
 More detailed information you can find here
 `Atmel SMART ARM-based MCUs <http://www.atmel.com/products/microcontrollers/arm/default.aspx>`_.
diff --git a/platformio/builder/scripts/atmelavr.py b/platformio/builder/scripts/atmelavr.py
index dd912a5e..9a483921 100644
--- a/platformio/builder/scripts/atmelavr.py
+++ b/platformio/builder/scripts/atmelavr.py
@@ -27,6 +27,7 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
 
     if not upload_options.get("require_upload_port", False):
         return
+
     env.AutodetectUploadPort()
     env.Append(UPLOADERFLAGS=["-P", "$UPLOAD_PORT"])
     if env.subst("$BOARD") == "raspduino":