Merge branch 'hotfix/v2.1.2'

Add Silicon Labs EFM32 development platform // Resolve #226

.travis.yml

@@ -1,7 +1,3 @@
-cache:
-    directories:
-        - $HOME/.platformio
-
 language: python
 python:
     - "2.7"

HISTORY.rst

@@ -1,7 +1,46 @@
 Release History
 ===============
 
-2.0.1 (2015-??-??)
+2.1.2 (2015-06-21)
+------------------
+
+* Fixed broken link to SCons installer
+
+
+2.1.1 (2015-06-09)
+------------------
+
+* Automatically detect upload port using VID:PID board settings
+  (`issue #231 <https://github.com/platformio/platformio/issues/231>`_)
+* Improved detection of build changes
+* Avoided ``LibInstallDependencyError`` when more then 1 library is found
+  (`issue #229 <https://github.com/platformio/platformio/issues/229>`_)
+
+2.1.0 (2015-06-03)
+------------------
+
+* Added Silicon Labs EFM32 `siliconlabsefm32 <http://docs.platformio.org/en/latest/platforms/siliconlabsefm32.html>`_
+  development platform
+  (`issue #226 <https://github.com/platformio/platformio/issues/226>`_)
+* Integrate PlatformIO with `Circle CI <https://circleci.com>`_ and
+  `Shippable CI <https://shippable.com>`_
+* Described in documentation how to `create/register own board <http://docs.platformio.org/en/latest/platforms/creating_board.html>`_ for PlatformIO
+* Disabled "nano.specs" for ARM-based platforms
+  (`issue #219 <https://github.com/platformio/platformio/issues/219>`_)
+* Fixed "ConnectionError" when PlatformIO SF Storage is off-line
+* Fixed resolving of C/C++ std libs by Eclipse IDE
+  (`issue #220 <https://github.com/platformio/platformio/issues/220>`_)
+* Fixed firmware uploading using USB programmer (USBasp) for
+  `atmelavr <http://docs.platformio.org/en/latest/platforms/atmelavr.html>`_
+  platform
+  (`issue #221 <https://github.com/platformio/platformio/issues/221>`_)
+
+2.0.2 (2015-05-27)
+------------------
+
+* Fixed libraries order for "Library Dependency Finder" under Linux OS
+
+2.0.1 (2015-05-27)
 ------------------
 
 * Handle new environment variables

README.rst

@@ -7,21 +7,29 @@ PlatformIO
 .. image:: https://ci.appveyor.com/api/projects/status/dku0h2rutfj0ctls/branch/develop?svg=true
     :target: https://ci.appveyor.com/project/ivankravets/platformio
     :alt: AppVeyor.CI Build Status
+.. image:: https://api.shippable.com/projects/555b0ceeedd7f2c052f3c2d0/badge?branchName=develop
+    :target: https://app.shippable.com/projects/555b0ceeedd7f2c052f3c2d0
+    :alt: Shippable Build Status
+.. image:: https://circleci.com/gh/platformio/platformio/tree/develop.svg?style=svg
+    :target: https://circleci.com/gh/platformio/platformio/tree/develop
+    :alt: Circle.CI Build Status
 .. image:: https://gemnasium.com/platformio/platformio.png
     :target: https://gemnasium.com/platformio/platformio
     :alt: Dependency Status
-.. image:: https://pypip.in/version/platformio/badge.png?style=flat
+.. image:: https://img.shields.io/pypi/v/platformio.svg
     :target: https://pypi.python.org/pypi/platformio/
     :alt: Latest Version
-.. image:: https://pypip.in/download/platformio/badge.png?style=flat
+.. image:: https://img.shields.io/pypi/dm/platformio.svg
     :target: https://pypi.python.org/pypi/platformio/
     :alt: Downloads
-.. image:: https://pypip.in/license/platformio/badge.png?style=flat
+.. image:: https://img.shields.io/pypi/l/platformio.svg
     :target: https://pypi.python.org/pypi/platformio/
     :alt:  License
 .. image:: https://badges.gitter.im/Join%20Chat.svg
    :alt: Join the chat at https://gitter.im/platformio/platformio
    :target: https://gitter.im/platformio/platformio
+.. image:: https://www.openhub.net/p/platformio/widgets/project_thin_badge.gif
+   :target: https://www.openhub.net/p/platformio
 
 `Website + Library Search <http://platformio.org>`_ |
 `Documentation <http://docs.platformio.org>`_ |
@@ -31,7 +39,8 @@ PlatformIO
 `Twitter <https://twitter.com/PlatformIO_Org>`_
 
 *Atmel AVR & SAM, Espressif, Freescale Kinetis, Nordic nRF51, NXP LPC,
-ST STM32, TI MSP430 & Tiva, Teensy, Arduino, mbed, libOpenCM3, etc.*
+Silicon Labs EFM32, ST STM32, TI MSP430 & Tiva, Teensy, Arduino, mbed,
+libOpenCM3, etc.*
 
 .. image:: https://raw.githubusercontent.com/platformio/platformio/develop/docs/_static/platformio-logo.png
     :target: http://platformio.org
@@ -136,6 +145,7 @@ It has support for the most popular embedded platforms:
 * `Nordic nRF51 <http://platformio.org/#!/platforms/nordicnrf51>`_
 * `NXP LPC <http://platformio.org/#!/platforms/nxplpc>`_
 * `ST STM32 <http://platformio.org/#!/platforms/ststm32>`_
