Merge branch 'release/v1.1.0'

README.md

@@ -5,11 +5,11 @@
 Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cortex-M3 and Cortex-M4 architectures, ranging from 8KB to 2MB of Flash including a rich peripheral and feature mix.
 
 * [Home](http://platformio.org/platforms/atmelsam) (home page in PlatformIO Platform Registry)
-* [Documentation](http://docs.platformio.org/en/latest/platforms/atmelsam.html) (advanced usage, packages, boards, frameworks, etc.)
+* [Documentation](http://docs.platformio.org/en/stable/platforms/atmelsam.html) (advanced usage, packages, boards, frameworks, etc.)
 
 # Usage
 
-1. [Install PlatformIO CLI](http://docs.platformio.org/en/latest/installation.html)
+1. [Install PlatformIO CLI](http://docs.platformio.org/en/stable/installation.html)
 2. Install Atmel SAM development platform:
 ```bash
 # install the latest stable version

builder/main.py

@@ -12,10 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""
-    Builder for Atmel SAM series of microcontrollers
-"""
-
 from os.path import basename, join
 
 from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, AlwaysBuild,
@@ -254,18 +250,19 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
 # Target: Build executable and linkable firmware
 #
 
-target_elf = env.BuildProgram()
-
-#
-# Target: Build the .bin file
-#
-
-if "uploadlazy" in COMMAND_LINE_TARGETS:
-    target_firm = join("$BUILD_DIR", "firmware.bin")
-elif upload_protocol == "stk500v2":
-    target_firm = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf)
+target_elf = None
+if "nobuild" in COMMAND_LINE_TARGETS:
+    target_firm = join("$BUILD_DIR", "firmware.%s" % (
+        "hex" if upload_protocol == "stk500v2" else "bin"))
 else:
-    target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
+    target_elf = env.BuildProgram()
+    if upload_protocol == "stk500v2":
+        target_firm = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf)
+    else:
+        target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
+
+AlwaysBuild(env.Alias("nobuild", target_firm))
+target_buildprog = env.Alias("buildprog", target_firm)
 
 #
 # Target: Print binary size
@@ -281,18 +278,18 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
 #
 
 if upload_protocol == "openocd":
-    upload = env.Alias(["upload", "uploadlazy"], target_firm,
+    target_upload = env.Alias("upload", target_firm,
                        env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE"))
 else:
-    upload = env.Alias(
-        ["upload", "uploadlazy"], target_firm,
+    target_upload = env.Alias(
+        "upload", target_firm,
         [env.VerboseAction(BeforeUpload, "Looking for upload port..."),
          env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")])
 
-AlwaysBuild(upload)
+AlwaysBuild(target_upload)
 
 #
 # Setup default targets
 #
 
-Default([target_firm, target_size])
+Default([target_buildprog, target_size])

examples/arduino-blink/.travis.yml

@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/latest/ci/index.html >
+# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/latest/ci/travis.html >
+#   < http://docs.platformio.org/en/stable/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

examples/arduino-blink/README.rst

@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
+1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-atmelsam/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

examples/arduino-blink/lib/readme.txt

@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/latest/projectconf.html#lib-install
+http://docs.platformio.org/en/stable/projectconf.html#lib-install
 

examples/arduino-blink/platformio.ini

@@ -37,6 +37,11 @@ platform = atmelsam
 framework = arduino
 board = mzeropro
 
+[env:mzeroproUSB]
+platform = atmelsam
+framework = arduino
+board = mzeroproUSB
+
 [env:mzeroUSB]
 platform = atmelsam
 framework = arduino

examples/arduino-external-libs/.travis.yml

@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/latest/ci/index.html >
+# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/latest/ci/travis.html >
+#   < http://docs.platformio.org/en/stable/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

examples/arduino-external-libs/README.rst

@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
+1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-atmelsam/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

examples/arduino-external-libs/lib/readme.txt

@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/latest/projectconf.html#lib-install
+http://docs.platformio.org/en/stable/projectconf.html#lib-install
 

examples/arduino-internal-libs/.travis.yml

@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/latest/ci/index.html >
+# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/latest/ci/travis.html >
+#   < http://docs.platformio.org/en/stable/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

examples/arduino-internal-libs/README.rst

@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
+1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-atmelsam/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

examples/arduino-internal-libs/lib/readme.txt

@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/latest/projectconf.html#lib-install
+http://docs.platformio.org/en/stable/projectconf.html#lib-install
 

examples/mbed-blink/.travis.yml

@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/latest/ci/index.html >
+# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/latest/ci/travis.html >
+#   < http://docs.platformio.org/en/stable/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

examples/mbed-blink/README.rst

@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
+1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-atmelsam/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

examples/mbed-blink/lib/readme.txt

@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/latest/projectconf.html#lib-install
+http://docs.platformio.org/en/stable/projectconf.html#lib-install
 

examples/mbed-dsp/.travis.yml

@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/latest/ci/index.html >
+# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/latest/ci/travis.html >
+#   < http://docs.platformio.org/en/stable/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

examples/mbed-dsp/README.rst

@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
+1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-atmelsam/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

examples/mbed-dsp/lib/readme.txt

@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/latest/projectconf.html#lib-install
+http://docs.platformio.org/en/stable/projectconf.html#lib-install
 

examples/mbed-serial/.travis.yml

@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/latest/ci/index.html >
+# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/latest/ci/travis.html >
+#   < http://docs.platformio.org/en/stable/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

examples/mbed-serial/README.rst

@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
+1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-atmelsam/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

examples/mbed-serial/lib/readme.txt

@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/latest/projectconf.html#lib-install
+http://docs.platformio.org/en/stable/projectconf.html#lib-install
 

examples/simba-blink/.travis.yml

@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/latest/ci/index.html >
+# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/latest/ci/travis.html >
+#   < http://docs.platformio.org/en/stable/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
 #
 #
 # Please choice one of the following templates (proposed below) and uncomment

examples/simba-blink/README.rst

@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
+1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-atmelsam/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

examples/simba-blink/lib/readme.txt

@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/latest/projectconf.html#lib-install
+http://docs.platformio.org/en/stable/projectconf.html#lib-install
 

platform.json

@@ -13,7 +13,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-atmelsam.git"
   },
-  "version": "1.0.3",
+  "version": "1.1.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -47,7 +47,7 @@
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~3.124.0"
+      "version": "~3.126.0"
     },
     "framework-simba": {
       "type": "framework",