Merge branch 'release/v2.1.0'

.travis.yml

@@ -1,11 +1,11 @@
 language: python
 python:
   - "2.7"
+  - "3.6"
 
 env:
   - PLATFORMIO_PROJECT_DIR=examples/arduino-blink
-  - PLATFORMIO_PROJECT_DIR=examples/energia-blink
-  - PLATFORMIO_PROJECT_DIR=examples/energia-internal-libs
+  - PLATFORMIO_PROJECT_DIR=examples/arduino-internal-libs
   - PLATFORMIO_PROJECT_DIR=examples/native-blink
 
 install:

appveyor.yml

@@ -3,14 +3,13 @@ environment:
 
   matrix:
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-blink"
-    - PLATFORMIO_PROJECT_DIR: "examples/energia-blink"
-    - PLATFORMIO_PROJECT_DIR: "examples/energia-internal-libs"
+    - PLATFORMIO_PROJECT_DIR: "examples/arduino-internal-libs"
     - PLATFORMIO_PROJECT_DIR: "examples/native-blink"
 
 install:
   - cmd: git submodule update --init --recursive
-  - cmd: SET PATH=%PATH%;C:\Python27\Scripts
-  - cmd: pip install -U https://github.com/platformio/platformio/archive/develop.zip
+  - cmd: SET PATH=%PATH%;C:\Python36\Scripts
+  - cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
   - cmd: platformio platform install file://.
 
 test_script:

boards/lpmsp430f5529.json

@@ -28,7 +28,7 @@
     }
   },
   "frameworks": [
-    "energia"
+    "arduino"
   ],
   "name": "TI LaunchPad MSP-EXP430F5529LP",
   "upload": {

boards/lpmsp430fr4133.json

@@ -28,7 +28,7 @@
     }
   },
   "frameworks": [
-    "energia"
+    "arduino"
   ],
   "name": "TI LaunchPad MSP-EXP430FR4133LP",
   "upload": {

boards/lpmsp430fr5739.json

@@ -48,7 +48,7 @@
     }
   },
   "frameworks": [
-    "energia"
+    "arduino"
   ],
   "name": "TI FraunchPad MSP-EXP430FR5739LP",
   "upload": {

boards/lpmsp430fr5969.json

@@ -28,7 +28,7 @@
     }
   },
   "frameworks": [
-    "energia"
+    "arduino"
   ],
   "name": "TI LaunchPad MSP-EXP430FR5969LP",
   "upload": {

boards/lpmsp430fr6989.json

@@ -28,7 +28,7 @@
     }
   },
   "frameworks": [
-    "energia"
+    "arduino"
   ],
   "name": "TI LaunchPad MSP-EXP430FR6989LP",
   "upload": {

boards/lpmsp430g2553.json

@@ -48,7 +48,7 @@
     }
   },
   "frameworks": [
-    "energia"
+    "arduino"
   ],
   "name": "TI LaunchPad MSP-EXP430G2553LP",
   "upload": {

builder/frameworks/energia.py

@@ -35,6 +35,7 @@
 FRAMEWORK_VERSION = platform.get_package_version("framework-energiamsp430")
 assert isdir(FRAMEWORK_DIR)
 
+
 env.Append(
     CPPDEFINES=[
         ("ARDUINO", 10805),

builder/main.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 from os.path import join
 from platform import system
 
@@ -101,12 +102,19 @@
 if env.get("PROGNAME", "program") == "program":
     env.Replace(PROGNAME="firmware")
 
+if "energia" in env.get("PIOFRAMEWORK", []):
+    sys.stderr.write(
+        "WARNING!!! Using of `framework = energia` in `platformio.ini` is "
+        "deprecated. Please replace with `framework = arduino`.\n")
+    env.Replace(PIOFRAMEWORK=["arduino"])
+
 #
 # Target: Build executable and linkable firmware
 #
 
 target_elf = None
 if "nobuild" in COMMAND_LINE_TARGETS:
+    target_elf = join("$BUILD_DIR", "${PROGNAME}.elf")
     target_firm = join("$BUILD_DIR", "${PROGNAME}.hex")
 else:
     target_elf = env.BuildProgram()

examples/arduino-blink/.gitignore

@@ -1,4 +1,2 @@
 .pioenvs
-.clang_complete
-.gcc-flags.json
-.pioenvs
+.piolibdeps

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/page/ci/index.html >
+# several times a day < https://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/page/ci/travis.html >
+#   < https://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
+#   < https://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment
@@ -35,13 +35,14 @@
 #
 # install:
 #     - pip install -U platformio
+#     - platformio update
 #
 # script:
 #     - platformio run
 
 
 #
-# Template #2: The project is intended to by used as a library with examples
+# Template #2: The project is intended to be used as a library with examples.
 #
 
 # language: python
@@ -60,6 +61,7 @@
 #
 # install:
 #     - pip install -U platformio
+#     - platformio update
 #
 # script:
 #     - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N

examples/arduino-blink/README.rst

@@ -28,5 +28,11 @@ How to build PlatformIO based project
     # Upload firmware
     > platformio run --target upload
 
+    # Build specific environment
+    > platformio run -e lpmsp430g2553
+
+    # Upload firmware for the specific environment
+    > platformio run -e lpmsp430g2553 --target upload
+
     # Clean build files
     > platformio run --target clean

examples/arduino-blink/include/README

@@ -0,0 +1,39 @@
+
+This directory is intended for project header files.
+
+A header file is a file containing C declarations and macro definitions
+to be shared between several project source files. You request the use of a
+header file in your project source file (C, C++, etc) located in `src` folder
+by including it, with the C preprocessing directive `#include'.
+
+```src/main.c
+
+#include "header.h"
+
+int main (void)
+{
+ ...
+}
+```
+
+Including a header file produces the same results as copying the header file
+into each source file that needs it. Such copying would be time-consuming
+and error-prone. With a header file, the related declarations appear
+in only one place. If they need to be changed, they can be changed in one
+place, and programs that include the header file will automatically use the
+new version when next recompiled. The header file eliminates the labor of
+finding and changing all the copies as well as the risk that a failure to
+find one copy will result in inconsistencies within a program.
+
+In C, the usual convention is to give header files names that end with `.h'.
+It is most portable to use only letters, digits, dashes, and underscores in
+header file names, and at most one dot.
+
+Read more about using header files in official GCC documentation:
+
+* Include Syntax
+* Include Operation
+* Once-Only Headers
+* Computed Includes
+
+https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

examples/arduino-blink/lib/README

@@ -0,0 +1,46 @@
+
+This directory is intended for project specific (private) libraries.
+PlatformIO will compile them to static libraries and link into executable file.
+
+The source code of each library should be placed in a an own separate directory
+("lib/your_library_name/[here are source files]").
+
+For example, see a structure of the following two libraries `Foo` and `Bar`:
+
+|--lib
+|  |
+|  |--Bar
+|  |  |--docs
+|  |  |--examples
+|  |  |--src
+|  |     |- Bar.c
+|  |     |- Bar.h
+|  |  |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
+|  |
+|  |--Foo
+|  |  |- Foo.c
+|  |  |- Foo.h
+|  |
+|  |- README --> THIS FILE
+|
+|- platformio.ini
+|--src
+   |- main.c
+
+and a contents of `src/main.c`:
+```
+#include <Foo.h>
+#include <Bar.h>
+
+int main (void)
+{
+  ...
+}
+
+```
+
+PlatformIO Library Dependency Finder will find automatically dependent
+libraries scanning project source files.
+
+More information about PlatformIO Library Dependency Finder
+- https://docs.platformio.org/page/librarymanager/ldf.html