Merge branch 'develop' into feature/platformio-30

* develop: (21 commits)
  Use stable docs
  Version bump to 2.11.2 (issues #500, #533, #732, #731, #737, #733, #438, #722, #52, #725)
  Update project configuration template
  Use stable docs
  Implement firmware merging with base firmware for Nordic nRF51 development platform // Resolve #500 , Resolve #533
  Fix firmware uploading to Atmel SAMD21-XPRO board using ARM mbed framework // Resolve #732
  Add firmware merging process for nordicnrf51 // Issue #533, #500
  Add OpenOCD as an alternative upload method for atmelsam platform // Issue #732
  Sync flags parser with PlatformIO 3.0 branch // Resolve #738
  Update ``udev`` rules for the new STM32F407DISCOVERY boards // Resolve #731
  Add explanation about "Failed to find MSBuild toolsets directory"
  Add support for local "--echo" for Serial Port Monitor // Resolve #733
  Update history
  Improve support for Microchip PIC32 development platform and ChipKIT boards // Resolve #438
  Fix Project Generator for ESP8266 and ARM mbed based projects
  Switch to gcc-built LwIP library for espressif platform
  Push 2.11.2.dev2
  Fix linking process for microchippic32 platfrom // Issue #438
  Improve Project Generator for PlatformIO IDE (fixes incorrect linter errors)

HISTORY.rst

@@ -71,16 +71,30 @@ PlatformIO 3.0
 PlatformIO 2.0
 --------------
 
-2.11.2 (2016-??-??)
+2.11.2 (2016-08-02)
 ~~~~~~~~~~~~~~~~~~~
 
+* Improved support for `Microchip PIC32 <http://docs.platformio.org/en/latest/platforms/microchippic32.html>`__ development platform and ChipKIT boards
+  (`issue #438 <https://github.com/platformio/platformio/issues/438>`_)
 * Added support for Pinoccio Scout board
   (`issue #52 <https://github.com/platformio/platformio/issues/52>`_)
 * Added support for `Teensy USB Features <http://docs.platformio.org/en/latest/platforms/teensy.html#usb-features>`__
   (HID, SERIAL_HID, DISK, DISK_SDFLASH, MIDI, etc.)
   (`issue #722 <https://github.com/platformio/platformio/issues/722>`_)
+* Switched to built-in GCC LwIP library for Espressif development platform
+* Added support for local ``--echo`` for Serial Port Monitor
+  (`issue #733 <https://github.com/platformio/platformio/issues/733>`_)
+* Updated ``udev`` rules for the new STM32F407DISCOVERY boards
+  (`issue #731 <https://github.com/platformio/platformio/issues/731>`_)
+* Implemented firmware merging with base firmware for Nordic nRF51 development platform
+  (`issue #500 <https://github.com/platformio/platformio/issues/500>`_,
+  `issue #533 <https://github.com/platformio/platformio/issues/533>`_)
+* Fixed Project Generator for ESP8266 and ARM mbed based projects
+  (resolves incorrect linter errors)
 * Fixed broken LD Script for Element14 chipKIT Pi board
   (`issue #725 <https://github.com/platformio/platformio/issues/725>`_)
+* Fixed firmware uploading to Atmel SAMD21-XPRO board using ARM mbed framework
+  (`issue #732 <https://github.com/platformio/platformio/issues/732>`_)
 
 2.11.1 (2016-07-12)
 ~~~~~~~~~~~~~~~~~~~

README.rst

@@ -74,13 +74,13 @@ TI MSP430 & Tiva, Teensy, Arduino, mbed, libOpenCM3, etc.*
 * `Development Platforms <http://platformio.org/platforms>`_
 * `Frameworks <http://platformio.org/frameworks>`_
 * `Embedded Boards Explorer <http://platformio.org/boards>`_
-* `Library Manager <http://docs.platformio.org/en/latest/librarymanager/index.html>`_
-* `User Guide <http://docs.platformio.org/en/latest/userguide/index.html>`_
-* `Continuous Integration <http://docs.platformio.org/en/latest/ci/index.html>`_
-* `IDE Integration <http://docs.platformio.org/en/latest/ide.html>`_
-* `Articles about us <http://docs.platformio.org/en/latest/articles.html>`_
-* `FAQ <http://docs.platformio.org/en/latest/faq.html>`_
-* `Release Notes <http://docs.platformio.org/en/latest/history.html>`_
+* `Library Manager <http://docs.platformio.org/en/stable/librarymanager/index.html>`_
+* `User Guide <http://docs.platformio.org/en/stable/userguide/index.html>`_
+* `Continuous Integration <http://docs.platformio.org/en/stable/ci/index.html>`_
+* `IDE Integration <http://docs.platformio.org/en/stable/ide.html>`_
+* `Articles about us <http://docs.platformio.org/en/stable/articles.html>`_
+* `FAQ <http://docs.platformio.org/en/stable/faq.html>`_
+* `Release Notes <http://docs.platformio.org/en/stable/history.html>`_
 
 Use whenever. *Run everywhere.*
 -------------------------------
@@ -97,12 +97,12 @@ Embedded Development. *Easier Than Ever.*
 settings for most popular `Embedded Boards <http://platformio.org/boards>`_.
 
 * Colourful `command-line output <https://raw.githubusercontent.com/platformio/platformio/develop/examples/platformio-examples.png>`_
-* `IDE Integration <http://docs.platformio.org/en/latest/ide.html>`_ with
+* `IDE Integration <http://docs.platformio.org/en/stable/ide.html>`_ with
   *Arduino, Atom, Eclipse, Emacs, Energia, Qt Creator, Sublime Text, Vim, Visual Studio*
-* Cloud compiling and `Continuous Integration <http://docs.platformio.org/en/latest/ci/index.html>`_
+* Cloud compiling and `Continuous Integration <http://docs.platformio.org/en/stable/ci/index.html>`_
   with *AppVeyor, Circle CI, Drone, Shippable, Travis CI*
-* Built-in `Serial Port Monitor <http://docs.platformio.org/en/latest/userguide/cmd_serialports.html#platformio-serialports-monitor>`_ and configurable
-  `build -flags/-options <http://docs.platformio.org/en/latest/projectconf.html#build-flags>`_
+* Built-in `Serial Port Monitor <http://docs.platformio.org/en/stable/userguide/cmd_serialports.html#platformio-serialports-monitor>`_ and configurable
+  `build -flags/-options <http://docs.platformio.org/en/stable/projectconf.html#build-flags>`_
 * Automatic **firmware uploading**
 * Pre-built tool chains, frameworks for the popular `Hardware Platforms <http://platformio.org/platforms>`_
 
@@ -115,10 +115,10 @@ The Missing Library Manager. *It's here!*
 *PlatformIO Library Manager* is the missing library manager for development
 platforms which allows you to organize and have up-to-date external libraries.
 
-* Friendly `Command-Line Interface <http://docs.platformio.org/en/latest/librarymanager/index.html>`_
+* Friendly `Command-Line Interface <http://docs.platformio.org/en/stable/librarymanager/index.html>`_
 * Modern `Web 2.0 Library Search <http://platformio.org/lib>`_
 * Open Source `Library Registry API <https://github.com/platformio/platformio-api>`_
-* Library Crawler based on `library.json <http://docs.platformio.org/en/latest/librarymanager/config.html>`_
+* Library Crawler based on `library.json <http://docs.platformio.org/en/stable/librarymanager/config.html>`_
   specification
 * Library **dependency management**
 * Automatic library updating
@@ -137,7 +137,7 @@ cross-platform substitute for the classic *Make* utility.
 * Reliable detection of *build changes*
 * Improved support for *parallel builds*
 * Ability to share *built files in a cache*
-* Lookup for external libraries which are installed via `Library Manager <http://docs.platformio.org/en/latest/librarymanager/index.html>`_
+* Lookup for external libraries which are installed via `Library Manager <http://docs.platformio.org/en/stable/librarymanager/index.html>`_
 
 .. image:: https://raw.githubusercontent.com/platformio/platformio-web/develop/app/images/platformio-scons-builder.png
     :target: http://platformio.org
@@ -147,9 +147,9 @@ Single source code. *Multiple platforms.*
 -----------------------------------------
 *PlatformIO* allows the developer to compile the same code with different
 development platforms using only *One Command*
-`platformio run <http://docs.platformio.org/en/latest/userguide/cmd_run.html>`_.
+`platformio run <http://docs.platformio.org/en/stable/userguide/cmd_run.html>`_.
 This happens due to
-`Project Configuration File (platformio.ini) <http://docs.platformio.org/en/latest/projectconf.html>`_
+`Project Configuration File (platformio.ini) <http://docs.platformio.org/en/stable/projectconf.html>`_
 where you can setup different environments with specific options (platform
 type, firmware uploading settings, pre-built framework, build flags and many
 more).
@@ -182,7 +182,7 @@ Frameworks:
 * `SPL <http://platformio.org/frameworks/spl>`_
 * `WiringPi <http://platformio.org/frameworks/wiringpi>`_
 
-For further details, please refer to `What is PlatformIO? <http://docs.platformio.org/en/latest/faq.html#what-is-platformio>`_
+For further details, please refer to `What is PlatformIO? <http://docs.platformio.org/en/stable/faq.html#what-is-platformio>`_
 
 Contributing
 ------------

docs/ide/atom.rst

@@ -37,7 +37,7 @@ can customize to do anything but also use productively without ever touching a
 config file.
 
 .. image:: ../_static/ide-atom-platformio.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio.png
 
 .. contents::
 
@@ -71,9 +71,10 @@ on the "Customize" stage, otherwise ``python`` command will not be available.
 2. Clang for Intelligent Code Autocompletion
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-PlatformIO IDE uses `clang <http://clang.llvm.org>`_ for the Intelligent Code Autocompletion.
-To check that ``clang`` is available in your system, please open
-Terminal and run ``clang --version``. If ``clang`` is not installed, then install it:
+PlatformIO IDE uses `clang <http://clang.llvm.org>`_ for the Intelligent Code
+Autocompletion. To check that ``clang`` is available in your system, please
+open Terminal and run ``clang --version``. If ``clang`` is not installed,
+then install it and restart Atom:
 
 - **Mac OS X**: `Install the latest Xcode <https://developer.apple.com/xcode/download/>`_
   along with the latest Command Line Tools
@@ -84,6 +85,12 @@ Terminal and run ``clang --version``. If ``clang`` is not installed, then instal
 
   .. image:: ../_static/clang-installer-add-path.png
 
+  .. warning::
+      If you see ``Failed to find MSBuild toolsets directory`` error in
+      the installation console, please ignore it and press any key to close
+      this window. PlatformIO IDE uses only Clang completion engine that
+      should work after it without any problems.
+
 - **Linux**: Using package managers: ``apt-get install clang`` or ``yum install clang``.
 - **Other Systems**: Download the latest `Clang for the other systems <http://llvm.org/releases/download.html>`_.
 
@@ -137,30 +144,30 @@ Setting Up the Project
    the corresponding icon in the PlatformIO toolbar as shown in the image below:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-1.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-1.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-1.png
 
 2. In the "New Project Menu" choose desired boards (more than one board is
    allowed) and select a project directory. Then press "Initialize" button:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-2.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-2.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-2.png
 
 3. If everything is fine, you should see the success message and project tree
    in the left panel:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-3.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-3.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-3.png
 
 4. Now, let's create the first project source file: right-click on the folder
    ``src`` and choose ``New File``:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-4.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-4.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-4.png
 
 Enter filename ``main.cpp``:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-5.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-5.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-5.png
 
 Copy the next source code to the just created file ``main.cpp``:
 
@@ -202,13 +209,13 @@ upload firmware, run other targets) using:
     - :ref:`ide_atom_building_targets` and hotkeys
 
 .. image:: ../_static/ide-atom-platformio-quick-start-6.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-6.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-6.png
 
 5. Run ``Build`` and you should see green "success" result in the building
    panel:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-7.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-7.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-7.png
 
 To upload firmware to the board run ``Upload``.
 