+* `Silicon Labs EFM32 <http://platformio.org/#!/platforms/siliconlabsefm32>`_
 * `Teensy <http://platformio.org/#!/platforms/teensy>`_
 * `TI MSP430 <http://platformio.org/#!/platforms/timsp430>`_
 * `TI TIVA C <http://platformio.org/#!/platforms/titiva>`_

circle.yml

@@ -0,0 +1,20 @@
+machine:
+    python:
+        version: 2.7
+    environment:
+        TOX_ENV: docs
+        TOX_ENV: lint
+        TOX_ENV: py26
+        TOX_ENV: py27
+
+checkout:
+    post:
+        - git submodule update --init
+
+dependencies:
+    pre:
+        - pip install tox
+
+test:
+    override:
+        - tox -e $TOX_ENV

docs/articles.rst

@@ -9,6 +9,7 @@ Articles about us
 
 Here are recent articles about PlatformIO:
 
+* Jun 02, 2015 - **Alejandro Guirao Rodriguez** - `Discovering PlatformIO: The RaspberryPi / Arduino combo kit is a winner option when prototyping an IoT-style project <http://lekum.org/posts/discovering-platformio.html>`_
 * May 11, 2015 - **IT Hare** - `From Web Developer to Embedded One: Interview with Ivan Kravets, The Guy Behind PlatformIO. Part II <http://ithare.com/from-web-developer-to-embedded-one-interview-with-ivan-kravets-the-guy-behind-platformio-part-ii/>`_
 * May 4, 2015 - **IT Hare** - `From Web Developer to Embedded One: Interview with Ivan Kravets, The Guy Behind PlatformIO. Part I <http://ithare.com/from-web-development-to-embedded-one-interview-with-ivan-kravets-the-guy-behind-platformio-part-i/>`_
 * April 17, 2015 - **Michael Ball** - `PlatformIO - A Cross-Platform Code Builder and Missing Library Manager <http://arduino-pi.blogspot.com.es/2015/04/platformio-cross-platform-code-builder.html>`_

docs/ci/circleci.rst

@@ -30,9 +30,9 @@ Put ``circle.yml`` to the root directory of the GitHub repository.
 
     machine:
         environment:
-            - PLATFORMIO_CI_SRC=path/to/source/file.c
-            - PLATFORMIO_CI_SRC=path/to/source/file.ino
-            - PLATFORMIO_CI_SRC=path/to/source/directory
+            PLATFORMIO_CI_SRC: path/to/source/file.c
+            PLATFORMIO_CI_SRC: path/to/source/file.ino
+            PLATFORMIO_CI_SRC: path/to/source/directory
 
     dependencies:
         pre:

docs/frameworks/mbed.rst

@@ -25,6 +25,9 @@ Platforms
     * - :ref:`platform_nxplpc`
       - The NXP LPC is a family of 32-bit microcontroller integrated circuits by NXP Semiconductors. The LPC chips are grouped into related series that are based around the same 32-bit ARM processor core, such as the Cortex-M4F, Cortex-M3, Cortex-M0+, or Cortex-M0. Internally, each microcontroller consists of the processor core, static RAM memory, flash memory, debugging interface, and various peripherals.
 
+    * - :ref:`platform_siliconlabsefm32`
+      - 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.
+
     * - :ref:`platform_ststm32`
       - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
 
@@ -480,6 +483,54 @@ SeeedStudio
       - 512 Kb
       - 32 Kb
 
+Silicon Labs
+~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``efm32gg_stk3700``
+      - `Silicon Labs EFM32GG-STK3700 (Giant Gecko) <https://developer.mbed.org/platforms/EFM32-Giant-Gecko/>`_
+      - EFM32GG990F1024
+      - 48 MHz
+      - 1024 Kb
+      - 128 Kb
+
+    * - ``efm32hg_stk3400``
+      - `Silicon Labs SLSTK3400A USB-enabled (Happy Gecko) <https://developer.mbed.org/platforms/EFM32-Happy-Gecko/>`_
+      - EFM32HG322F64
+      - 24 MHz
+      - 64 Kb
+      - 8 Kb
+
+    * - ``efm32lg_stk3600``
+      - `Silicon Labs EFM32LG-STK3600 (Leopard Gecko) <https://developer.mbed.org/platforms/EFM32-Leopard-Gecko/>`_
+      - EFM32LG990F256
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
+    * - ``efm32wg_stk3800``
+      - `Silicon Labs EFM32WG-STK3800 (Wonder Gecko) <https://developer.mbed.org/platforms/EFM32-Wonder-Gecko/>`_
+      - EFM32WG990F256
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
+    * - ``efm32zg_stk3200``
+      - `Silicon Labs EFM32ZG-STK3200 (Zero Gecko) <https://developer.mbed.org/platforms/EFM32-Zero-Gecko/>`_
+      - EFM2ZG222F32
+      - 24 MHz
+      - 32 Kb
+      - 4 Kb
+
 Solder Splash Labs
 ~~~~~~~~~~~~~~~~~~
 

docs/index.rst

@@ -1,8 +1,9 @@
 PlatformIO: A cross-platform code builder and the missing library manager
 =========================================================================
 
