diff --git a/appveyor.yml b/appveyor.yml index 23bf2da..001f5ee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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://. diff --git a/boards/teensy40.json b/boards/teensy40.json index 05da1ee..2ff6e8e 100644 --- a/boards/teensy40.json +++ b/boards/teensy40.json @@ -18,7 +18,7 @@ ], "name": "Teensy 4.0", "upload": { - "maximum_ram_size": 1048576, + "maximum_ram_size": 524288, "maximum_size": 2031616, "protocol": "teensy-gui", "protocols": [ diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py index 5e88e85..af52657 100644 --- a/builder/frameworks/arduino.py +++ b/builder/frameworks/arduino.py @@ -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( @@ -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": diff --git a/platform.json b/platform.json index 863b3d4..8df4c43 100644 --- a/platform.json +++ b/platform.json @@ -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" @@ -41,7 +41,7 @@ "framework-arduinoteensy": { "type": "framework", "optional": true, - "version": "~1.148.0" + "version": "~1.149.0" }, "framework-mbed": { "type": "framework",