@@ -217,39 +224,39 @@ To upload firmware to the board run ``Upload``.
    or call targets list from the status bar (bottom, left corner):
 
 .. image:: ../_static/ide-atom-platformio-quick-start-8.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-8.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-8.png
 
 And select desired target:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-9.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-9.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-9.png
 
 7. To run built-in terminal interface choose ``Menu: PlatformIO > Terminal`` or
    press the corresponding icon in the PlatformIO toolbar:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-10.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-10.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-10.png
 
 It provides you fast access to all set of powerful PlatformIO CLI commands:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-11.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-11.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-11.png
 
 8. To run built-in "Serial Monitor" choose ``Menu: PlatformIO > Serial Monitor``
    or press the corresponding icon in the PlatformIO toolbar:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-12.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-12.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-12.png
 
 It has several settings to adjust your connection:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-13.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-13.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-13.png
 
 And allows you to communicate with your board in an easy way:
 
 .. image:: ../_static/ide-atom-platformio-quick-start-14.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio-quick-start-14.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-atom-platformio-quick-start-14.png
 
 
 User Guide

docs/ide/clion.rst

@@ -24,7 +24,7 @@ Refer to the `CLion Documentation <https://www.jetbrains.com/clion/documentation
 page for more detailed information.
 
 .. image:: ../_static/ide-platformio-clion.png
-    :target: http://docs.platformio.org/en/latest/_static/ide-platformio-clion.png
+    :target: http://docs.platformio.org/en/stable/_static/ide-platformio-clion.png
 
 .. contents::
 

docs/ide/codeblocks.rst

@@ -14,16 +14,16 @@
 CodeBlocks
 ==========
 
-Code::Blocks is a free, open-source cross-platform IDE that supports multiple 
-compilers including GCC, Clang and Visual C++. It is developed in C++ using 
-wxWidgets as the GUI toolkit. Using a plugin architecture, its capabilities 
-and features are defined by the provided plugins. Currently, Code::Blocks is 
+Code::Blocks is a free, open-source cross-platform IDE that supports multiple
+compilers including GCC, Clang and Visual C++. It is developed in C++ using
+wxWidgets as the GUI toolkit. Using a plugin architecture, its capabilities
+and features are defined by the provided plugins. Currently, Code::Blocks is
 oriented towards C, C++, and Fortran.
 
 CodeBlocks IDE can be downloaded from `here <http://www.codeblocks.org/downloads>`_.
 
 .. image:: ../_static/ide-platformio-codeblocks.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-platformio-codeblocks.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-platformio-codeblocks.png
 
 .. contents::
 

