Merge branch 'release/v2.6.0'

platformio · Sep 7, 2017 · 3e43ae3 · 3e43ae3
2 parents 0dded21 + 81cf20a
commit 3e43ae3
Show file tree

Hide file tree

Showing 23 changed files with 133 additions and 62 deletions.
diff --git a/boards/adafruit_circuitplayground_m0.json b/boards/adafruit_circuitplayground_m0.json
@@ -26,9 +26,10 @@
           "package": "tool-openocd",
           "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-s", "$PACKAGE_DIR/scripts",
+            "-f", "interface/cmsis-dap.cfg",
             "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "scripts/target/at91samdXX.cfg"
+            "-f", "target/at91samdXX.cfg"
           ]
         },
         "load_cmd": "preload"

diff --git a/boards/adafruit_feather_m0.json b/boards/adafruit_feather_m0.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "adafruit",
     "system": "samd",
-    "extra_flags": "-D__SAMD21G18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -lsamd21_qtouch_gcc",
+    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -D__SAMD21G18A__",
     "cpu": "cortex-m0plus",
     "f_cpu": "48000000L",
     "hwids": [
@@ -27,9 +27,10 @@
           "package": "tool-openocd",
           "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-s", "$PACKAGE_DIR/scripts",
+            "-f", "interface/cmsis-dap.cfg",
             "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "scripts/target/at91samdXX.cfg"
+            "-f", "target/at91samdXX.cfg"
           ]
         },
         "load_cmd": "preload"

diff --git a/boards/adafruit_feather_m0_express.json b/boards/adafruit_feather_m0_express.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "adafruit",
     "system": "samd",
-    "extra_flags": "-D__SAMD21G18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARDUINO_SAMD_FEATHER_M0_EXPRESS -lsamd21_qtouch_gcc",
+    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARDUINO_SAMD_FEATHER_M0_EXPRESS -D__SAMD21G18A__",
     "cpu": "cortex-m0plus",
     "f_cpu": "48000000L",
     "hwids": [

diff --git a/boards/adafruit_gemma_m0.json b/boards/adafruit_gemma_m0.json
@@ -0,0 +1,39 @@
+{
+  "build": {
+    "core": "adafruit",
+    "system": "samd",
+    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_GEMMA_M0 -DCRYSTALLESS -DADAFRUIT_GEMMA_M0 -D__SAMD21E18A__",
+    "cpu": "cortex-m0plus",
+    "f_cpu": "48000000L",
+    "hwids": [
+      [
+        "0x239A",
+        "0x801C"
+      ],
+      [
+        "0x239A",
+        "0x001C"
+      ]
+    ],
+    "ldscript": "flash_with_bootloader.ld",
+    "mcu": "samd21e18a",
+    "usb_product": "Adafruit Gemma M0",
+    "variant": "gemma_m0"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Adafruit Gemma M0",
+  "upload": {
+    "disable_flushing": true,
+    "maximum_ram_size": 32768,
+    "maximum_size": 262144,
+    "native_usb": true,
+    "protocol": "sam-ba",
+    "require_upload_port": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.adafruit.com/product/3501",
+  "vendor": "Adafruit"
+}
diff --git a/boards/adafruit_metro_m0.json b/boards/adafruit_metro_m0.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "adafruit",
     "system": "samd",
-    "extra_flags": "-D__SAMD21G18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DDADAFRUIT_METRO_M0_EXPRESS -lsamd21_qtouch_gcc",
+    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DDADAFRUIT_METRO_M0_EXPRESS -D__SAMD21G18A__",
     "cpu": "cortex-m0plus",
     "f_cpu": "48000000L",
     "hwids": [
@@ -27,9 +27,10 @@
           "package": "tool-openocd",
           "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-s", "$PACKAGE_DIR/scripts",
+            "-f", "interface/cmsis-dap.cfg",
             "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "scripts/target/at91samdXX.cfg"
+            "-f", "target/at91samdXX.cfg"
           ]
         },
         "load_cmd": "preload"

diff --git a/boards/adafruit_trinket_m0.json b/boards/adafruit_trinket_m0.json
@@ -0,0 +1,39 @@
+{
+  "build": {
+    "core": "adafruit",
+    "system": "samd",
+    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_TRINKET_M0 -DCRYSTALLESS -DADAFRUIT_TRINKET_M0 -D__SAMD21E18A__",
+    "cpu": "cortex-m0plus",
+    "f_cpu": "48000000L",
+    "hwids": [
+      [
+        "0x239A",
+        "0x801E"
+      ],
+      [
+        "0x239A",
+        "0x001E"
+      ]
+    ],
+    "ldscript": "flash_with_bootloader.ld",
+    "mcu": "samd21e18a",
+    "usb_product": "Adafruit Trinket M0",
+    "variant": "trinket_m0"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Adafruit Trinket M0",
+  "upload": {
+    "disable_flushing": true,
+    "maximum_ram_size": 32768,
+    "maximum_size": 262144,
+    "native_usb": true,
+    "protocol": "sam-ba",
+    "require_upload_port": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.adafruit.com/product/3500",
+  "vendor": "Adafruit"
+}
diff --git a/boards/due.json b/boards/due.json
@@ -41,6 +41,6 @@
     "use_1200bps_touch": true,
     "wait_for_upload_port": false
   },
-  "url": "http://www.arduino.org/products/boards/4-arduino-boards/arduino-due",
+  "url": "https://www.arduino.cc/en/Main/ArduinoBoardDue",
   "vendor": "Arduino"
 }
diff --git a/boards/dueUSB.json b/boards/dueUSB.json
@@ -37,6 +37,6 @@
     "use_1200bps_touch": true,
     "wait_for_upload_port": true
   },
-  "url": "http://www.arduino.org/products/boards/4-arduino-boards/arduino-due",
+  "url": "https://www.arduino.cc/en/Main/ArduinoBoardDue",
   "vendor": "Arduino"
 }