-*Atmel AVR & SAM, Espressif, Freescale Kinetis, Nordic nRF51, NXP LPC, ST STM32,
-TI MSP430 & Tiva, Teensy, Arduino, mbed, libOpenCM3, etc.*
+*Atmel AVR & SAM, Espressif, Freescale Kinetis, Nordic nRF51, NXP LPC,
+Silicon Labs EFM32, ST STM32, TI MSP430 & Tiva, Teensy, Arduino, mbed,
+libOpenCM3, etc.*
 
 .. image:: _static/platformio-logo.png
     :target: http://platformio.org

docs/platforms/creating_board.rst

@@ -0,0 +1,62 @@
+.. _board_creating:
+
+Creating Board
+==============
+
+*PlatformIO* has pre-built settings for the most popular embedded boards. This
+list is available:
+
+* `Embedded Boards Explorer <http://platformio.org/#!/boards>`_ (Web)
+* :ref:`cmd_boards` (CLI command)
+
+Nevertheless, PlatformIO allows to create own board or override existing
+board's settings. All data is declared using
+`JSON-style <http://en.wikipedia.org/wiki/JSON>`_ via
+`associative array <http://en.wikipedia.org/wiki/Associative_array>`_
+(name/value pairs).
+
+.. contents::
+
+JSON Structure
+--------------
+
+The key fields:
+
+* ``build`` data will be used by :ref:`Platforms <platforms>` and
+  :ref:`frameworks` builders
+* ``frameworks`` is the list with supported :ref:`frameworks`
+* ``platform`` main type of :ref:`Platforms <platforms>`
+* ``upload`` upload settings which depend on the ``platform``
+
+.. code-block:: json
+
+    {
+        "myboard": {
+            "build": {},
+            "frameworks": ["%LIST_WITH_SUPPORTED_FRAMEWORKS%"],
+            "name": "My test board",
+            "platform": "%PLATFORM_TYPE_HERE%",
+            "upload": {},
+            "url": "http://example.com",
+            "vendor": "My Company Ltd."
+        }
+    }
+
+Installation
+------------
+
+1. Create ``boards`` directory in :ref:`projectconf_pio_home_dir` if it
+   doesn't exist.
+2. Create ``my_own_boards.json`` file and put to ``boards`` directory.
+3. Search available boards via :ref:`cmd_boards` command. You should see
+   ``myboard`` board.
+
+Now, you can use ``myboard`` for the :ref:`projectconf_env_board` option in
+:ref:`projectconf`.
+
+
+Examples
+--------
+
+For the examples, please look into built-in ``*.json`` files with boards
+settings: https://github.com/platformio/platformio/tree/develop/platformio/boards.

docs/platforms/creating_platform.rst

@@ -292,7 +292,7 @@ Installation
 ------------
 
 1. Create ``platforms`` directory in :ref:`projectconf_pio_home_dir` if it
-   doesn't exists.
+   doesn't exist.
 2. Copy ``test.py`` and ``test-builder.py`` files to ``platforms`` directory.
 3. Search available platforms via :ref:`cmd_platforms_search` command. You should see
    ``test`` platform.

docs/platforms/index.rst

@@ -20,8 +20,10 @@ MCU, upload protocol or etc. Please use ``board`` option.
     freescalekinetis
     nordicnrf51
     nxplpc
+    siliconlabsefm32
     ststm32
     teensy
     timsp430
     titiva
     creating_platform
+    creating_board

docs/platforms/siliconlabsefm32.rst

@@ -0,0 +1,98 @@
+.. _platform_siliconlabsefm32:
+
+Platform ``siliconlabsefm32``
+=============================
+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.
+
+For more detailed information please visit `vendor site <http://www.silabs.com/products/mcu/32-bit/efm32-gecko/Pages/efm32-gecko.aspx>`_.
+
+.. contents::
+
+Packages
+--------
+
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Contents
+
+    * - ``framework-mbed``
+      - `mbed Framework <http://mbed.org>`_
+
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
+
+.. warning::
+    **Linux Users:** Don't forget to install "udev" rules file
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+
+
+
+Frameworks
+----------
+.. list-table::
+    :header-rows:  1
+
+    * - Name
+      - Description
+
+    * - :ref:`framework_mbed`
+      - The mbed framework The mbed SDK has been designed to provide enough hardware abstraction to be intuitive and concise, yet powerful enough to build complex projects. It is built on the low-level ARM CMSIS APIs, allowing you to code down to the metal if needed. In addition to RTOS, USB and Networking libraries, a cookbook of hundreds of reusable peripheral and module libraries have been built on top of the SDK by the mbed Developer Community.
+
+Boards
+------
+
+.. note::
+    * You can list pre-configured boards by :ref:`cmd_boards` command or
+      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+    * For more detailed ``board`` information please scroll tables below by
+      horizontal.
+
+Silicon Labs
+~~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``efm32gg_stk3700``
+      - `Silicon Labs EFM32GG-STK3700 (Giant Gecko) <https://developer.mbed.org/platforms/EFM32-Giant-Gecko/>`_
+      - EFM32GG990F1024
+      - 48 MHz
+      - 1024 Kb
+      - 128 Kb
+
+    * - ``efm32hg_stk3400``
+      - `Silicon Labs SLSTK3400A USB-enabled (Happy Gecko) <https://developer.mbed.org/platforms/EFM32-Happy-Gecko/>`_
+      - EFM32HG322F64
+      - 24 MHz
+      - 64 Kb
+      - 8 Kb
+
+    * - ``efm32lg_stk3600``
+      - `Silicon Labs EFM32LG-STK3600 (Leopard Gecko) <https://developer.mbed.org/platforms/EFM32-Leopard-Gecko/>`_
+      - EFM32LG990F256
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
+    * - ``efm32wg_stk3800``
+      - `Silicon Labs EFM32WG-STK3800 (Wonder Gecko) <https://developer.mbed.org/platforms/EFM32-Wonder-Gecko/>`_
+      - EFM32WG990F256
+      - 48 MHz
+      - 256 Kb
+      - 32 Kb
+
+    * - ``efm32zg_stk3200``
+      - `Silicon Labs EFM32ZG-STK3200 (Zero Gecko) <https://developer.mbed.org/platforms/EFM32-Zero-Gecko/>`_
+      - EFM2ZG222F32
+      - 24 MHz
+      - 32 Kb
+      - 4 Kb

