Merge branch 'release/v3.3.0'

platformio · Jun 12, 2018 · fa72080 · fa72080
2 parents de9b127 + 45a8715
commit fa72080
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/builder/frameworks/mbed b/builder/frameworks/mbed
diff --git a/builder/main.py b/builder/main.py
@@ -52,6 +52,10 @@
 
     LIBS=["m"],
 
+    SIZEPROGREGEXP=r"^(?:\.text|\.data|\.rodata|\.text.align|\.ARM.exidx)\s+(\d+).*",
+    SIZEDATAREGEXP=r"^(?:\.data|\.bss|\.noinit)\s+(\d+).*",
+    SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
+
     PROGSUFFIX=".elf"
 )
 
@@ -265,6 +269,7 @@ def _jlink_cmd_script(env, source):
 
 elif upload_protocol == "teensy-cli":
     env.Replace(
+        REBOOTER="teensy_reboot",
         UPLOADER="teensy_loader_cli",
         UPLOADERFLAGS=[
             "-mmcu=$BOARD_MCU",
@@ -274,7 +279,10 @@ def _jlink_cmd_script(env, source):
         ],
         UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES"
     )
-    upload_actions = [env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")]
+    upload_actions = [
+        env.VerboseAction("$REBOOTER -s", "Rebooting..."),
+        env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")
+    ]
 
 elif upload_protocol == "teensy-gui":
     env.Replace(

diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini
@@ -12,7 +12,7 @@ platform = teensy
 framework = arduino
 board = teensy20
 
-[env:teensy20pp]
+[env:teensy 20pp]
 platform = teensy
 framework = arduino
 board = teensy20pp

diff --git a/examples/mbed-events/platformio.ini b/examples/mbed-events/platformio.ini
@@ -7,7 +7,7 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
-[env:teensy31]
+[env:teensy31 events]
 platform = teensy
 framework = mbed
 board = teensy31

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-teensy.git"
   },
-  "version": "3.2.1",
+  "version": "3.3.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"
@@ -46,7 +46,7 @@
     "framework-mbed": {
       "type": "framework",
       "optional": true,
-      "version": "~4.50802.0"
+      "version": "~4.50806.0"
     },
     "tool-teensy": {
       "type": "uploader",