Merge branch 'release/v3.1.0'

platformio · Mar 22, 2018 · a8d8745 · a8d8745
2 parents a0bf116 + 7fc2009
commit a8d8745
Show file tree

Hide file tree

Showing 40 changed files with 505 additions and 45 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ env:
   - PLATFORMIO_PROJECT_DIR=examples/arduino-blink
   - PLATFORMIO_PROJECT_DIR=examples/arduino-external-libs
   - PLATFORMIO_PROJECT_DIR=examples/arduino-internal-libs
+  - PLATFORMIO_PROJECT_DIR=examples/arduino-web-thing-led
   - PLATFORMIO_PROJECT_DIR=examples/mbed-blink
   - PLATFORMIO_PROJECT_DIR=examples/mbed-dsp
   # - PLATFORMIO_PROJECT_DIR=examples/mbed-events

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,6 +5,7 @@ environment:
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-blink"
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-external-libs"
     - PLATFORMIO_PROJECT_DIR: "examples/arduino-internal-libs"
+    - PLATFORMIO_PROJECT_DIR: "examples/arduino-web-thing-led"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-blink"
     - PLATFORMIO_PROJECT_DIR: "examples/mbed-dsp"
     # - PLATFORMIO_PROJECT_DIR: "examples/mbed-events"

diff --git a/boards/adafruit_feather_m0.json b/boards/adafruit_feather_m0.json
@@ -1,9 +1,8 @@
 {
   "build": {
     "core": "adafruit",
-    "system": "samd",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -D__SAMD21G18A__",
     "cpu": "cortex-m0plus",
+    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [
@@ -17,6 +16,7 @@
     ],
     "ldscript": "flash_with_bootloader.ld",
     "mcu": "samd21g18a",
+    "system": "samd",
     "usb_product": "Adafruit Feather M0",
     "variant": "feather_m0"
   },

diff --git a/boards/adafruit_feather_m0_express.json b/boards/adafruit_feather_m0_express.json
@@ -1,9 +1,8 @@
 {
   "build": {
     "core": "adafruit",
-    "system": "samd",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARDUINO_SAMD_FEATHER_M0_EXPRESS -D__SAMD21G18A__",
     "cpu": "cortex-m0plus",
+    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DARDUINO_SAMD_FEATHER_M0 -DARDUINO_SAMD_FEATHER_M0_EXPRESS -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [
@@ -17,6 +16,7 @@
     ],
     "ldscript": "flash_with_bootloader.ld",
     "mcu": "samd21g18a",
+    "system": "samd",
     "usb_product": "Feather M0 Express",
     "variant": "feather_m0_express"
   },

diff --git a/boards/adafruit_gemma_m0.json b/boards/adafruit_gemma_m0.json
@@ -1,9 +1,8 @@
 {
   "build": {
     "core": "adafruit",
-    "system": "samd",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_GEMMA_M0 -DCRYSTALLESS -DADAFRUIT_GEMMA_M0 -D__SAMD21E18A__",
     "cpu": "cortex-m0plus",
+    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_GEMMA_M0 -DCRYSTALLESS -DADAFRUIT_GEMMA_M0 -D__SAMD21E18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [
@@ -17,6 +16,7 @@
     ],
     "ldscript": "flash_with_bootloader.ld",
     "mcu": "samd21e18a",
+    "system": "samd",
     "usb_product": "Adafruit Gemma M0",
     "variant": "gemma_m0"
   },

diff --git a/boards/adafruit_metro_m0.json b/boards/adafruit_metro_m0.json
@@ -1,9 +1,8 @@
 {
   "build": {
     "core": "adafruit",
-    "system": "samd",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DDADAFRUIT_METRO_M0_EXPRESS -D__SAMD21G18A__",
     "cpu": "cortex-m0plus",
+    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_SAMD_ZERO -DDADAFRUIT_METRO_M0_EXPRESS -D__SAMD21G18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [
@@ -17,6 +16,7 @@
     ],
     "ldscript": "flash_with_bootloader.ld",
     "mcu": "samd21g18a",
+    "system": "samd",
     "usb_product": "Metro M0 Expres",
     "variant": "metro_m0"
   },

diff --git a/boards/adafruit_trinket_m0.json b/boards/adafruit_trinket_m0.json
@@ -1,9 +1,8 @@
 {
   "build": {
     "core": "adafruit",
-    "system": "samd",
-    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_TRINKET_M0 -DCRYSTALLESS -DADAFRUIT_TRINKET_M0 -D__SAMD21E18A__",
     "cpu": "cortex-m0plus",
+    "extra_flags": "-DARDUINO_ARCH_SAMD -DARDUINO_TRINKET_M0 -DCRYSTALLESS -DADAFRUIT_TRINKET_M0 -D__SAMD21E18A__",
     "f_cpu": "48000000L",
     "hwids": [
       [
@@ -17,6 +16,7 @@
     ],
     "ldscript": "flash_with_bootloader.ld",
     "mcu": "samd21e18a",
+    "system": "samd",
     "usb_product": "Adafruit Trinket M0",
     "variant": "trinket_m0"
   },

diff --git a/boards/digix.json b/boards/digix.json
@@ -42,4 +42,4 @@
   },
   "url": "http://digistump.com/products/50",
   "vendor": "Digistump"
-}
+}
diff --git a/boards/due.json b/boards/due.json
@@ -23,12 +23,12 @@
     "usb_product": "Arduino Due",
     "variant": "arduino_due_x"
   },
-  "debug": {
-    "openocd_chipname": "at91sam3X8E"
-  },
   "connectivity": [
     "can"
   ],
+  "debug": {
+    "openocd_chipname": "at91sam3X8E"
+  },
   "frameworks": [
     "arduino",
     "simba"
@@ -51,4 +51,4 @@
   },
   "url": "https://www.arduino.cc/en/Main/ArduinoBoardDue",
   "vendor": "Arduino"
-}
+}
diff --git a/boards/dueUSB.json b/boards/dueUSB.json
@@ -47,4 +47,4 @@
   },
   "url": "https://www.arduino.cc/en/Main/ArduinoBoardDue",
   "vendor": "Arduino"
