Merge branch 'release/v3.0.0'

platformio · Feb 12, 2018 · a0bf116 · a0bf116
2 parents e983119 + 7219a3c
commit a0bf116
Show file tree

Hide file tree

Showing 40 changed files with 539 additions and 425 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ env:
   - PLATFORMIO_PROJECT_DIR=examples/arduino-internal-libs
   - PLATFORMIO_PROJECT_DIR=examples/mbed-blink
   - PLATFORMIO_PROJECT_DIR=examples/mbed-dsp
+  # - PLATFORMIO_PROJECT_DIR=examples/mbed-events
   - PLATFORMIO_PROJECT_DIR=examples/mbed-serial
   - PLATFORMIO_PROJECT_DIR=examples/simba-blink
 

diff --git a/README.md b/README.md
@@ -9,12 +9,27 @@ Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cort
 
 # Usage
 
-1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
-2. Install Atmel SAM development platform:
-```bash
-# install the latest stable version
-> platformio platform install atmelsam
-
-# install development version
-> platformio platform install https://github.com/platformio/platform-atmelsam.git
+1. [Install PlatformIO](http://platformio.org)
+2. Create PlatformIO project and configure a platform option in [platformio.ini](http://docs.platformio.org/page/projectconf.html) file:
+
+## Stable version
+
+```ini
+[env:stable]
+platform = atmelsam
+board = ...
+...
 ```
+
+## Development version
+
+```ini
+[env:development]
+platform = https://github.com/platformio/platform-atmelsam.git
+board = ...
+...
+```
+
+# Configuration
+
+Please navigate to [documentation](http://docs.platformio.org/page/platforms/atmelsam.html).
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,6 +7,7 @@ environment:
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-internal-libs"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-blink"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-dsp"
+    # - PLATFORMIO_PROJECT_DIR: "examples/mbed-events"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-serial"
     - PLATFORMIO_PROJECT_DIR: "examples/simba-blink"
 

diff --git a/boards/adafruit_circuitplayground_m0.json b/boards/adafruit_circuitplayground_m0.json
@@ -20,30 +20,7 @@
     "variant": "circuitplay"
   },
   "debug": {
-    "tools": {
-      "cmsis-dap": {
-        "server": {
-          "package": "tool-openocd",
-          "executable": "bin/openocd",
-          "arguments": [
-            "-s", "$PACKAGE_DIR/scripts",
-            "-f", "interface/cmsis-dap.cfg",
-            "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "target/at91samdXX.cfg"
-          ]
-        },
-        "load_cmd": "preload"
-      },
-      "blackmagic": {
-        "hwids": [
-          [
-            "0x1d50",
-            "0x6018"
-          ]
-        ],
-        "require_debug_port": true
-      }
-    }
+    "openocd_chipname": "at91samd21g18"
   },
   "frameworks": [
     "arduino"
@@ -55,10 +32,16 @@
     "maximum_size": 262144,
     "native_usb": true,
     "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "blackmagic",
+      "jlink",
+      "atmel-ice"
+    ],
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true
   },
-  "url": "https://www.adafruit.com/product/3000",
+  "url": "https://www.adafruit.com/product/3333",
   "vendor": "Adafruit"
 }
diff --git a/boards/adafruit_feather_m0.json b/boards/adafruit_feather_m0.json
@@ -21,30 +21,7 @@
     "variant": "feather_m0"
   },
   "debug": {
-    "tools": {
-      "cmsis-dap": {
-        "server": {
-          "package": "tool-openocd",
-          "executable": "bin/openocd",
-          "arguments": [
-            "-s", "$PACKAGE_DIR/scripts",
-            "-f", "interface/cmsis-dap.cfg",
-            "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "target/at91samdXX.cfg"
-          ]
-        },
-        "load_cmd": "preload"
-      },
-      "blackmagic": {
-        "hwids": [
-          [
-            "0x1d50",
-            "0x6018"
-          ]
-        ],
-        "require_debug_port": true
-      }
-    }
+    "openocd_chipname": "at91samd21g18"
   },
   "frameworks": [
     "arduino"
@@ -56,6 +33,12 @@
     "maximum_size": 262144,
     "native_usb": true,
     "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "blackmagic",
+      "jlink",
+      "atmel-ice"
+    ],
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true

diff --git a/boards/adafruit_feather_m0_express.json b/boards/adafruit_feather_m0_express.json
@@ -20,6 +20,9 @@
     "usb_product": "Feather M0 Express",
     "variant": "feather_m0_express"
   },
+  "debug": {
+    "openocd_chipname": "at91samd21g18"
+  },
   "frameworks": [
     "arduino"
   ],
@@ -30,6 +33,12 @@
     "maximum_size": 262144,
     "native_usb": true,
     "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "blackmagic",
+      "jlink",
+      "atmel-ice"
+    ],
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true

diff --git a/boards/adafruit_gemma_m0.json b/boards/adafruit_gemma_m0.json
@@ -20,6 +20,9 @@
     "usb_product": "Adafruit Gemma M0",
     "variant": "gemma_m0"
   },
+  "debug": {
+    "openocd_chipname": "at91samd21e18"
+  },
   "frameworks": [
     "arduino"
   ],
@@ -30,6 +33,12 @@
     "maximum_size": 262144,
     "native_usb": true,
     "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "blackmagic",
+      "jlink",
+      "atmel-ice"
+    ],
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true

diff --git a/boards/adafruit_metro_m0.json b/boards/adafruit_metro_m0.json
@@ -21,30 +21,7 @@
     "variant": "metro_m0"
   },
   "debug": {
-    "tools": {
-      "cmsis-dap": {
-        "server": {
-          "package": "tool-openocd",
-          "executable": "bin/openocd",
-          "arguments": [
-            "-s", "$PACKAGE_DIR/scripts",
-            "-f", "interface/cmsis-dap.cfg",
-            "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "target/at91samdXX.cfg"
-          ]
-        },
-        "load_cmd": "preload"
-      },
-      "blackmagic": {
-        "hwids": [
-          [
-            "0x1d50",
-            "0x6018"
-          ]
-        ],
-        "require_debug_port": true
-      }
-    }
+    "openocd_chipname": "at91samd21g18"
   },
   "frameworks": [
     "arduino"
@@ -56,6 +33,12 @@
     "maximum_size": 262144,
     "native_usb": true,
     "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "blackmagic",
+      "jlink",
+      "atmel-ice"
+    ],
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true

diff --git a/boards/adafruit_trinket_m0.json b/boards/adafruit_trinket_m0.json
@@ -20,6 +20,9 @@
     "usb_product": "Adafruit Trinket M0",
     "variant": "trinket_m0"
   },
+  "debug": {
+    "openocd_chipname": "at91samd21e18"
+  },
   "frameworks": [
     "arduino"
   ],
@@ -30,6 +33,12 @@
     "maximum_size": 262144,
     "native_usb": true,
     "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "blackmagic",
+      "jlink",
+      "atmel-ice"
+    ],
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true

diff --git a/boards/digix.json b/boards/digix.json
@@ -18,6 +18,9 @@
   "connectivity": [
     "can"
   ],
+  "debug": {
+    "openocd_chipname": "at91sam3X8E"
+  },
   "frameworks": [
     "arduino"
   ],
@@ -28,6 +31,11 @@
     "maximum_size": 524288,
     "native_usb": true,
     "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "jlink",
+      "blackmagic"
+    ],
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true

diff --git a/boards/due.json b/boards/due.json
@@ -23,6 +23,9 @@
     "usb_product": "Arduino Due",
     "variant": "arduino_due_x"
   },
+  "debug": {
+    "openocd_chipname": "at91sam3X8E"
+  },
   "connectivity": [
     "can"
   ],
@@ -37,6 +40,11 @@
     "maximum_size": 524288,
     "native_usb": false,
     "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "jlink",
+      "blackmagic"
+    ],
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": false

diff --git a/boards/dueUSB.json b/boards/dueUSB.json
@@ -22,6 +22,9 @@
   "connectivity": [
     "can"
   ],
+  "debug": {
+    "openocd_chipname": "at91sam3X8E"
+  },
   "frameworks": [
     "arduino",
     "simba"
@@ -33,6 +36,11 @@
     "maximum_size": 524288,
     "native_usb": true,
     "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "jlink",
+      "blackmagic"
+    ],
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true

diff --git a/boards/macchina2.json b/boards/macchina2.json
@@ -22,6 +22,9 @@
   "connectivity": [
     "can"
   ],
+  "debug": {
+    "openocd_chipname": "at91sam3X8E"
+  },
   "frameworks": [
     "arduino"
   ],
@@ -32,6 +35,11 @@
     "maximum_size": 524288,
     "native_usb": true,
     "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "jlink",
+      "blackmagic"
+    ],
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true

diff --git a/boards/mkr1000USB.json b/boards/mkr1000USB.json
@@ -31,30 +31,7 @@
     "wifi"
   ],
   "debug": {
-    "tools": {
-      "cmsis-dap": {
-        "server": {
-          "package": "tool-openocd",
-          "executable": "bin/openocd",
-          "arguments": [
-            "-s", "$PACKAGE_DIR/scripts",
-            "-f", "interface/cmsis-dap.cfg",
-            "-c", "set CHIPNAME at91samd21g18; set ENDIAN little; set telnet_port 0",
-            "-f", "target/at91samdXX.cfg"
-          ]
-        },
-        "load_cmd": "preload"
-      },
-      "blackmagic": {
-        "hwids": [
-          [
-            "0x1d50",
-            "0x6018"
-          ]
-        ],
-        "require_debug_port": true
-      }
-    }
+    "openocd_chipname": "at91samd21g18"
   },
   "frameworks": [
     "arduino"
@@ -66,6 +43,12 @@
     "maximum_size": 262144,
     "native_usb": true,
     "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "blackmagic",
+      "jlink",
+      "atmel-ice"
+    ],
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true