Skip to content

Commit 30fe0f9

Browse files
committed
Merge branch 'release/v5.0.0'
2 parents da3eeb1 + d0094d4 commit 30fe0f9

File tree

35 files changed

+18
-776
lines changed

35 files changed

+18
-776
lines changed

.github/workflows/examples.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ jobs:
1212
- "examples/arduino-blink"
1313
- "examples/arduino-hid-usb-mouse"
1414
- "examples/arduino-internal-libs"
15-
- "examples/mbed-blink"
16-
- "examples/mbed-dsp"
17-
- "examples/mbed-serial"
1815
- "examples/zephyr-blink"
1916
- "examples/zephyr-synchronization"
2017
runs-on: ${{ matrix.os }}

boards/teensy31.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
"svd_path": "MK20D5.svd"
1515
},
1616
"frameworks": [
17-
"arduino",
18-
"mbed"
17+
"arduino"
1918
],
2019
"name": "Teensy 3.1 / 3.2",
2120
"upload": {

builder/frameworks/arduino.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
"-fno-exceptions",
153153
"-felide-constructors",
154154
"-fno-rtti",
155-
"-std=gnu++14",
155+
"-std=gnu++17",
156156
"-Wno-error=narrowing",
157157
"-fpermissive"
158158
],

builder/frameworks/mbed.py

Lines changed: 0 additions & 37 deletions
This file was deleted.

builder/main.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414

1515
import sys
1616
from platform import system
17-
from os import makedirs
17+
from os import makedirs, environ
1818
from os.path import isdir, isfile, join
1919

2020
from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default,
2121
DefaultEnvironment)
2222

23+
from platformio.proc import exec_command
24+
2325
env = DefaultEnvironment()
2426
platform = env.PioPlatform()
2527
board_config = env.BoardConfig()
@@ -137,12 +139,23 @@
137139

138140
# Disable memory calculation and print output from custom "teensy_size" tool
139141
if "arduino" in env.subst("$PIOFRAMEWORK") and build_core == "teensy4":
142+
def teensy_check_upload_size(_, target, source, env):
143+
print('Advanced Memory Usage is available via "PlatformIO Home > Project Inspect"')
144+
sysenv = environ.copy()
145+
sysenv["PATH"] = str(env["ENV"]["PATH"])
146+
result = exec_command(["teensy_size", str(source[0])], env=sysenv)
147+
if result["returncode"] != 0:
148+
sys.stderr.write(result["err"])
149+
env.Exit(1)
150+
151+
env.AddMethod(teensy_check_upload_size, "CheckUploadSize")
140152
env.Replace(
141153
SIZETOOL=None,
142154
SIZECHECKCMD=None,
143155
SIZEPRINTCMD="teensy_size $SOURCES",
144156
)
145157

158+
146159
#
147160
# Target: Build executable and linkable firmware
148161
#

examples/mbed-blink/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/mbed-blink/README.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

examples/mbed-blink/include/README

Lines changed: 0 additions & 39 deletions
This file was deleted.

examples/mbed-blink/lib/README

Lines changed: 0 additions & 46 deletions
This file was deleted.

examples/mbed-blink/platformio.ini

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)