-}
+}
diff --git a/boards/macchina2.json b/boards/macchina2.json
@@ -46,4 +46,4 @@
   },
   "url": "https://www.macchina.cc",
   "vendor": "Macchina"
-}
+}
diff --git a/boards/mkr1000USB.json b/boards/mkr1000USB.json
@@ -55,4 +55,4 @@
   },
   "url": "https://www.arduino.cc/en/Main/ArduinoMKR1000",
   "vendor": "Arduino"
-}
+}
diff --git a/boards/mkrfox1200.json b/boards/mkrfox1200.json
@@ -44,4 +44,4 @@
   },
   "url": "https://www.arduino.cc/en/Main.ArduinoBoardMKRFox1200",
   "vendor": "Arduino"
-}
+}
diff --git a/boards/mkrgsm1400.json b/boards/mkrgsm1400.json
@@ -44,4 +44,4 @@
   },
   "url": "https://store.arduino.cc/mkr-gsm-1400",
   "vendor": "Arduino"
-}
+}
diff --git a/boards/mkrwan1300.json b/boards/mkrwan1300.json
@@ -44,4 +44,4 @@
   },
   "url": "https://store.arduino.cc/mkr-wan-1300",
   "vendor": "Arduino"
-}
+}
diff --git a/boards/mzeroUSB.json b/boards/mzeroUSB.json
@@ -44,4 +44,4 @@
   },
   "url": "https://www.arduino.cc/en/Main/ArduinoBoardM0",
   "vendor": "Arduino"
-}
+}
diff --git a/boards/mzeropro.json b/boards/mzeropro.json
@@ -47,4 +47,4 @@
   },
   "url": "https://www.arduino.cc/en/Main/ArduinoBoardM0PRO",
   "vendor": "Arduino"
-}
+}
diff --git a/boards/mzeroproUSB.json b/boards/mzeroproUSB.json
@@ -55,4 +55,4 @@
   },
   "url": "https://www.arduino.cc/en/Main/ArduinoBoardM0PRO",
   "vendor": "Arduino"
-}
+}
diff --git a/boards/sainSmartDue.json b/boards/sainSmartDue.json
@@ -42,4 +42,4 @@
   },
   "url": "http://www.sainsmart.com/arduino/control-boards/sainsmart-due-atmel-sam3x8e-arm-cortex-m3-board-black.html",
   "vendor": "SainSmart"
-}
+}
diff --git a/boards/sainSmartDueUSB.json b/boards/sainSmartDueUSB.json
@@ -29,17 +29,17 @@
     "disable_flushing": true,
     "maximum_ram_size": 32768,
     "maximum_size": 524288,
+    "native_usb": true,
     "protocol": "sam-ba",
     "protocols": [
       "sam-ba",
       "jlink",
       "blackmagic"
     ],
-    "native_usb": true,
     "require_upload_port": true,
     "use_1200bps_touch": true,
     "wait_for_upload_port": true
   },
   "url": "http://www.sainsmart.com/arduino/control-boards/sainsmart-due-atmel-sam3x8e-arm-cortex-m3-board-black.html",
   "vendor": "SainSmart"
-}
+}
diff --git a/boards/samd21_xpro.json b/boards/samd21_xpro.json
@@ -27,4 +27,4 @@
   },
   "url": "https://developer.mbed.org/platforms/SAMD21-XPRO/",
   "vendor": "Atmel"