examples/mbed/mbed-blink/platformio.ini

@@ -47,3 +47,9 @@ board = nucleo_f401re
 platform = teensy
 framework = mbed
 board = teensy31
+
+# Silicon Labs EFM32 Platform
+[env:siliconlabsefm32]
+platform = siliconlabsefm32
+framework = mbed
+board = efm32hg_stk3400

platformio/__init__.py

@@ -1,14 +1,14 @@
 # Copyright (C) Ivan Kravets <me@ikravets.com>
 # See LICENSE for details.
 
-VERSION = (2, 0, 1)
+VERSION = (2, 1, 2)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
 __description__ = ("A cross-platform code builder and the missing library "
                    "manager (Atmel AVR & SAM, Espressif, Freescale Kinetis, "
-                   "Nordic nRF51, NXP LPC, ST STM32, TI MSP430 & Tiva, "
-                   "Teensy, Arduino, mbed, libOpenCM3, etc.)")
+                   "Nordic nRF51, NXP LPC, Silicon Labs EFM32, ST STM32, "
+                   "TI MSP430 & Tiva, Teensy, Arduino, mbed, libOpenCM3, etc)")
 __url__ = "http://platformio.org"
 
 __author__ = "Ivan Kravets"

platformio/boards/siliconlabsefm32.json

@@ -0,0 +1,86 @@
+{
+    "efm32wg_stk3800": {
+        "build": {
+            "f_cpu": "48000000L",
+            "cpu": "cortex-m4",
+            "mcu": "efm32wg990f256"
+        },
+        "frameworks": ["mbed"],
+        "name": "Silicon Labs EFM32WG-STK3800 (Wonder Gecko)",
+        "platform": "siliconlabsefm32",
+        "upload": {
+            "maximum_ram_size": 32768,
+            "maximum_size": 262144
+        },
+        "url": "https://developer.mbed.org/platforms/EFM32-Wonder-Gecko/",
+        "vendor": "Silicon Labs"
+    },
+
+    "efm32gg_stk3700": {
+        "build": {
+            "f_cpu": "48000000L",
+            "cpu": "cortex-m3",
+            "mcu": "efm32gg990f1024"
+        },
+        "frameworks": ["mbed"],
+        "name": "Silicon Labs EFM32GG-STK3700 (Giant Gecko)",
+        "platform": "siliconlabsefm32",
+        "upload": {
+            "maximum_ram_size": 131072,
+            "maximum_size": 1048576
+        },
+        "url": "https://developer.mbed.org/platforms/EFM32-Giant-Gecko/",
+        "vendor": "Silicon Labs"
+    },
+
+    "efm32lg_stk3600": {
+        "build": {
+            "f_cpu": "48000000L",
+            "cpu": "cortex-m3",
+            "mcu": "efm32lg990f256"
+        },
+        "frameworks": ["mbed"],
+        "name": "Silicon Labs EFM32LG-STK3600 (Leopard Gecko)",
+        "platform": "siliconlabsefm32",
+        "upload": {
+            "maximum_ram_size": 32768,
+            "maximum_size": 262144
+        },
+        "url": "https://developer.mbed.org/platforms/EFM32-Leopard-Gecko/",
+        "vendor": "Silicon Labs"
+    },
+
+    "efm32zg_stk3200": {
+        "build": {
+            "f_cpu": "24000000L",
+            "cpu": "cortex-m0plus",
+            "mcu": "efm2zg222f32"
+        },
+        "frameworks": ["mbed"],
+        "name": "Silicon Labs EFM32ZG-STK3200 (Zero Gecko)",
+        "platform": "siliconlabsefm32",
+        "upload": {
+            "maximum_ram_size": 4096,
+            "maximum_size": 32768
+        },
+        "url": "https://developer.mbed.org/platforms/EFM32-Zero-Gecko/",
+        "vendor": "Silicon Labs"
+    },
+
+    "efm32hg_stk3400": {
+        "build": {
+            "f_cpu": "24000000L",
+            "cpu": "cortex-m3",
+            "mcu": "efm32hg322f64"
+        },
+        "frameworks": ["mbed"],
+        "name": "Silicon Labs SLSTK3400A USB-enabled (Happy Gecko)",
+        "platform": "siliconlabsefm32",
+        "upload": {
+            "maximum_ram_size": 8192,
+            "maximum_size": 65536
+        },
+        "url": "https://developer.mbed.org/platforms/EFM32-Happy-Gecko/",
+        "vendor": "Silicon Labs"
+    }
+}