docs/ide/eclipse.rst

@@ -28,7 +28,7 @@ Refer to the `CDT Documentation <https://eclipse.org/cdt/documentation.php>`_
 page for more detailed information.
 
 .. image:: ../_static/ide-platformio-eclipse.png
-    :target: http://docs.platformio.org/en/latest/_static/ide-platformio-eclipse.png
+    :target: http://docs.platformio.org/en/stable/_static/ide-platformio-eclipse.png
 
 .. contents::
 

docs/ide/emacs.rst

@@ -23,7 +23,7 @@ Refer to the `Emacs Documentation <https://www.gnu.org/software/emacs/#Manuals>`
 page for more detailed information.
 
 .. image:: ../_static/ide-platformio-emacs.png
-    :target: http://docs.platformio.org/en/latest/_static/ide-platformio-emacs.png
+    :target: http://docs.platformio.org/en/stable/_static/ide-platformio-emacs.png
 
 .. contents::
 

docs/ide/netbeans.rst

@@ -26,7 +26,7 @@ Just make sure you download the C/C++ version (or if you already use NetBeans,
 install the C/C++ development plugins).
 
 .. image:: ../_static/ide-platformio-netbeans.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-platformio-netbeans.png
+    :target: http://docs.platformio.org/en/stable/_images/ide-platformio-netbeans.png
 
 .. contents::