Fixed bootloader compilation on Windows. Documentation updates.

Author: mattairtech

CHANGELOG

@@ -1,8 +1,9 @@
-1.6.8-beta-b2:
+1.6.8-beta-b2 (in-progress):
 * Added more Serial, SPI, and WIRE options
 * Added MicroSD card firmware loading in the bootloader
 * Fixed SDU library to work with MattairTech boards
 * Fixed auto-detection for Arduino Zero and M0 board variants
+* Fixed bootloader compilation on Windows
 * Documentation updates
 * Merged in changes from upstream SAMD CORE 1.6.15:
   * 

README.md

@@ -72,8 +72,8 @@ Analog Outputs	| One 10-bit (two 12-bit on L21)	| One 10-bit (two 12-bit on L21)
 PWM Outputs	| 18					| 14					| 14					| 8 (6 for 14-pin)
 Interrupts	| 16					| 16					| 16					| 8 (7 for 14-pin)
 USB		| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device
-SERCOM*		| 6					| 6					| 4					| 3 (2 for 14-pin)
-UART (Serial)*	| Up to 6				| Up to 6				| Up to 4				| Up to 2
+SERCOM*		| 6					| 6					| 4 (6 for L21)				| 3 (2 for 14-pin)
+UART (Serial)*	| Up to 6				| Up to 6				| Up to 4 (up to 5 for L21)		| Up to 2
 SPI*		| Up to 3				| Up to 2				| Up to 2				| Up to 1
 I2C (WIRE)*	| Up to 3				| Up to 2				| Up to 2				| Up to 1
 I2S		| Present on the D21 only		| Present on the D21 only		| Present on the D21 only		| Not present
@@ -306,6 +306,7 @@ TODO: more info
 * On the L21, SERCOM5 is in a low power domain. The Fm+ and HS modes of I2C (wire) are not supported.
 * The SAML and SAMC have double-buffered TCs, which are supported in the core.
 * The CHANGE and RISING interrupt modes on pin A31 do not seem to work properly on the L21.
+* When using pin A31 as UART RX, in Arduino, pinMode(31, INPUT_PULLUP) must be called before SerialX.begin().
 * The L21 has two performance levels that affect power consumption. During powerup, the L21 starts at the lowest performance level (PL0).
   The startup code changes to the highest performance level (PL2) in order to support 48MHz and USB (among other things).
 * Two Flash Wait States are inserted for the L21 and C21 (the D21/D11 use one wait state).
@@ -475,7 +476,7 @@ OS X support currently in beta (see below), the following instructions are only
 3. Click the button next to Additional Boards Manager URLs.
 4. Add https://www.mattairtech.com/software/arduino/package_MattairTech_index.json.
 5. Save preferences, then open the Boards Manager.
-6. Install the Arduino SAM M0+ Boards package. Use version 1.6.2 or higher.
+6. Install the Arduino SAMD Boards package. Use version 1.6.2 or higher.
 7. Install the MattairTech SAM M0+ Boards package.
 8. Close Boards Manager, then click Tools->Board->MattairTech MT-D21E (or MT-D11).
 9. Select the MCU with the now visible Tools->Microcontroller menu (if present).

bootloaders/zero/Makefile

@@ -74,10 +74,12 @@ ifeq ($(OS),Windows_NT)
   ifeq ($(TERM),xterm)
     T=$(shell cygpath -u $(LOCALAPPDATA))
     MODULE_PATH?=$(T)/Arduino15/packages/$(CORE_VENDOR)
+    MODULE_PATH_ARDUINO?=$(T)/Arduino15/packages/arduino
     RM=rm
     SEP=/
   else
     MODULE_PATH?=$(LOCALAPPDATA)/Arduino15/packages/$(CORE_VENDOR)
+    MODULE_PATH_ARDUINO?=$(LOCALAPPDATA)/Arduino15/packages/arduino
     RM=rm
     SEP=\\
   endif