diff --git a/boards/mkr1000USB.json b/boards/mkr1000USB.json
@@ -37,9 +37,10 @@
           "package": "tool-openocd",
           "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-s", "$PACKAGE_DIR/scripts",
+            "-f", "interface/cmsis-dap.cfg",
             "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "scripts/target/at91samdXX.cfg"
+            "-f", "target/at91samdXX.cfg"
           ]
         },
         "load_cmd": "preload"

diff --git a/boards/mzeroUSB.json b/boards/mzeroUSB.json
@@ -26,9 +26,10 @@
           "package": "tool-openocd",
           "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-s", "$PACKAGE_DIR/scripts",
+            "-f", "interface/cmsis-dap.cfg",
             "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "scripts/target/at91samdXX.cfg"
+            "-f", "target/at91samdXX.cfg"
           ]
         },
         "load_cmd": "mon program \"$PROG_DIR/firmware.bin\" 0x4000"
@@ -58,6 +59,6 @@
     "use_1200bps_touch": true,
     "wait_for_upload_port": true
   },
-  "url": "http://www.arduino.org/products/boards/arduino-m0",
+  "url": "https://www.arduino.cc/en/Main/ArduinoBoardM0",
   "vendor": "Arduino"
 }
diff --git a/boards/mzeropro.json b/boards/mzeropro.json
@@ -26,9 +26,10 @@
           "package": "tool-openocd",
           "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-s", "$PACKAGE_DIR/scripts",
+            "-f", "interface/cmsis-dap.cfg",
             "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "scripts/target/at91samdXX.cfg"
+            "-f", "target/at91samdXX.cfg"
           ]
         },
         "load_cmd": "mon program \"$PROG_DIR/firmware.bin\" 0x4000",
@@ -51,6 +52,6 @@
     "use_1200bps_touch": false,
     "wait_for_upload_port": false
   },
-  "url": "http://www.arduino.org/products/boards/arduino-m0-pro",
+  "url": "https://www.arduino.cc/en/Main/ArduinoBoardM0PRO",
   "vendor": "Arduino"
 }
diff --git a/boards/mzeroproUSB.json b/boards/mzeroproUSB.json
@@ -41,6 +41,6 @@
     "use_1200bps_touch": true,
     "wait_for_upload_port": true
   },
-  "url": "http://www.arduino.org/products/boards/arduino-m0-pro",
+  "url": "https://www.arduino.cc/en/Main/ArduinoBoardM0PRO",
   "vendor": "Arduino"
 }
diff --git a/boards/samd21g18a.json b/boards/samd21g18a.json
@@ -11,9 +11,10 @@
           "package": "tool-openocd",
           "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/interface/cmsis-dap.cfg",
-            "-c", "set CHIPNAME at91samd21g18",
-            "-f", "scripts/target/at91samdXX.cfg"
+            "-s", "$PACKAGE_DIR/scripts",
+            "-f", "interface/cmsis-dap.cfg",
+            "-c", "set CHIPNAME at91samd21g18;",
+            "-f", "target/at91samdXX.cfg"
           ]
         },
         "onboard": true

diff --git a/boards/sparkfun_samd21_dev_usb.json b/boards/sparkfun_samd21_dev_usb.json
@@ -26,9 +26,10 @@
           "package": "tool-openocd",
           "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-s", "$PACKAGE_DIR/scripts",
+            "-f", "interface/cmsis-dap.cfg",
             "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "scripts/target/at91samdXX.cfg"
+            "-f", "target/at91samdXX.cfg"
           ]
         },
         "load_cmd": "preload"

