Merge remote-tracking branch 'upstream/master'

Conflicts:
	boards.txt
	platform.txt

Author: ladyada

CHANGELOG

@@ -1,6 +1,7 @@
 SAMD CORE ?.?.?? ????.??.??
 
 * Fixed type conflict of utoa function. Thanks @kbumsik
+* Fixed pinMode(pin, OUTPUT) not working after analogRead(pin)
 
 SAMD CORE 1.6.11 2016.12.23
 

cores/arduino/wiring_digital.c

@@ -58,11 +58,8 @@ void pinMode( uint32_t ulPin, uint32_t ulMode )
     break ;
 
     case OUTPUT:
-      // enable input, to support reading back values
-      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].bit.INEN = 1 ;
-
-      // disable pullups
-      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].bit.PULLEN = 0 ;
+      // enable input, to support reading back values, with pullups disabled
+      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_INEN) ;
 
       // Set pin to output mode
       PORT->Group[g_APinDescription[ulPin].ulPort].DIRSET.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;

drivers/Adafruit_CircuitPlay_Express.inf renamed to drivers/Adafruit_Circuit_Playground_Express.inf

@@ -87,11 +87,15 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [SourceDisksNames]
 [DeviceList]
 %DESCRIPTION%=DriverInstall, USB\VID_239A&PID_0018
+%DESCRIPTION%=DriverInstall, USB\VID_239A&PID_0019
+%DESCRIPTION%=DriverInstall, USB\VID_239A&PID_0019&MI_00
 %DESCRIPTION%=DriverInstall, USB\VID_239A&PID_8018&MI_00
 %DESCRIPTION%=DriverInstall, USB\VID_239A&PID_8019&MI_00
 
 [DeviceList.NTamd64]
 %DESCRIPTION%=DriverInstall, USB\VID_239A&PID_0018
+%DESCRIPTION%=DriverInstall, USB\VID_239A&PID_0019
+%DESCRIPTION%=DriverInstall, USB\VID_239A&PID_0019&MI_00
 %DESCRIPTION%=DriverInstall, USB\VID_239A&PID_8018&MI_00
 %DESCRIPTION%=DriverInstall, USB\VID_239A&PID_8019&MI_00
 

drivers/cdc_vista.cat

@@ -37,7 +37,7 @@
             {
               "packager": "arduino",
               "name": "openocd",
-              "version": "0.9.0-arduino"
+              "version": "0.9.0-arduino5-static"
             },
             {
               "packager": "arduino",
@@ -53,6 +53,47 @@
         }
       ],
       "tools": [
+        {
+          "name": "openocd",
+          "version": "0.9.0-arduino5-static",
+          "systems": [
+            {
+              "host": "arm-linux-gnueabihf",
+              "url": "http://downloads.arduino.cc/tools/openocd-0.9.0-arduino5-static-arm-linux-gnueabihf.tar.bz2",
+              "archiveFileName": "openocd-0.9.0-arduino5-static-arm-linux-gnueabihf.tar.bz2",
+              "checksum": "SHA-256:cef48c1448664612dd25168f0a56962aec4ce2f1d7c06dafd86a1b606dc8ae20",
+              "size": "1319000"
+            },
+            {
+              "host": "i686-mingw32",
+              "url": "http://downloads.arduino.cc/tools/openocd-0.9.0-arduino5-static-i686-w64-mingw32.zip",
+              "archiveFileName": "openocd-0.9.0-arduino5-static-i686-w64-mingw32.zip",
+              "checksum": "SHA-256:54c70a0bfa1b0a3a592d6ee9ab532f9715e1dede2e7d46a3232abd72de274c5a",
+              "size": "1641209"
+            },
+            {
+              "host": "x86_64-apple-darwin",
+              "url": "http://downloads.arduino.cc/tools/openocd-0.9.0-arduino5-static-x86_64-apple-darwin15.6.0.tar.bz2",
+              "archiveFileName": "openocd-0.9.0-arduino5-static-x86_64-apple-darwin15.6.0.tar.bz22",
+              "checksum": "SHA-256:14be5c5400e1a32c3d6a15f9c8d2f438634974ab263ff437b91b527e5b5d53a4",
+              "size": "1235752"
+            },
+            {
+              "host": "x86_64-pc-linux-gnu",
+              "url": "http://downloads.arduino.cc/tools/openocd-0.9.0-arduino5-static-x86_64-linux-gnu.tar.bz2",
+              "archiveFileName": "openocd-0.9.0-arduino5-static-x86_64-linux-gnu.tar.bz2",
+              "checksum": "SHA-256:8e378bdcd71c93a39818c16b49b91128c8028e3d9675551ba7eff39462391ba2",
+              "size": "1393855"
+            },
+            {
+              "host": "i686-pc-linux-gnu",
+              "url": "http://downloads.arduino.cc/tools/openocd-0.9.0-arduino5-static-i686-linux-gnu.tar.bz2",
+              "archiveFileName": "openocd-0.9.0-arduino5-static-i686-linux-gnu.tar.bz2",
+              "checksum": "SHA-256:8e0787f54e204fe6e9071b2b7edf8a5e695492696f1182d447647fe5c0bd55bd",
+              "size": "1341739"
+            }
+          ]
+        }
       ]
     }
   ]

