Merge branch 'release/v1.1.0'

Author: ivankravets

README.md

@@ -12,7 +12,7 @@ Teensy is a complete USB-based microcontroller development system, in a very sma
 1. [Install PlatformIO CLI](http://docs.platformio.org/en/latest/installation.html)
 2. Install Teensy development platform:
 ```bash
-# isntall the latest stable version
+# install the latest stable version
 > platformio platform install teensy
 
 # install development version

boards/teensy35.json

@@ -0,0 +1,20 @@
+{
+  "build": {
+    "core": "teensy3",
+    "cpu": "cortex-m4",
+    "extra_flags": "-D__MK64FX512__ -DTEENSY35",
+    "f_cpu": "120000000L",
+    "ldscript": "mk64fx512.ld",
+    "mcu": "mk64fx512"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Teensy 3.5",
+  "upload": {
+    "maximum_ram_size": 196608,
+    "maximum_size": 524288
+  },
+  "url": "https://www.pjrc.com",
+  "vendor": "Teensy"
+}

boards/teensy36.json

@@ -0,0 +1,20 @@
+{
+  "build": {
+    "core": "teensy3",
+    "cpu": "cortex-m4",
+    "extra_flags": "-D__MK66FX1M0__ -DTEENSY36",
+    "f_cpu": "180000000L",
+    "ldscript": "mk66fx1m0.ld",
+    "mcu": "mk66fx1m0"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Teensy 3.6",
+  "upload": {
+    "maximum_ram_size": 262144,
+    "maximum_size": 1048576
+  },
+  "url": "https://www.pjrc.com",
+  "vendor": "Teensy"
+}

builder/frameworks/arduino.py

@@ -83,6 +83,8 @@
             continue
         with open(file_path, "w") as fp:
             fp.write(content)
+else:
+    env.Prepend(LIBPATH=[join(FRAMEWORK_DIR, "cores", "teensy3")])
 
 #
 # Target: Build Core Library
@@ -102,13 +104,7 @@
         join(FRAMEWORK_DIR, "variants", env.BoardConfig().get("build.variant"))
     ))
 
-envsafe = env.Clone()
-
-if env.BoardConfig().get("build.core") == "teensy3":
-    libs.append("arm_cortex%sl_math" % (
-        "M4" if env.BoardConfig().get("build.cpu") == "cortex-m4" else "M0"))
-
-libs.append(envsafe.BuildLibrary(
+libs.append(env.BuildLibrary(
     join("$BUILD_DIR", "FrameworkArduino"),
     join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core"))
 ))

builder/main.py

@@ -140,7 +140,11 @@
             "-fsingle-precision-constant",
             "--specs=nano.specs"
         ],
-        LIBS=["c", "gcc"],
+        LIBS=[
+            "c", "gcc", "arm_cortex%sl_math" %
+            ("M4" if env.BoardConfig().get(
+                "build.cpu") == "cortex-m4" else "M0")
+        ],
         BUILDERS=dict(
             ElfToBin=Builder(
                 action=env.VerboseAction(" ".join([
@@ -166,24 +170,31 @@
             )
         )
     )
+    if env.BoardConfig().id_ in ("teensy35", "teensy36"):
+        env.Append(
+            LINKFLAGS=["-mfloat-abi=hard", "-mfpu=fpv4-sp-d16"],
+            CCFLAGS=["-mfloat-abi=hard", "-mfpu=fpv4-sp-d16"]
+        )
 
 env.Append(
     ASFLAGS=env.get("CCFLAGS", [])[:]
 )
 
 
-if isfile(join(platform.get_package_dir("tool-teensy") or "",
-               "teensy_loader_cli")):
+if (isfile(
+        join(
+            platform.get_package_dir("tool-teensy") or "",
+            "teensy_loader_cli")) and
+        env.BoardConfig().id_ not in ("teensy35", "teensy36")):
     env.Append(
         UPLOADER="teensy_loader_cli",
         UPLOADERFLAGS=[
             "-mmcu=$BOARD_MCU",
             "-w",  # wait for device to apear
             "-s",  # soft reboot if device not online
-            "-v"   # verbose output
+            "-v"  # verbose output
         ],
-        UPLOADHEXCMD='$UPLOADER $UPLOADERFLAGS $SOURCES'
-    )
+        UPLOADHEXCMD='$UPLOADER $UPLOADERFLAGS $SOURCES')
 else:
     env.Append(
         REBOOTER="teensy_reboot",

examples/arduino-blink/platformio.ini

@@ -31,3 +31,13 @@ board = teensy31
 platform = teensy
 framework = arduino
 board = teensylc
+
+[env:teensy35]
+platform = teensy
+framework = arduino
+board = teensy35
+
+[env:teensy36]
+platform = teensy
+framework = arduino
+board = teensy35

examples/arduino-hid-usb-mouse/platformio.ini

@@ -7,8 +7,44 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/en/stable/projectconf.html
 
+[env:teensy20]
+platform = teensy
+framework = arduino
+board = teensy20
+build_flags = -DUSB_SERIAL_HID
+
+[env:teensy20pp]
+platform = teensy
+framework = arduino
+board = teensy20pp
+build_flags = -DUSB_SERIAL_HID
+
+[env:teensy30]
+platform = teensy
+framework = arduino
+board = teensy30
+build_flags = -DUSB_SERIAL_HID
+
 [env:teensy31]
 platform = teensy
 framework = arduino
 board = teensy31
-build_flags = -DTEENSY31 -UUSB_SERIAL -DUSB_SERIAL_HID
+build_flags = -DUSB_SERIAL_HID
+
+[env:teensylc]
+platform = teensy
+framework = arduino
+board = teensylc
+build_flags = -DUSB_SERIAL_HID
+
+[env:teensy35]
+platform = teensy
+framework = arduino
+board = teensy35
+build_flags = -DUSB_SERIAL_HID
+
+[env:teensy36]
+platform = teensy
+framework = arduino
+board = teensy35
+build_flags = -DUSB_SERIAL_HID

examples/arduino-internal-libs/platformio.ini

@@ -11,28 +11,33 @@
 platform = teensy
 framework = arduino
 board = teensy20
-build_flags = -DTEENSY20
 
 [env:teensy20pp]
 platform = teensy
 framework = arduino
 board = teensy20pp
-build_flags = -DTEENSY20PP
 
 [env:teensy30]
 platform = teensy
 framework = arduino
 board = teensy30
-build_flags = -DTEENSY30
 
 [env:teensy31]
 platform = teensy
 framework = arduino
 board = teensy31
-build_flags = -DTEENSY31
 
 [env:teensylc]
 platform = teensy
 framework = arduino
 board = teensylc
-build_flags = -DTEENSYLC
+
+[env:teensy35]
+platform = teensy
+framework = arduino
+board = teensy35
+
+[env:teensy36]
+platform = teensy
+framework = arduino
+board = teensy35