@@ -86,18 +88,20 @@ else
 
   ifeq ($(UNAME_S),Linux)
     MODULE_PATH?=$(HOME)/.arduino15/packages/$(CORE_VENDOR)
+    MODULE_PATH_ARDUINO?=$(HOME)/.arduino15/packages/arduino
     RM=rm
     SEP=/
   endif
 
   ifeq ($(UNAME_S),Darwin)
     MODULE_PATH?=$(HOME)/Library/Arduino15/packages/$(CORE_VENDOR)/
+    MODULE_PATH_ARDUINO?=$(HOME)/Library/Arduino15/packages/arduino/
     RM=rm
     SEP=/
   endif
 endif
 
-ARM_GCC_PATH?=$(MODULE_PATH)/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-
+ARM_GCC_PATH?=$(MODULE_PATH_ARDUINO)/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-
 BUILD_PATH=build
 
 # -----------------------------------------------------------------------------
@@ -122,7 +126,7 @@ BIN=$(NAME).bin
 HEX=$(NAME).hex
 
 
-INCLUDES=-I"$(MODULE_PATH)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/"
+INCLUDES=-I"$(MODULE_PATH_ARDUINO)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/"
 
 # -----------------------------------------------------------------------------
 # Linker options

bootloaders/zero/README.md

@@ -1,36 +1,42 @@
 # Arduino Zero Bootloader
 
-## Prerequisites for Building
-
-The project build is based on Makefile system.
-Makefile is present at project root and try to handle multi-platform cases.
+This bootloader is based on the Arduino Zero bootloader which is a part of the Arduino SAMD core.
+It provides a USB-CDC and/or TTL serial communications interface to a host running the bossac
+command-line firmware programming utility (or Bossa with a GUI). This version adds support for
+the L21 and C21 microcontrollers. It also adds support for four different clock sources (2 external
+crystals and two internal oscillator options). There are additional boards added, and binaries for
+most board/chip combinations are pre-built. Additionally, MicroSD firmware loading is supported.
 
-Multi-plaform GCC is provided by ARM here: https://launchpad.net/gcc-arm-embedded/+download
 
-Atmel Studio contains both make and ARM GCC toolchain. You don't need to install them in this specific use case.
-
-For all builds and platforms you will need to have the Arduino IDE installed and the board support
-package for "Arduino SAMD Boards (32-bits ARM Cortex-M0+)". You can install the latter
-from the former's "Boards Manager" UI.
+## Prerequisites for Using
 
 This version of the bootloader requires bossac (1.7.0-mattairtech-1)
 from the package "MattairTech SAM M0+ Boards" or download bossac directly:
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-mingw32.tar.gz (Windows 32 bit and 64 bit)
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz (Linux 32 bit)
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz (OS X 64 bit)
+Note that the SAM-BA tools from Atmel will not work, and the version of bossac from the Arduino
+SAMD Core currently does not support the L21, C21, or D11 (but it does support the D21).
+
+
+## Prerequisites for Building
+
+For all builds and platforms you will need to have the Arduino IDE installed as well as the packages
+for both Arduino SAMD Boards and for MattairTech SAM M0+ Boards, which provides the needed dependencies
+(CMSIS, CMSIS-Atmel, and the compiler toolchain: arm-none-eabi-gcc), which can be installed using the
+Arduino IDE Boards Manager. This project uses a Makefile, which is present in the root (zero) directory.
+However, you will need a make program:
 
 ### Windows
 
 * Native command line
 Make binary can be obtained here: http://gnuwin32.sourceforge.net/packages/make.htm
+Be sure that no other version of make is in your PATH (ie: MinGW).
 
 * Cygwin/MSys/MSys2/Babun/etc...
 It is available natively in all distributions.
 
-* Atmel Studio
-An Atmel Studio **7** Makefile-based project is present at project root, just open samd21_sam_ba.atsln file in AS7.
-
 ### Linux
 
 Make is usually available by default.