Merge branch 'release/v3.1.1'

platformio · May 2, 2018 · a826d72 · a826d72
2 parents a8d8745 + 0f81dfe
commit a826d72
Show file tree

Hide file tree

Showing 42 changed files with 200,050 additions and 43 deletions.
diff --git a/boards/adafruit_circuitplayground_m0.json b/boards/adafruit_circuitplayground_m0.json
@@ -20,7 +20,8 @@
     "variant": "circuitplay"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/adafruit_feather_m0.json b/boards/adafruit_feather_m0.json
@@ -21,7 +21,8 @@
     "variant": "feather_m0"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/adafruit_feather_m0_express.json b/boards/adafruit_feather_m0_express.json
@@ -21,7 +21,8 @@
     "variant": "feather_m0_express"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/adafruit_gemma_m0.json b/boards/adafruit_gemma_m0.json
@@ -21,7 +21,8 @@
     "variant": "gemma_m0"
   },
   "debug": {
-    "openocd_chipname": "at91samd21e18"
+    "openocd_chipname": "at91samd21e18",
+    "svd_path": "ATSAMD21E18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/adafruit_metro_m0.json b/boards/adafruit_metro_m0.json
@@ -21,7 +21,8 @@
     "variant": "metro_m0"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/adafruit_trinket_m0.json b/boards/adafruit_trinket_m0.json
@@ -21,7 +21,8 @@
     "variant": "trinket_m0"
   },
   "debug": {
-    "openocd_chipname": "at91samd21e18"
+    "openocd_chipname": "at91samd21e18",
+    "svd_path": "ATSAMD21E18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/digix.json b/boards/digix.json
@@ -19,7 +19,8 @@
     "can"
   ],
   "debug": {
-    "openocd_chipname": "at91sam3X8E"
+    "openocd_chipname": "at91sam3X8E",
+    "svd_path": "ATSAM3X8E.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/due.json b/boards/due.json
@@ -27,7 +27,8 @@
     "can"
   ],
   "debug": {
-    "openocd_chipname": "at91sam3X8E"
+    "openocd_chipname": "at91sam3X8E",
+    "svd_path": "ATSAM3X8E.svd"
   },
   "frameworks": [
     "arduino",

diff --git a/boards/dueUSB.json b/boards/dueUSB.json
@@ -23,7 +23,8 @@
     "can"
   ],
   "debug": {
-    "openocd_chipname": "at91sam3X8E"
+    "openocd_chipname": "at91sam3X8E",
+    "svd_path": "ATSAM3X8E.svd"
   },
   "frameworks": [
     "arduino",

diff --git a/boards/macchina2.json b/boards/macchina2.json
@@ -23,7 +23,8 @@
     "can"
   ],
   "debug": {
-    "openocd_chipname": "at91sam3X8E"
+    "openocd_chipname": "at91sam3X8E",
+    "svd_path": "ATSAM3X8E.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/mkr1000USB.json b/boards/mkr1000USB.json
@@ -31,7 +31,8 @@
     "wifi"
   ],
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/mkrfox1200.json b/boards/mkrfox1200.json
@@ -20,7 +20,8 @@
     "variant": "mkrfox1200"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/mkrgsm1400.json b/boards/mkrgsm1400.json
@@ -20,7 +20,8 @@
     "variant": "mkrgsm1400"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/mkrwan1300.json b/boards/mkrwan1300.json
@@ -20,7 +20,8 @@
     "variant": "mkrwan1300"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/mkrzero.json b/boards/mkrzero.json
@@ -20,7 +20,8 @@
     "variant": "mkrzero"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/mzeroUSB.json b/boards/mzeroUSB.json
@@ -20,7 +20,8 @@
     "variant": "arduino_mzero"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/mzeropro.json b/boards/mzeropro.json