diff --git a/boards/sparkfun_samd21_mini_usb.json b/boards/sparkfun_samd21_mini_usb.json
@@ -26,9 +26,10 @@
           "package": "tool-openocd",
           "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-s", "$PACKAGE_DIR/scripts",
+            "-f", "interface/cmsis-dap.cfg",
             "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "scripts/target/at91samdXX.cfg"
+            "-f", "target/at91samdXX.cfg"
           ]
         },
         "load_cmd": "preload"

diff --git a/boards/tian.json b/boards/tian.json
@@ -36,6 +36,6 @@
     "use_1200bps_touch": true,
     "wait_for_upload_port": true
   },
-  "url": "http://www.arduino.org/products/boards/arduino-tian",
+  "url": "https://www.arduino.cc/en/Main/ArduinoBoardTian",
   "vendor": "Arduino"
 }
diff --git a/boards/zero.json b/boards/zero.json
@@ -26,12 +26,13 @@
           "package": "tool-openocd",
           "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/interface/cmsis-dap.cfg",
+            "-s", "$PACKAGE_DIR/scripts",
+            "-f", "interface/cmsis-dap.cfg",
             "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "scripts/target/at91samdXX.cfg"
+            "-f", "target/at91samdXX.cfg"
           ]
         },
-        "load_cmd": "preload",
+        "load_cmd": "mon program \"$PROG_DIR/firmware.bin\" 0x2000",
         "onboard": true
       }
     }

diff --git a/builder/main.py b/builder/main.py
@@ -57,7 +57,7 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
     RANLIB="arm-none-eabi-ranlib",
     SIZETOOL="arm-none-eabi-size",
 
-    ARFLAGS=["rcs"],
+    ARFLAGS=["rc"],
 
     ASFLAGS=["-x", "assembler-with-cpp"],
 
@@ -155,8 +155,6 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
         UPLOADERFLAGS=[
             "-s", join(platform.get_package_dir("tool-openocd") or "",
                        "scripts"),
-            "-s", join(platform.get_package_dir("tool-openocd") or "",
-                       "scripts", "board"),
             "-f", join(env.BoardConfig().get("upload.openocdcfg", ""))
         ],
 
@@ -213,7 +211,8 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
                 "avrdude.conf"),
             "-c", "$UPLOAD_PROTOCOL",
             "-P", '"$UPLOAD_PORT"',
-            "-b", "$UPLOAD_SPEED"
+            "-b", "$UPLOAD_SPEED",
+            "-u"
         ],
 
         UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS -U flash:w:$SOURCES:i'

diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini
@@ -7,10 +7,10 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
-[env:adafruit_circuitplayground_m0]
+[env:adafruit_gemma_m0]
 platform = atmelsam
 framework = arduino
-board = adafruit_circuitplayground_m0
+board = adafruit_gemma_m0
 
 [env:adafruit_feather_m0]
 platform = atmelsam
@@ -47,11 +47,6 @@ platform = atmelsam
 framework = arduino
 board = mzeropro
 
-[env:mzeroproUSB]
-platform = atmelsam
-framework = arduino
-board = mzeroproUSB
-
 [env:mzeroUSB]
 platform = atmelsam
 framework = arduino

diff --git a/examples/arduino-external-libs/platformio.ini b/examples/arduino-external-libs/platformio.ini
@@ -7,10 +7,10 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
-[env:adafruit_circuitplayground_m0]
+[env:adafruit_gemma_m0]
 platform = atmelsam
 framework = arduino
-board = adafruit_circuitplayground_m0
+board = adafruit_gemma_m0
 
 [env:adafruit_feather_m0]
 platform = atmelsam
@@ -47,11 +47,6 @@ platform = atmelsam
 framework = arduino
 board = mzeropro
 
-[env:mzeroproUSB]
-platform = atmelsam
-framework = arduino
-board = mzeroproUSB
-
 [env:mzeroUSB]
 platform = atmelsam
 framework = arduino

diff --git a/examples/arduino-internal-libs/platformio.ini b/examples/arduino-internal-libs/platformio.ini
@@ -7,10 +7,10 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 
-[env:adafruit_circuitplayground_m0]
+[env:adafruit_gemma_m0]
 platform = atmelsam
 framework = arduino
-board = adafruit_circuitplayground_m0
+board = adafruit_gemma_m0
 
 [env:adafruit_feather_m0]
 platform = atmelsam
@@ -47,11 +47,6 @@ platform = atmelsam
 framework = arduino
 board = mzeropro
 
-[env:mzeroproUSB]
-platform = atmelsam
-framework = arduino
-board = mzeroproUSB
-
 [env:mzeroUSB]
 platform = atmelsam
 framework = arduino