Merge branch 'release/v3.6.0'

.travis.yml

@@ -8,7 +8,7 @@ env:
   - PLATFORMIO_PROJECT_DIR=examples/arduino-internal-libs
   - PLATFORMIO_PROJECT_DIR=examples/mbed-blink
   - PLATFORMIO_PROJECT_DIR=examples/mbed-dsp
-  - PLATFORMIO_PROJECT_DIR=examples/mbed-rtos
+  # - PLATFORMIO_PROJECT_DIR=examples/mbed-rtos
   - PLATFORMIO_PROJECT_DIR=examples/mbed-serial
 
 install:

appveyor.yml

@@ -7,7 +7,7 @@ environment:
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-internal-libs"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-blink"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-dsp"
-    - PLATFORMIO_PROJECT_DIR: "examples/mbed-rtos"
+    # - PLATFORMIO_PROJECT_DIR: "examples/mbed-rtos"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-serial"
 
 install:

builder/frameworks/mbed.py

@@ -0,0 +1,37 @@
+# Copyright 2014-present PlatformIO <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""
+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.
+
+http://mbed.org/
+"""
+
+from os.path import join
+
+from SCons.Script import Import, SConscript
+
+Import("env")
+
+# https://github.com/platformio/builder-framework-mbed.git
+SConscript(
+    join(env.PioPlatform().get_package_dir("framework-mbed"), "platformio",
+         "platformio-build.py"))

examples/mbed-events/platformio.ini

@@ -11,4 +11,3 @@
 platform = teensy
 framework = mbed
 board = teensy31
-build_flags = -DPIO_FRAMEWORK_MBED_RTOS_PRESENT

platform.json

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-teensy.git"
   },
-  "version": "3.5.0",
+  "version": "3.6.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
@@ -24,7 +24,7 @@
     },
     "mbed": {
       "package": "framework-mbed",
-      "script": "builder/frameworks/mbed/mbed.py"
+      "script": "builder/frameworks/mbed.py"
     }
   },
   "packages": {
@@ -46,7 +46,7 @@
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~5.50904.0"
+      "version": "~5.51001.1"
     },
     "tool-teensy": {
       "type": "uploader",