-}
+}
diff --git a/boards/samd21g18a.json b/boards/samd21g18a.json
@@ -1,16 +1,31 @@
 {
   "build": {
+    "core": "samd",
     "cpu": "cortex-m0plus",
+    "extra_flags": "-DARDUINO_SAMD_MKR1000 -DARDUINO_ARCH_SAMD -D__SAMD21G18A__",
+    "hwids": [
+      [
+        "0x03EB",
+        "0x2111"
+      ]
+    ],
+    "ldscript": "flash_without_bootloader.ld",
     "f_cpu": "48000000L",
-    "mcu": "atsamd21g18a"
+    "mcu": "atsamd21g18a",
+    "usb_product": "Atmel ATSAMW25-XPRO",
+    "variant": "w25_xplained_pro"
   },
+  "connectivity": [
+    "wifi"
+  ],
   "debug": {
     "onboard_tools": [
       "cmsis-dap"
     ],
     "openocd_chipname": "at91samd21g18"
   },
   "frameworks": [
+    "arduino",
     "mbed"
   ],
   "name": "Atmel ATSAMW25-XPRO",
@@ -27,4 +42,4 @@
   },
   "url": "https://developer.mbed.org/platforms/SAMW25-XPRO/",
   "vendor": "Atmel"
-}
+}
diff --git a/boards/saml21_xpro_b.json b/boards/saml21_xpro_b.json
@@ -27,4 +27,4 @@
   },
   "url": "https://developer.mbed.org/platforms/SAML21-XPRO/",
   "vendor": "Atmel"
-}
+}
diff --git a/boards/samr21_xpro.json b/boards/samr21_xpro.json
@@ -27,4 +27,4 @@
   },
   "url": "https://developer.mbed.org/platforms/SAMR21-XPRO/",
   "vendor": "Atmel"
-}
+}
diff --git a/boards/sodaq_autonomo.json b/boards/sodaq_autonomo.json
@@ -1,7 +1,6 @@
 {
   "build": {
     "core": "sodaq",
-    "system": "samd",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D__SAMD21J18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_AUTONOMO",
     "f_cpu": "48000000L",
@@ -17,6 +16,7 @@
     ],
     "ldscript": "flash_with_bootloader.ld",
     "mcu": "samd21j18a",
+    "system": "samd",
     "usb_product": "SODAQ Autonomo",
     "variant": "sodaq_autonomo"
   },

diff --git a/boards/sodaq_explorer.json b/boards/sodaq_explorer.json
@@ -1,7 +1,6 @@
 {
   "build": {
     "core": "sodaq",
-    "system": "samd",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D__SAMD21J18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_EXPLORER",
     "f_cpu": "48000000L",
@@ -17,6 +16,7 @@
     ],
     "ldscript": "flash_with_bootloader.ld",
     "mcu": "samd21j18a",
+    "system": "samd",
     "usb_product": "SODAQ ExpLoRer",
     "variant": "sodaq_explorer"
   },

diff --git a/boards/sodaq_one.json b/boards/sodaq_one.json
@@ -1,7 +1,6 @@
 {
   "build": {
     "core": "sodaq",
-    "system": "samd",
     "cpu": "cortex-m0plus",
     "extra_flags": "-D__SAMD21G18A__ -DARDUINO_ARCH_SAMD -DARDUINO_SODAQ_ONE",
     "f_cpu": "48000000L",
@@ -17,6 +16,7 @@
     ],
     "ldscript": "flash_with_bootloader.ld",
     "mcu": "samd21g18a",
+    "system": "samd",
     "usb_product": "SODAQ ONE",
     "variant": "sodaq_one"
   },

diff --git a/boards/sparkfun_samd21_dev_usb.json b/boards/sparkfun_samd21_dev_usb.json
@@ -44,4 +44,4 @@
   },
   "url": "https://www.sparkfun.com/products/13672",
   "vendor": "SparkFun"
-}
+}
diff --git a/boards/sparkfun_samd21_mini_usb.json b/boards/sparkfun_samd21_mini_usb.json
@@ -44,4 +44,4 @@
   },
   "url": "https://www.sparkfun.com/products/13664",
   "vendor": "SparkFun"
-}
+}
diff --git a/boards/tian.json b/boards/tian.json
@@ -47,4 +47,4 @@
   },
   "url": "https://www.arduino.cc/en/Main/ArduinoBoardTian",
   "vendor": "Arduino"
-}
+}
diff --git a/boards/zero.json b/boards/zero.json
@@ -47,4 +47,4 @@
   },
   "url": "https://www.arduino.cc/en/Main/ArduinoBoardZero",
   "vendor": "Arduino"
-}
+}
diff --git a/boards/zeroUSB.json b/boards/zeroUSB.json
@@ -51,4 +51,4 @@
   },
   "url": "https://www.arduino.cc/en/Main/ArduinoBoardZero",
   "vendor": "Arduino"
-}
+}
diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -134,9 +134,7 @@
         join(FRAMEWORK_DIR, "variants", env.BoardConfig().get("build.variant"))
     ))
 
-envsafe = env.Clone()
-
-libs.append(envsafe.BuildLibrary(
+libs.append(env.BuildLibrary(
     join("$BUILD_DIR", "FrameworkArduino"),
     join(FRAMEWORK_DIR, "cores", BUILD_CORE)
 ))

diff --git a/examples/arduino-web-thing-led/.gitignore b/examples/arduino-web-thing-led/.gitignore
@@ -0,0 +1,5 @@
+.pioenvs
+.piolibdeps
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,4 +42,4 @@ @@
       },
       "url": "http://digistump.com/products/50",
       "vendor": "Digistump"
-    }
+    }