Merge remote-tracking branch 'upstream/master'

Conflicts:
	boards.txt
	platform.txt

Author: ladyada

CHANGELOG

@@ -1,3 +1,8 @@
+SAMD CORE 1.6.13 2017.03.31
+
+* Added SDU (SD card Updater) library.
+* Fixed 8MHz clock being generated incorrectly. Thanks @keestux
+
 SAMD CORE 1.6.12 2017.02.07
 
 * Fixed type conflict of utoa function. Thanks @kbumsik

boards.txt

@@ -123,7 +123,6 @@ adafruit_feather_m0_express.bootloader.file=feather/samd21_sam_ba.bin
 #adafruit_metro_m0.bootloader.tool=openocd
 #adafruit_metro_m0.bootloader.file=metro/samd21_sam_ba.bin
 
-#
 # Adafruit Circuit Playground M0
 # ------------------------------
 #adafruit_circuitplayground_m0.name=Adafruit Circuit Playground Express

bootloaders/mkrfox1200/samd21_sam_ba_arduino_mkrfox1200.bin

@@ -27,6 +27,8 @@
   #include "board_definitions_genuino_mkr1000.h"
 #elif defined(BOARD_ID_arduino_mkrzero)
   #include "board_definitions_arduino_mkrzero.h"
+#elif defined(BOARD_ID_arduino_mkrfox1200)
+  #include "board_definitions_arduino_mkrfox1200.h"
 #else
   #error You must define a BOARD_ID and add the corresponding definitions in board_definitions.h
 #endif

bootloaders/mkrfox1200/samd21_sam_ba_arduino_mkrfox1200.hex

@@ -0,0 +1,81 @@
+/*
+  Copyright (c) 2016 Arduino LLC.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _BOARD_DEFINITIONS_H_
+#define _BOARD_DEFINITIONS_H_
+
+/*
+ * USB device definitions
+ */
+#define STRING_PRODUCT "Arduino MKRFox1200"
+#define USB_VID_HIGH   0x23
+#define USB_VID_LOW    0x41
+#define USB_PID_HIGH   0x00
+#define USB_PID_LOW    0x50
+
+/*
+ * If BOOT_DOUBLE_TAP_ADDRESS is defined the bootloader is started by
+ * quickly tapping two times on the reset button.
+ * BOOT_DOUBLE_TAP_ADDRESS must point to a free SRAM cell that must not
+ * be touched from the loaded application.
+ */
+#define BOOT_DOUBLE_TAP_ADDRESS           (0x20007FFCul)
+#define BOOT_DOUBLE_TAP_DATA              (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))
+
+/*
+ * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
+ * pin is tied LOW.
+ */
+//#define BOOT_LOAD_PIN                     PIN_PA21
+//#define BOOT_LOAD_PIN                     PIN_PA15
+
+#define BOOT_USART_MODULE                 SERCOM5
+#define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM5
+#define BOOT_USART_PER_CLOCK_INDEX        GCLK_CLKCTRL_ID_SERCOM5_CORE_Val
+#define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
+#define BOOT_USART_PAD3                   PINMUX_PB23D_SERCOM5_PAD3
+#define BOOT_USART_PAD2                   PINMUX_PB22D_SERCOM5_PAD2
+#define BOOT_USART_PAD1                   PINMUX_UNUSED
+#define BOOT_USART_PAD0                   PINMUX_UNUSED
+
+/* Master clock frequency */
+#define CPU_FREQUENCY                     (48000000ul)
+#define VARIANT_MCK                       CPU_FREQUENCY
+
+/* Frequency of the board main oscillator */
+#define VARIANT_MAINOSC                   (32768ul)
+
+/* Calibration values for DFLL48 pll */
+#define NVM_SW_CALIB_DFLL48M_COARSE_VAL   (58)
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (64)
+
+/*
+ * LEDs definitions
+ */
+// PA20 (digital pin 6)
+#define BOARD_LED_PORT                    (0)
+#define BOARD_LED_PIN                     (20)
+
+// No RX/TX led
+//#define BOARD_LEDRX_PORT
+//#define BOARD_LEDRX_PIN
+
+//#define BOARD_LEDTX_PORT
+//#define BOARD_LEDTX_PIN
+
+#endif // _BOARD_DEFINITIONS_H_

bootloaders/zero/board_definitions.h

@@ -13,5 +13,8 @@ mv -v samd21_sam_ba_genuino_mkr1000.* ../mkr1000/
 BOARD_ID=arduino_mkrzero NAME=samd21_sam_ba_arduino_mkrzero make clean all
 mv -v samd21_sam_ba_arduino_mkrzero.* ../mkrzero/
 
+BOARD_ID=arduino_mkrfox1200 NAME=samd21_sam_ba_arduino_mkrfox1200 make clean all
+mv -v samd21_sam_ba_arduino_mkrfox1200.* ../mkrfox1200/
+
 echo Done building bootloaders!
 

bootloaders/zero/board_definitions_arduino_mkrfox1200.h

@@ -240,13 +240,13 @@ void SERCOM::enableSPI()
 
 void SERCOM::disableSPI()
 {
-  //Setting the enable bit to 0
-  sercom->SPI.CTRLA.bit.ENABLE = 0;
-
   while(sercom->SPI.SYNCBUSY.bit.ENABLE)
   {
     //Waiting then enable bit from SYNCBUSY is equal to 0;
   }
+
+  //Setting the enable bit to 0
+  sercom->SPI.CTRLA.bit.ENABLE = 0;
 }
 
 void SERCOM::setDataOrderSPI(SercomDataOrder dataOrder)

bootloaders/zero/build_all_bootloaders.sh

@@ -48,6 +48,7 @@ class USBDevice_SAMD21G18x {
 
 	inline void runInStandby()   { usb.CTRLA.bit.RUNSTDBY = 1; }
 	inline void noRunInStandby() { usb.CTRLA.bit.RUNSTDBY = 0; }
+	inline void wakeupHost()     { usb.CTRLB.bit.UPRSM = 1; }
 
 	// USB speed
 	inline void setFullSpeed()       { usb.CTRLB.bit.SPDCONF = USB_DEVICE_CTRLB_SPDCONF_FS_Val;   }

cores/arduino/SERCOM.cpp

@@ -65,6 +65,8 @@ class USBDeviceClass {
 	bool configured();
 	bool connected();
 
+	void standby();
+
 	// Setup API
 	bool handleClassInterfaceSetup(USBSetup &setup);
 	bool handleStandardSetup(USBSetup &setup);