Merge branch 'release/v1.6.0'

platformio · Mar 12, 2017 · c1cfacc · c1cfacc
2 parents c04e423 + 4f44cc0
commit c1cfacc
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -5,11 +5,11 @@
 Silicon Labs EFM32 Gecko 32-bit microcontroller (MCU) family includes devices that offer flash memory configurations up to 256 kB, 32 kB of RAM and CPU speeds up to 48 MHz. Based on the powerful ARM Cortex-M core, the Gecko family features innovative low energy techniques, short wake-up time from energy saving modes and a wide selection of peripherals, making it ideal for battery operated applications and other systems requiring high performance and low-energy consumption.
 
 * [Home](http://platformio.org/platforms/siliconlabsefm32) (home page in PlatformIO Platform Registry)
-* [Documentation](http://docs.platformio.org/en/stable/platforms/siliconlabsefm32.html) (advanced usage, packages, boards, frameworks, etc.)
+* [Documentation](http://docs.platformio.org/page/platforms/siliconlabsefm32.html) (advanced usage, packages, boards, frameworks, etc.)
 
 # Usage
 
-1. [Install PlatformIO CLI](http://docs.platformio.org/en/stable/installation.html)
+1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
 2. Install Silicon Labs EFM32 development platform:
 ```bash
 # install the latest stable version

diff --git a/builder/frameworks/mbed b/builder/frameworks/mbed
diff --git a/examples/mbed-blink/.travis.yml b/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/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/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/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

diff --git a/examples/mbed-blink/README.rst b/examples/mbed-blink/README.rst
@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-siliconlabsefm32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/mbed-blink/lib/readme.txt b/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/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install
 
diff --git a/examples/mbed-blink/platformio.ini b/examples/mbed-blink/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html
 
 [env:efm32wg_stk3800]
 platform = siliconlabsefm32

diff --git a/examples/mbed-dsp/.travis.yml b/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/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/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/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

diff --git a/examples/mbed-dsp/README.rst b/examples/mbed-dsp/README.rst
@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-siliconlabsefm32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/mbed-dsp/lib/readme.txt b/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/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install
 
diff --git a/examples/mbed-dsp/platformio.ini b/examples/mbed-dsp/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html
 
 [env:efm32wg_stk3800]
 platform = siliconlabsefm32

diff --git a/examples/mbed-events/.travis.yml b/examples/mbed-events/.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/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/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/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

diff --git a/examples/mbed-events/README.rst b/examples/mbed-events/README.rst
@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-siliconlabsefm32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/mbed-events/lib/readme.txt b/examples/mbed-events/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/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install
 
diff --git a/examples/mbed-events/platformio.ini b/examples/mbed-events/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html
 
 [env:efm32wg_stk3800]
 platform = siliconlabsefm32

diff --git a/examples/mbed-serial/.travis.yml b/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/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/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/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

diff --git a/examples/mbed-serial/README.rst b/examples/mbed-serial/README.rst
@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-siliconlabsefm32/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/mbed-serial/lib/readme.txt b/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/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install
 
diff --git a/examples/mbed-serial/platformio.ini b/examples/mbed-serial/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html
 
 [env:efm32wg_stk3800]
 platform = siliconlabsefm32

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-siliconlabsefm32.git"
   },
-  "version": "1.5.0",
+  "version": "1.6.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -32,7 +32,7 @@
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~3.131.0"
+      "version": "~3.137.0"
     }
   }
 }