Merge branch 'release/v5.0.0'

Author: ivankravets

.travis.yml

@@ -10,6 +10,19 @@ env:
   - PLATFORMIO_PROJECT_DIR=examples/mbed-rtos-ethernet
   - PLATFORMIO_PROJECT_DIR=examples/mbed-rtos-tls-client
   - PLATFORMIO_PROJECT_DIR=examples/mbed-serial
+  - PLATFORMIO_PROJECT_DIR=examples/zephyr-blink
+  - PLATFORMIO_PROJECT_DIR=examples/zephyr-net-telnet
+  # - PLATFORMIO_PROJECT_DIR=examples/zephyr-sensor-sx9500
+
+# Zephyr framework doesn't support python 2
+jobs:
+  exclude:
+    - python: "2.7"
+      env: PLATFORMIO_PROJECT_DIR=examples/zephyr-blink
+    - python: "2.7"
+      env: PLATFORMIO_PROJECT_DIR=examples/zephyr-net-telnet
+    - python: "2.7"
+      env: PLATFORMIO_PROJECT_DIR=examples/zephyr-sensor-sx9500
 
 install:
   - pip install -U https://github.com/platformio/platformio/archive/develop.zip

appveyor.yml

@@ -8,10 +8,13 @@ environment:
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-rtos-ethernet"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-rtos-tls-client"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-serial"
+    - PLATFORMIO_PROJECT_DIR: "examples/zephyr-blink"
+    - PLATFORMIO_PROJECT_DIR: "examples/zephyr-net-telnet"
+    # - PLATFORMIO_PROJECT_DIR: "examples/zephyr-sensor-sx9500"
 
 install:
   - cmd: git submodule update --init --recursive
-  - cmd: SET PATH=%PATH%;C:\Python36\Scripts
+  - cmd: SET PATH=C:\Python36\Scripts;%PATH%
   - cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
   - cmd: platformio platform install file://.
 

boards/frdm_k64f.json

@@ -13,7 +13,8 @@
     "svd_path": "MK64F12.svd"
   },
   "frameworks": [
-    "mbed"
+    "mbed",
+    "zephyr"
   ],
   "name": "Freescale Kinetis FRDM-K64F",
   "upload": {

boards/frdm_kl25z.json

@@ -10,7 +10,8 @@
     "svd_path": "MKL25Z4.svd"
   },
   "frameworks": [
-    "mbed"
+    "mbed",
+    "zephyr"
   ],
   "name": "Freescale Kinetis FRDM-KL25Z",
   "upload": {

boards/frdm_kw24d.json

@@ -2,13 +2,17 @@
   "build": {
     "cpu": "cortex-m4",
     "f_cpu": "50000000L",
-    "mcu": "mkw24d512"
+    "mcu": "mkw24d512",
+    "zephyr": {
+       "variant": "usb_kw24d512"
+    }
   },
   "debug": {
     "jlink_device": "MKW24D512xxx5"
   },
   "frameworks": [
-    "mbed"
+    "mbed",
+    "zephyr"
   ],
   "name": "Freescale Kinetis FRDM-KW24D512",
   "upload": {

boards/frdm_kw41z.json

@@ -13,7 +13,8 @@
     "svd_path": "MKW41Z4.svd"
   },
   "frameworks": [
-    "mbed"
+    "mbed",
+    "zephyr"
   ],
   "name": "Freescale Kinetis FRDM-KW41Z",
   "upload": {

boards/hexiwear.json

@@ -2,7 +2,10 @@
   "build": {
     "cpu": "cortex-m4",
     "f_cpu": "120000000L",
-    "mcu": "mk64fn1m0vdc12"
+    "mcu": "mk64fn1m0vdc12",
+    "zephyr": {
+       "variant": "hexiwear_k64"
+    }
   },
   "connectivity": [
     "bluetooth",
@@ -28,7 +31,8 @@
     }
   },
   "frameworks": [
-    "mbed"
+    "mbed",
+    "zephyr"
   ],
   "name": "Hexiwear",
   "upload": {

builder/frameworks/zephyr.py

@@ -0,0 +1,30 @@
+# Copyright 2019-present PlatformIO <contact@platformio.org>
+#
+# 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.
+"""
+The Zephyr Project is a scalable real-time operating system (RTOS) supporting multiple
+hardware architectures, optimized for resource constrained devices, and built with
+safety and security in mind.
+
+https://github.com/zephyrproject-rtos/zephyr
+"""
+
+from os.path import join
+
+from SCons.Script import Import, SConscript
+
+Import("env")
+
+SConscript(
+    join(env.PioPlatform().get_package_dir("framework-zephyr"), "scripts",
+         "platformio", "platformio-build.py"), exports="env")

builder/main.py

@@ -81,6 +81,13 @@
 # Target: Build executable and linkable firmware
 #
 
+if "zephyr" in env.get("PIOFRAMEWORK", []):
+    env.SConscript(
+        join(platform.get_package_dir(
+            "framework-zephyr"), "scripts", "platformio", "platformio-build-pre.py"),
+        exports={"env": env}
+    )
+
 target_elf = None
 if "nobuild" in COMMAND_LINE_TARGETS:
     target_elf = join("$BUILD_DIR", "${PROGNAME}.elf")

examples/zephyr-blink/.gitignore

@@ -0,0 +1 @@
+.pio