extras/package_index.json.PR.template

@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Adafruit SAMD (32-bits ARM Cortex-M0+) Boards
-version=1.6.11
+version=1.6.12
 
 # Compile variables
 # -----------------
@@ -126,8 +126,7 @@ tools.avrdude.upload.params.quiet=-q -q
 tools.avrdude.upload.params.noverify=-V
 tools.avrdude.upload.pattern="{cmd}" "-C{config.path}" {upload.verbose} -p{build.emu.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} "-Uflash:w:{build.path}/{build.project_name}.hex:i"
 
-#temporary disabled remote upload
-tools.avrdude_remote.upload.pattern=/usr/bin/XXX-run-avrdude /tmp/sketch.hex
+tools.avrdude_remote.upload.pattern="openocd --version 2>&1 | grep 2017 && /usr/bin/run-avrdude /tmp/sketch.hex || echo Can't upload; update your Tian first 1>&2; exit 1"
 
 #
 # BOSSA
@@ -148,7 +147,7 @@ tools.bossac_remote.upload.pattern=/usr/bin/run-bossac {upload.verbose} --port=t
 # OpenOCD sketch upload
 #
 
-tools.openocd.path={runtime.tools.openocd-0.9.0-arduino.path}
+tools.openocd.path={runtime.tools.openocd-0.9.0-arduino5-static.path}
 tools.openocd.cmd=bin/openocd
 tools.openocd.cmd.windows=bin/openocd.exe
 
@@ -175,7 +174,7 @@ tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/
 # FIXME: this programmer is a workaround for default options being overwritten by uploadUsingPreferences
 #
 
-tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino.path}
+tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino5-static.path}
 tools.openocd-withbootsize.cmd=bin/openocd
 tools.openocd-withbootsize.cmd.windows=bin/openocd.exe
 

platform.txt

@@ -183,7 +183,7 @@ const PinDescription g_APinDescription[]=
   { PORTB, 23, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },  // SPI FLash SCK
 
   // 39 - Internal NeoPixel
-  { PORTA, 30, PIO_OUTPUT, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // used as output only
+  { PORTA, 30, PIO_DIGITAL, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // used as output only
 
   // 40 (AREF)
   { PORTA, 3, PIO_ANALOG, PIN_ATTR_ANALOG, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // DAC/VREFP

variants/metro_m0/variant.cpp

@@ -202,7 +202,6 @@ extern SERCOM sercom3;
 extern SERCOM sercom4;
 extern SERCOM sercom5;
 
-extern Uart Serial5;
 extern Uart Serial1;
 
 #endif