Merge branch 'release/v3.1.2'

platformio · Jun 15, 2018 · a9d51c7 · a9d51c7
2 parents a826d72 + 96109a9
commit a9d51c7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/builder/frameworks/mbed b/builder/frameworks/mbed
diff --git a/builder/main.py b/builder/main.py
@@ -104,6 +104,9 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
 
     LIBS=["c", "gcc", "m"],
 
+    SIZEPROGREGEXP=r"^(?:\.text|\.data|\.rodata|\.text.align|\.ARM.exidx)\s+(\d+).*",
+    SIZEDATAREGEXP=r"^(?:\.data|\.bss|\.noinit)\s+(\d+).*",
+    SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
     SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES',
 
     PROGSUFFIX=".elf"

diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini
@@ -57,7 +57,7 @@ platform = atmelsam
 framework = arduino
 board = sodaq_autonomo
 
-[env:sparkfun_samd21_mini_usb]
+[env:sparkfun samd21 mini usb]
 platform = atmelsam
 framework = arduino
 board = sparkfun_samd21_mini_usb

diff --git a/examples/mbed-blink/platformio.ini b/examples/mbed-blink/platformio.ini
@@ -17,7 +17,7 @@ platform = atmelsam
 framework = mbed
 board = saml21_xpro_b
 
-[env:samr21_xpro]
+[env:samr21 xpro]
 platform = atmelsam
 framework = mbed
 board = samr21_xpro

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-atmelsam.git"
   },
-  "version": "3.1.1",
+  "version": "3.1.2",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json",