@@ -23,7 +23,8 @@
     "onboard_tools": [
       "cmsis-dap"
     ],
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/mzeroproUSB.json b/boards/mzeroproUSB.json
@@ -31,7 +31,8 @@
     "onboard_tools": [
       "cmsis-dap"
     ],
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/sainSmartDue.json b/boards/sainSmartDue.json
@@ -19,7 +19,8 @@
     "can"
   ],
   "debug": {
-    "openocd_chipname": "at91sam3X8E"
+    "openocd_chipname": "at91sam3X8E",
+    "svd_path": "ATSAM3X8E.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/sainSmartDueUSB.json b/boards/sainSmartDueUSB.json
@@ -19,7 +19,8 @@
     "can"
   ],
   "debug": {
-    "openocd_chipname": "at91sam3X8E"
+    "openocd_chipname": "at91sam3X8E",
+    "svd_path": "ATSAM3X8E.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/samd21_xpro.json b/boards/samd21_xpro.json
@@ -2,13 +2,14 @@
   "build": {
     "cpu": "cortex-m0plus",
     "f_cpu": "48000000L",
-    "mcu": "atsamd21j18a"
+    "mcu": "samd21j18a"
   },
   "debug": {
     "onboard_tools": [
       "cmsis-dap"
     ],
-    "openocd_chipname": "at91samd21j18"
+    "openocd_chipname": "at91samd21j18",
+    "svd_path": "ATSAMD21J18A.svd"
   },
   "frameworks": [
     "mbed"

diff --git a/boards/samd21g18a.json b/boards/samd21g18a.json
@@ -3,15 +3,15 @@
     "core": "samd",
     "cpu": "cortex-m0plus",
     "extra_flags": "-DARDUINO_SAMD_MKR1000 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__",
+    "f_cpu": "48000000L",
     "hwids": [
       [
         "0x03EB",
         "0x2111"
       ]
     ],
     "ldscript": "flash_without_bootloader.ld",
-    "f_cpu": "48000000L",
-    "mcu": "atsamd21g18a",
+    "mcu": "samd21g18a",
     "usb_product": "Atmel ATSAMW25-XPRO",
     "variant": "w25_xplained_pro"
   },
@@ -22,7 +22,8 @@
     "onboard_tools": [
       "cmsis-dap"
     ],
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino",

diff --git a/boards/saml21_xpro_b.json b/boards/saml21_xpro_b.json
@@ -2,13 +2,14 @@
   "build": {
     "cpu": "cortex-m0plus",
     "f_cpu": "48000000L",
-    "mcu": "atsaml21j18b"
+    "mcu": "saml21j18b"
   },
   "debug": {
     "onboard_tools": [
       "cmsis-dap"
     ],
-    "openocd_chipname": "at91saml21j18"
+    "openocd_chipname": "at91saml21j18",
+    "svd_path": "ATSAML21J18B.svd"
   },
   "frameworks": [
     "mbed"

diff --git a/boards/samr21_xpro.json b/boards/samr21_xpro.json
@@ -2,13 +2,14 @@
   "build": {
     "cpu": "cortex-m0plus",
     "f_cpu": "48000000L",
-    "mcu": "atsamr21g18a"
+    "mcu": "samr21g18a"
   },
   "debug": {
     "onboard_tools": [
       "cmsis-dap"
     ],
-    "openocd_chipname": "at91samr21g18"
+    "openocd_chipname": "at91samr21g18",
+    "svd_path": "ATSAMR21G18A.svd"
   },
   "frameworks": [
     "mbed"

diff --git a/boards/sodaq_autonomo.json b/boards/sodaq_autonomo.json
@@ -21,7 +21,8 @@
     "variant": "sodaq_autonomo"
   },
   "debug": {
-    "openocd_chipname": "at91samd21j18"
+    "openocd_chipname": "at91samd21j18",
+    "svd_path": "ATSAMD21J18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/sodaq_explorer.json b/boards/sodaq_explorer.json
@@ -21,7 +21,8 @@
     "variant": "sodaq_explorer"
   },
   "debug": {
-    "openocd_chipname": "at91samd21j18"
+    "openocd_chipname": "at91samd21j18",
+    "svd_path": "ATSAMD21J18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/sodaq_one.json b/boards/sodaq_one.json
@@ -21,7 +21,8 @@
     "variant": "sodaq_one"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/sparkfun_samd21_dev_usb.json b/boards/sparkfun_samd21_dev_usb.json
@@ -20,7 +20,8 @@
     "variant": "arduino_zero"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/sparkfun_samd21_mini_usb.json b/boards/sparkfun_samd21_mini_usb.json
@@ -20,7 +20,8 @@
     "variant": "SparkFun_SAMD_Mini"
   },
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/tian.json b/boards/tian.json
@@ -23,7 +23,8 @@
     "ethernet"
   ],
   "debug": {
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/zero.json b/boards/zero.json
@@ -23,7 +23,8 @@
     "onboard_tools": [
       "cmsis-dap"
     ],
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/boards/zeroUSB.json b/boards/zeroUSB.json
@@ -27,7 +27,8 @@
     "onboard_tools": [
       "cmsis-dap"
     ],
-    "openocd_chipname": "at91samd21g18"
+    "openocd_chipname": "at91samd21g18",
+    "svd_path": "ATSAMD21G18A.svd"
   },
   "frameworks": [
     "arduino"

diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -31,13 +31,12 @@
 
 FRAMEWORK_DIR = platform.get_package_dir("framework-arduinosam")
 assert isdir(FRAMEWORK_DIR)
-FRAMEWORK_VERSION = platform.get_package_version("framework-arduinosam")
 BUILD_CORE = env.BoardConfig().get("build.core", "")
 BUILD_SYSTEM = env.BoardConfig().get("build.system", BUILD_CORE)
 SYSTEM_DIR = join(FRAMEWORK_DIR, "system", BUILD_SYSTEM)
 
 # USB flags
-ARDUINO_USBDEFINES = [("ARDUINO", int(FRAMEWORK_VERSION.split(".")[1]))]
+ARDUINO_USBDEFINES = [("ARDUINO", 10805)]
 if "build.usb_product" in env.BoardConfig():
     ARDUINO_USBDEFINES += [
         ("USB_VID", env.BoardConfig().get("build.hwids")[0][0]),