platformio/builder/main.py

@@ -11,7 +11,7 @@ except ImportError:
             break
     from platformio import util
 
-from os.path import join
+from os.path import isfile, join
 from time import time
 
 from SCons.Script import (DefaultEnvironment, Exit, SConscript,
@@ -63,6 +63,7 @@ DefaultEnvironment(
 
     PIOHOME_DIR=util.get_home_dir(),
     PROJECT_DIR=util.get_project_dir(),
+    PROJECTLIB_DIR=util.get_projectlib_dir(),
     PROJECTSRC_DIR=util.get_projectsrc_dir(),
     PIOENVS_DIR=util.get_pioenvs_dir(),
 
@@ -71,7 +72,7 @@ DefaultEnvironment(
 
     BUILD_DIR=join("$PIOENVS_DIR", "$PIOENV"),
     LIBSOURCE_DIRS=[
-        join("$PROJECT_DIR", "lib"),
+        "$PROJECTLIB_DIR",
         util.get_lib_dir(),
         join("$PLATFORMFW_DIR", "libraries")
     ]
@@ -97,9 +98,11 @@ if "BOARD" in env:
             UPLOAD_SPEED="${BOARD_OPTIONS['upload'].get('speed', None)}")
     if "ldscript" in env.get("BOARD_OPTIONS", {}).get("build", {}):
         env.Replace(
-            LDSCRIPT_PATH=join(
-                "$PIOHOME_DIR", "packages", "ldscripts",
-                "${BOARD_OPTIONS['build']['ldscript']}"
+            LDSCRIPT_PATH=(
+                env['BOARD_OPTIONS']['build']['ldscript']
+                if isfile(env['BOARD_OPTIONS']['build']['ldscript'])
+                else join("$PIOHOME_DIR", "packages", "ldscripts",
+                          "${BOARD_OPTIONS['build']['ldscript']}")
             )
         )
 

platformio/builder/scripts/atmelavr.py

@@ -20,14 +20,18 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
         with open(path, "w") as f:
             f.write(str(value))
 
+    if "micronucleus" in env['UPLOADER']:
+        print "Please unplug/plug device ..."
+
     upload_options = env.get("BOARD_OPTIONS", {}).get("upload", {})
 
+    if "usb" in env.subst("$UPLOAD_PROTOCOL"):
+        upload_options['require_upload_port'] = False
+        env.Replace(UPLOAD_SPEED=None)
+
     if env.subst("$UPLOAD_SPEED"):
         env.Append(UPLOADERFLAGS=["-b", "$UPLOAD_SPEED"])
 
-    if "micronucleus" in env['UPLOADER']:
-        print "Please unplug/plug device ..."
-
     if not upload_options.get("require_upload_port", False):
         return
 
@@ -74,7 +78,6 @@ else:
         UPLOADER=join("$PIOPACKAGES_DIR", "tool-avrdude", "avrdude"),
         UPLOADERFLAGS=[
             "-v",
-            "-D",  # disable auto erase for flash memory
             "-p", "$BOARD_MCU",
             "-C",
             '"%s"' % join("$PIOPACKAGES_DIR", "tool-avrdude", "avrdude.conf"),

platformio/builder/scripts/basearm.py

@@ -47,8 +47,7 @@ env.Replace(
         "-Os",
         "-Wl,--gc-sections,--relax",
         "-mthumb",
-        "-mcpu=${BOARD_OPTIONS['build']['cpu']}",
-        "--specs=nano.specs"
+        "-mcpu=${BOARD_OPTIONS['build']['cpu']}"
     ],
 
     LIBS=["c", "gcc", "m"],

platformio/builder/scripts/frameworks/arduino.py

@@ -161,7 +161,7 @@ if BOARD_BUILDOPTS.get("core", None) == "teensy":
     # search relative includes in teensy directories
     core_dir = join(env.get("PIOHOME_DIR"), "packages",
                     "framework-arduinoteensy", "cores", "teensy")
-    for item in listdir(core_dir):
+    for item in sorted(listdir(core_dir)):
         file_path = join(core_dir, item)
         if not isfile(file_path):
             continue

platformio/builder/scripts/frameworks/libopencm3.py

@@ -32,7 +32,7 @@ BOARD_BUILDOPTS = env.get("BOARD_OPTIONS", {}).get("build", {})
 def find_ldscript(src_dir):
     ldscript = None
     matches = []
-    for item in listdir(src_dir):
+    for item in sorted(listdir(src_dir)):
         _path = join(src_dir, item)
         if not isfile(_path) or not item.endswith(".ld"):
             continue

platformio/builder/scripts/siliconlabsefm32.py

@@ -0,0 +1,50 @@
+# Copyright (C) Ivan Kravets <me@ikravets.com>
+# See LICENSE for details.
+
+"""
+    Builder for Silicon Labs EFM32 series ARM microcontrollers.
+"""
+
+from os.path import join
+
+from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Default,
+                          DefaultEnvironment, SConscript)
+
+env = DefaultEnvironment()
+
+SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
+
+#
+# Target: Build executable and linkable firmware
+#
+
+target_elf = env.BuildFirmware()
+
+#
+# Target: Build the .bin file
+#
+
+if "uploadlazy" in COMMAND_LINE_TARGETS:
+    target_firm = join("$BUILD_DIR", "firmware.bin")
+else:
+    target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
+
+#
+# Target: Print binary size
+#
+
+target_size = env.Alias("size", target_elf, "$SIZEPRINTCMD")
+AlwaysBuild(target_size)
+
+#
+# Target: Upload by default .bin file
+#
+
+upload = env.Alias(["upload", "uploadlazy"], target_firm, env.UploadToDisk)
+AlwaysBuild(upload)
+
+#
+# Target: Define targets
+#
+
+Default([target_firm, target_size])

platformio/builder/tools/pioupload.py

@@ -69,18 +69,25 @@ def AutodetectUploadPort(env):
             if (not item['name'] or
                     not any([l in item['name'].lower() for l in msdlabels])):
                 continue
-            print "Auto-detected UPLOAD_PORT/DISK: %s" % item['disk']
             env.Replace(UPLOAD_PORT=item['disk'])
             break
     else:
+        board_build_opts = env.get("BOARD_OPTIONS", {}).get("build", {})
+        board_hwid = ("%s:%s" % (
+            board_build_opts.get("vid"),
+            board_build_opts.get("pid")
+        )).replace("0x", "")
+
         for item in get_serialports():
             if "VID:PID" not in item['hwid']:
                 continue
-            print "Auto-detected UPLOAD_PORT: %s" % item['port']
             env.Replace(UPLOAD_PORT=item['port'])
-            break
+            if board_hwid in item['hwid']:
+                break
 
-    if "UPLOAD_PORT" not in env:
+    if "UPLOAD_PORT" in env:
+        print "Auto-detected UPLOAD_PORT/DISK: %s" % env['UPLOAD_PORT']
+    else:
         Exit("Error: Please specify `upload_port` for environment or use "
              "global `--upload-port` option.\n"
              "For the some development platforms it can be USB flash drive\n")

platformio/builder/tools/platformio.py

@@ -207,7 +207,7 @@ def BuildDependentLibraries(env, src_dir):  # pylint: disable=R0914
                 if not isdir(lsd_dir):
                     continue
 
-                for ld in USE_LIBS + listdir(lsd_dir):
+                for ld in USE_LIBS + sorted(listdir(lsd_dir)):
                     if not isdir(join(lsd_dir, ld)):
                         continue
 
@@ -426,10 +426,14 @@ def DumpIDEData(env):
         data['includes'].append(env.subst(item[1]))
 
     # includes from toolchain
-    for item in glob(env.subst(
-            join("$PIOPACKAGES_DIR", "$PIOPACKAGE_TOOLCHAIN",
-                 "*", "include"))):
-        data['includes'].append(item)
+    toolchain_dir = env.subst(
+        join("$PIOPACKAGES_DIR", "$PIOPACKAGE_TOOLCHAIN"))
+    toolchain_incglobs = [
+        join(toolchain_dir, "*", "include"),
+        join(toolchain_dir, "lib", "gcc", "*", "*", "include")
+    ]
+    for g in toolchain_incglobs:
+        data['includes'].extend(glob(g))
 
     # global symbols
     for item in env.get("CPPDEFINES", []):

platformio/commands/lib.py

@@ -142,8 +142,23 @@ def lib_install_dependency(ctx, data):
             query.append('+"%s"' % data[key])
 
     result = get_api_result("/lib/search", dict(query=" ".join(query)))
-    assert result['total'] == 1
-    ctx.invoke(lib_install, libid=[result['items'][0]['id']])
+    assert result['total'] > 0
+
+    if result['total'] == 1 or not app.get_setting("enable_prompts"):
+        ctx.invoke(lib_install, libid=[result['items'][0]['id']])
+    else:
+        click.secho(
+            "Conflict: More then one dependent libraries have been found "
+            "by request %s:" % json.dumps(data), fg="red")
+
+        echo_liblist_header()
+        for item in result['items']:
+            echo_liblist_item(item)
+
+        deplib_id = click.prompt(
+            "Please choose one dependent library ID",
+            type=click.Choice([str(i['id']) for i in result['items']]))
+        ctx.invoke(lib_install, libid=[int(deplib_id)])
 
 
 @cli.command("uninstall", short_help="Uninstall libraries")

platformio/commands/run.py

@@ -2,8 +2,9 @@
 # See LICENSE for details.
 
 from datetime import datetime
-from os import getcwd
-from os.path import getmtime, isdir, join
+from hashlib import sha1
+from os import getcwd, makedirs, walk
+from os.path import getmtime, isdir, isfile, join
 from shutil import rmtree
 from time import time
 
@@ -38,12 +39,8 @@ def cli(ctx, environment, target, upload_port,  # pylint: disable=R0913,R0914
         if unknown:
             raise exception.UnknownEnvNames(", ".join(unknown))
 
-        # remove ".pioenvs" if project config is modified
-        _pioenvs_dir = util.get_pioenvs_dir()
-        if (isdir(_pioenvs_dir) and
-                getmtime(join(util.get_project_dir(), "platformio.ini")) >
-                getmtime(_pioenvs_dir)):
-            rmtree(_pioenvs_dir)
+        # clean obsolete .pioenvs dir
+        _clean_pioenvs_dir()
 
         results = []
         for section in config.sections():
@@ -176,3 +173,41 @@ def _autoinstall_libs(ctx, libids_list):
                 ", ".join([str(i) for i in not_intalled_libs])
             )):
         ctx.invoke(cmd_lib_install, libid=not_intalled_libs)
+
+
+def _clean_pioenvs_dir():
+    pioenvs_dir = util.get_pioenvs_dir()
+    structhash_file = join(pioenvs_dir, "structure.hash")
+    proj_hash = calculate_project_hash()
+
+    # if project's config is modified
+    if (isdir(pioenvs_dir) and
+            getmtime(join(util.get_project_dir(), "platformio.ini")) >
+            getmtime(pioenvs_dir)):
+        rmtree(pioenvs_dir)
+
+    # check project structure
+    if isdir(pioenvs_dir) and isfile(structhash_file):
+        with open(structhash_file) as f:
+            if f.read() == proj_hash:
+                return
+        rmtree(pioenvs_dir)
+
+    if not isdir(pioenvs_dir):
+        makedirs(pioenvs_dir)
+
+    with open(structhash_file, "w") as f:
+        f.write(proj_hash)
+
+
+def calculate_project_hash():
+    structure = []
+    for d in (util.get_projectsrc_dir(), util.get_projectlib_dir()):
+        if not isdir(d):
+            continue
+        for root, _, files in walk(d):
+            for f in files:
+                path = join(root, f)
+                if not any([s in path for s in (".git", ".svn")]):
+                    structure.append(path)
+    return sha1(",".join(sorted(structure))).hexdigest() if structure else ""

platformio/downloader.py

@@ -25,8 +25,11 @@ class FileDownloader(object):
         self._destination = self._fname
         if dest_dir:
             self.set_destination(join(dest_dir, self._fname))
-        self._progressbar = None
 
+        self._progressbar = None
+        self._request = None
+
+        # make connection
         self._request = requests.get(url, stream=True,
                                      headers=util.get_request_defheaders())
         if self._request.status_code != 200:
@@ -93,4 +96,5 @@ class FileDownloader(object):
         util.change_filemtime(self._destination, lmtime)
 
     def __del__(self):
-        self._request.close()
+        if self._request:
+            self._request.close()

platformio/ide/projectgenerator.py

@@ -23,8 +23,8 @@ class ProjectGenerator(object):
     @staticmethod
     def get_supported_ides():
         tpls_dir = join(util.get_source_dir(), "ide", "tpls")
-        return [d for d in listdir(tpls_dir)
-                if isdir(join(tpls_dir, d))]
+        return sorted([d for d in listdir(tpls_dir)
+                       if isdir(join(tpls_dir, d))])
 
     def get_project_env(self):
         data = {"env_name": "PlatformIO"}

platformio/libmanager.py

@@ -36,7 +36,7 @@ class LibraryManager(object):
         items = {}
         if not isdir(self.lib_dir):
             return items
-        for dirname in listdir(self.lib_dir):
+        for dirname in sorted(listdir(self.lib_dir)):
             conf_path = join(self.lib_dir, dirname, self.CONFIG_NAME)
             if not isfile(conf_path):
                 continue

platformio/pkgmanager.py

@@ -2,11 +2,12 @@
 # See LICENSE for details.
 
 from os import makedirs, remove
-from os.path import isdir, join
+from os.path import basename, isdir, isfile, join
 from shutil import rmtree
 from time import time
 
 import click
+import requests
 
 from platformio import exception, telemetry, util
 from platformio.app import get_state_item, set_state_item
@@ -85,7 +86,17 @@ class PackageManager(object):
         if not isdir(pkg_dir):
             makedirs(pkg_dir)
 
-        dlpath = self.download(info['url'], pkg_dir, info['sha1'])
+        dlpath = None
+        try:
+            dlpath = self.download(info['url'], pkg_dir, info['sha1'])
+        except requests.exceptions.ConnectionError:
+            if info['url'].startswith("http://sourceforge.net"):
+                dlpath = self.download(
+                    "http://dl.platformio.org/packages/%s" %
+                    basename(info['url']), pkg_dir, info['sha1'])
+
+        assert isfile(dlpath)
+
         if self.unpack(dlpath, pkg_dir):
             self._register(name, info['version'])
         # remove archive

platformio/platforms/base.py

@@ -139,7 +139,7 @@ class PlatformFactory(object):
             pdir = join(d, "platforms")
             if not isdir(pdir):
                 continue
-            for p in listdir(pdir):
+            for p in sorted(listdir(pdir)):
                 if (p in ("__init__.py", "base.py") or not
                         p.endswith(".py")):
                     continue

platformio/platforms/siliconlabsefm32.py

@@ -0,0 +1,36 @@
+# Copyright (C) Ivan Kravets <me@ikravets.com>
+# See LICENSE for details.
+
+from platformio.platforms.base import BasePlatform
+
+
+class Siliconlabsefm32Platform(BasePlatform):
+
+    """
+    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.
+
+    http://www.silabs.com/products/mcu/32-bit/efm32-gecko/Pages/efm32-gecko.aspx
+    """
+
+    PACKAGES = {
+
+        "toolchain-gccarmnoneeabi": {
+            "alias": "toolchain",
+            "default": True
+        },
+
+        "framework-mbed": {
+            "default": True
+        }
+    }
+
+    def get_name(self):
+        return "Silicon Labs EFM32"

platformio/telemetry.py

@@ -12,7 +12,7 @@ from time import time
 import click
 import requests
 
-from platformio import __version__, app, util
+from platformio import __version__, app, exception, util
 
 
 class TelemetryBase(object):
@@ -219,9 +219,11 @@ def on_event(category, action, label=None, value=None, screen_name=None):
 
 
 def on_exception(e):
+    if isinstance(e, exception.AbortedByUser):
+        return
     mp = MeasurementProtocol()
     mp['exd'] = "%s: %s" % (type(e).__name__, e)
-    mp['exf'] = 1
+    mp['exf'] = int(not isinstance(e, exception.PlatformioException))
     mp.send("exception")
 
 

platformio/util.py

@@ -167,6 +167,10 @@ def get_projectsrc_dir():
     )
 
 
+def get_projectlib_dir():
+    return join(get_project_dir(), "lib")
+
+
 def get_pioenvs_dir():
     return _get_projconf_option_dir(
         "envs_dir",
@@ -263,9 +267,7 @@ def get_logicaldisks():
 
 def get_request_defheaders():
     return {"User-Agent": "PlatformIO/%s CI/%d %s" % (
-        __version__,
-        1 if is_ci() else 0,
-        requests.utils.default_user_agent()
+        __version__, int(is_ci()), requests.utils.default_user_agent()
     )}
 
 
@@ -307,7 +309,7 @@ def _lookup_boards():
         bdirs.append(join(get_home_dir(), "boards"))
 
     for bdir in bdirs:
-        for json_file in os.listdir(bdir):
+        for json_file in sorted(os.listdir(bdir)):
             if not json_file.endswith(".json"):
                 continue
             with open(join(bdir, json_file)) as f:

requirements.txt

@@ -1,6 +1,5 @@
 click==4.0
-bottle=0.12.8
+bottle==0.12.8
 colorama==0.3.3
 pyserial==2.7
 requests==2.7.0
-scons==2.3.0

scripts/get-platformio.py

@@ -101,7 +101,8 @@ def main():
         ("Installing PlatformIO and dependencies", install_pypi_packages, [
             [["setuptools"], ["platformio"], [
                 "--egg",
-                "http://sourceforge.net/projects/scons/files/latest/download"
+                "http://sourceforge.net/projects/platformio-storage/files/"
+                "scons.zip/download"
             ]]
         ])
     ]

setup.py

@@ -51,6 +51,6 @@ setup(
         "Topic :: Software Development :: Compilers"
     ],
     keywords=("builder library manager atmel avr sam espressif esp freescale "
-              "kinetis nordic nrf51 nxp lpc st stm32 ti msp430 tiva teensy "
-              "arduino mbed libopencm3")
+              "kinetis nordic nrf51 nxp lpc silicon labs efm32 st stm32 ti "
+              "msp430 tiva teensy arduino mbed libopencm3")
 )

