Skip to content

Commit

Permalink
Merge branch 'release/v4.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Jan 22, 2020
2 parents 6fe14b1 + ccbb008 commit 4d1de88
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:

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://.

Expand Down
2 changes: 1 addition & 1 deletion boards/teensy40.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
],
"name": "Teensy 4.0",
"upload": {
"maximum_ram_size": 1048576,
"maximum_ram_size": 524288,
"maximum_size": 2031616,
"protocol": "teensy-gui",
"protocols": [
Expand Down
28 changes: 14 additions & 14 deletions builder/frameworks/arduino.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

env.Replace(
SIZEPROGREGEXP=r"^(?:\.text|\.text\.progmem|\.text\.itcm|\.data)\s+([0-9]+).*",
SIZEDATAREGEXP=r"^(?:\.usbdescriptortable|\.dmabuffers|\.usbbuffers|\.data|\.bss|\.bss\.dma|\.noinit|\.text\.itcm)\s+([0-9]+).*"
SIZEDATAREGEXP=r"^(?:\.usbdescriptortable|\.dmabuffers|\.usbbuffers|\.data|\.bss|\.noinit|\.text\.itcm|\.text\.itcm\.padding)\s+([0-9]+).*"
)

env.Append(
Expand Down Expand Up @@ -261,19 +261,19 @@
ASFLAGS=env.get("CCFLAGS", [])[:]
)

if "cortex-m" in env.BoardConfig().get("build.cpu", ""):
board = env.subst("$BOARD")
math_lib = "arm_cortex%s_math"
if board in ("teensy35", "teensy36"):
math_lib = math_lib % "M4lf"
elif board in ("teensy30", "teensy31"):
math_lib = math_lib % "M4l"
elif board == "teensy40":
math_lib = math_lib % "M7lfsp"
else:
math_lib = math_lib % "M0l"

env.Prepend(LIBS=[math_lib])
# if "cortex-m" in env.BoardConfig().get("build.cpu", ""):
# board = env.subst("$BOARD")
# math_lib = "arm_cortex%s_math"
# if board in ("teensy35", "teensy36"):
# math_lib = math_lib % "M4lf"
# elif board in ("teensy30", "teensy31"):
# math_lib = math_lib % "M4l"
# elif board == "teensy40":
# math_lib = math_lib % "M7lfsp"
# else:
# math_lib = math_lib % "M0l"

# env.Prepend(LIBS=[math_lib])

# Teensy 2.x Core
if BUILD_CORE == "teensy":
Expand Down
4 changes: 2 additions & 2 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-teensy.git"
},
"version": "4.6.0",
"version": "4.7.0",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"http://dl.platformio.org/packages/manifest.json"
Expand Down Expand Up @@ -41,7 +41,7 @@
"framework-arduinoteensy": {
"type": "framework",
"optional": true,
"version": "~1.148.0"
"version": "~1.149.0"
},
"framework-mbed": {
"type": "framework",
Expand Down

0 comments on commit 4d1de88

Please sign in to comment.