Skip to content

Commit

Permalink
Merge branch 'release/v4.15.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Jan 28, 2022
2 parents dc62cf9 + 17c2813 commit 80a6d48
Show file tree
Hide file tree
Showing 40 changed files with 827 additions and 205 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
- "examples/mbed-blink"
- "examples/mbed-dsp"
- "examples/mbed-serial"
- "examples/zephyr-blink"
- "examples/zephyr-synchronization"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down
8 changes: 6 additions & 2 deletions boards/teensy40.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
"cpu": "cortex-m7",
"extra_flags": "-D__IMXRT1062__ -DARDUINO_TEENSY40",
"f_cpu": "600000000",
"mcu": "imxrt1062"
"mcu": "imxrt1062",
"zephyr": {
"variant": "teensy40"
}
},
"connectivity": [
"can"
Expand All @@ -16,7 +19,8 @@
"jlink_device": "MIMXRT1062xxxxA"
},
"frameworks": [
"arduino"
"arduino",
"zephyr"
],
"name": "Teensy 4.0",
"upload": {
Expand Down
8 changes: 6 additions & 2 deletions boards/teensy41.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
"cpu": "cortex-m7",
"extra_flags": "-D__IMXRT1062__ -DARDUINO_TEENSY41",
"f_cpu": "600000000",
"mcu": "imxrt1062"
"mcu": "imxrt1062",
"zephyr": {
"variant": "teensy41"
}
},
"connectivity": [
"can"
Expand All @@ -16,7 +19,8 @@
"jlink_device": "MIMXRT1062xxxxA"
},
"frameworks": [
"arduino"
"arduino",
"zephyr"
],
"name": "Teensy 4.1",
"upload": {
Expand Down
3 changes: 2 additions & 1 deletion builder/frameworks/arduino.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,8 @@

libs.append(env.BuildLibrary(
join("$BUILD_DIR", "FrameworkArduino"),
join(FRAMEWORK_DIR, "cores", BUILD_CORE)
join(FRAMEWORK_DIR, "cores", BUILD_CORE),
src_filter="+<*> -<Blink.cc>"
))

env.Prepend(LIBS=libs)
29 changes: 29 additions & 0 deletions builder/frameworks/zephyr.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright 2019-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.
"""
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")
7 changes: 7 additions & 0 deletions builder/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,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")
Expand Down
27 changes: 27 additions & 0 deletions examples/arduino-blink/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
How to build PlatformIO based project
=====================================

1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
2. Download [development platform with examples](https://github.com/platformio/platform-teensy/archive/develop.zip)
3. Extract ZIP archive
4. Run these commands:

```shell
# Change directory to example
$ cd platform-teensy/examples/arduino-blink

# Build project
$ pio run

# Upload firmware
$ pio run --target upload

# Build specific environment
$ pio run -e teensy31

# Upload firmware for the specific environment
$ pio run -e teensy31 --target upload

# Clean build files
$ pio run --target clean
```
38 changes: 0 additions & 38 deletions examples/arduino-blink/README.rst

This file was deleted.

21 changes: 21 additions & 0 deletions examples/arduino-hid-usb-mouse/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
How to build PlatformIO based project
=====================================

1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
2. Download [development platform with examples](https://github.com/platformio/platform-teensy/archive/develop.zip)
3. Extract ZIP archive
4. Run these commands:

```shell
# Change directory to example
$ cd platform-teensy/examples/arduino-hid-usb-mouse

# Build project
$ pio run

# Upload firmware
$ pio run --target upload

# Clean build files
$ pio run --target clean
```
32 changes: 0 additions & 32 deletions examples/arduino-hid-usb-mouse/README.rst

This file was deleted.

27 changes: 27 additions & 0 deletions examples/arduino-internal-libs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
How to build PlatformIO based project
=====================================

1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
2. Download [development platform with examples](https://github.com/platformio/platform-teensy/archive/develop.zip)
3. Extract ZIP archive
4. Run these commands:

```shell
# Change directory to example
$ cd platform-teensy/examples/arduino-internal-libs

# Build project
$ pio run

# Upload firmware
$ pio run --target upload

# Build specific environment
$ pio run -e teensy31

# Upload firmware for the specific environment
$ pio run -e teensy31 --target upload

# Clean build files
$ pio run --target clean
```
38 changes: 0 additions & 38 deletions examples/arduino-internal-libs/README.rst

This file was deleted.

21 changes: 21 additions & 0 deletions examples/mbed-blink/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
How to build PlatformIO based project
=====================================

1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
2. Download [development platform with examples](https://github.com/platformio/platform-teensy/archive/develop.zip)
3. Extract ZIP archive
4. Run these commands:

```shell
# Change directory to example
$ cd platform-teensy/examples/mbed-blink

# Build project
$ pio run

# Upload firmware
$ pio run --target upload

# Clean build files
$ pio run --target clean
```
21 changes: 21 additions & 0 deletions examples/mbed-dsp/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
How to build PlatformIO based project
=====================================

1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
2. Download [development platform with examples](https://github.com/platformio/platform-teensy/archive/develop.zip)
3. Extract ZIP archive
4. Run these commands:

```shell
# Change directory to example
$ cd platform-teensy/examples/mbed-dsp

# Build project
$ pio run

# Upload firmware
$ pio run --target upload

# Clean build files
$ pio run --target clean
```
21 changes: 21 additions & 0 deletions examples/mbed-events/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
How to build PlatformIO based project
=====================================

1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
2. Download [development platform with examples](https://github.com/platformio/platform-teensy/archive/develop.zip)
3. Extract ZIP archive
4. Run these commands:

```shell
# Change directory to example
$ cd platform-teensy/examples/mbed-events

# Build project
$ pio run

# Upload firmware
$ pio run --target upload

# Clean build files
$ pio run --target clean
```
32 changes: 0 additions & 32 deletions examples/mbed-events/README.rst

This file was deleted.

Loading

0 comments on commit 80a6d48

Please sign in to comment.