tests/test_examples.py

@@ -38,6 +38,8 @@ def test_run(platformio_setup, pioproject_dir):
     # check .elf file
     pioenvs_dir = join(pioproject_dir, ".pioenvs")
     for item in listdir(pioenvs_dir):
+        if not isdir(item):
+            continue
         assert isfile(join(pioenvs_dir, item, "firmware.elf"))
         # check .hex or .bin files
         firmwares = []

tests/test_pkgmanifest.py

@@ -54,14 +54,20 @@ def test_package(package_data, sfpkglist):
     assert package_data['url'].endswith("%d.tar.gz" % package_data['version'])
 
     # check content type and that file exists
-    r = requests.head(package_data['url'], allow_redirects=True)
+    try:
+        r = requests.head(package_data['url'], allow_redirects=True)
+        if 500 <= r.status_code <= 599:
+            raise requests.exceptions.ConnectionError()
+    except requests.exceptions.ConnectionError:
+        return pytest.skip("SF is off-line")
+
     validate_response(r)
     assert r.headers['Content-Type'] in ("application/x-gzip",
                                          "application/octet-stream")
 
     # check sha1 sum
     if sfpkglist is None:
-        return pytest.skip("SF is offline")
+        return pytest.skip("SF is off-line")
     pkgname = basename(package_data['url'])
     assert pkgname in sfpkglist
     assert package_data['sha1'] == sfpkglist.get(pkgname, {}).get("sha1")

tox.ini

@@ -11,7 +11,7 @@ deps =
     isort
     flake8
 commands =
-    pip install --egg http://sourceforge.net/projects/scons/files/latest/download
+    pip install --egg http://sourceforge.net/projects/platformio-storage/files/scons.zip/download
 
 [testenv:docs]
 basepython = python2.7
@@ -48,5 +48,5 @@ passenv = *
 deps = pytest
 commands =
     {envpython} --version
-    pip install --egg http://sourceforge.net/projects/scons/files/latest/download
+    pip install --egg http://sourceforge.net/projects/platformio-storage/files/scons.zip/download
     py.test -v --basetemp="{envtmpdir}" tests