Added MKR Zero board definition.

6 files changed, 172 insertions, 44 deletions

diff --git a/README.rst b/README.rst
index 138dbfea7..76c7315dc 100644
--- a/README.rst
+++ b/README.rst
@@ -60,13 +60,13 @@ Other
    supported using the `Adafruit CircuitPython SD
    library <https://github.com/adafruit/Adafruit_CircuitPython_SD>`__)
 -  `Arduino Zero <https://www.arduino.cc/en/Main/ArduinoBoardZero>`__
+-  `Arduino MKR Zero <https://store.arduino.cc/arduino-mkrzero>`
 
 "Third-party" or "non-Adafruit" boards
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 -  `Electronic Cats Meow Meow <https://electroniccats.com/gomeow/>`__
--  `Electronic Cats CatWAN USB Stick <https://electroniccats.com/producto/catwan_usb_stick/>`__ 
-
+-  `Electronic Cats CatWAN USB Stick <https://electroniccats.com/producto/catwan_usb_stick/>`
 
 Download
 --------
diff --git a/ports/atmel-samd/README.rst b/ports/atmel-samd/README.rst
index 0c1026644..649a142e1 100644
--- a/ports/atmel-samd/README.rst
+++ b/ports/atmel-samd/README.rst
@@ -2,9 +2,16 @@ SAMD21x18
 =========
 
 This port brings MicroPython to SAMD21x18 based development boards under the name
-CircuitPython. Supported boards include the Adafruit CircuitPlayground Express,
-Adafruit Feather M0 Express, Adafruit Metro M0 Express, Arduino Zero, Adafruit
-Feather M0 Basic and Adafruit M0 Bluefruit LE.
+CircuitPython. Supported boards include:
+
+-  Adafruit CircuitPlayground Express
+-  Adafruit Feather M0 Basic
+-  Adafruit Feather M0 Express
+-  Adafruit Metro M0 Express
+-  Adafruit M0 Bluefruit LE
+-  Arduino Zero
+-  Arduino MKR Zero
+
 
 Pinout
 ------
@@ -15,51 +22,51 @@ different names. The table below matches the pin order in
 and omits the pins only available on the largest package because all supported
 boards use smaller version.
 
-=====================  ===============  ===========================  ======================  ================  ==================  =========================  ================  ================
+=====================  ===================  ===============  ===========================  ======================  ================  ==================  =========================  ================  ================
 `microcontroller.pin`  `board`
----------------------  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-Datasheet              arduino_zero     circuitplayground_express    feather_m0_adalogger    feather_m0_basic  feather_m0_express  gemma_m0                   metro_m0_express  trinket_m0
-=====================  ===============  ===========================  ======================  ================  ==================  =========================  ================  ================
-PA00                                    ``ACCELEROMETER_SDA``                                                                      ``APA102_MOSI``                              ``APA102_MOSI``
-PA01                                    ``ACCELEROMETER_SCL``                                                                      ``APA102_SCK``                               ``APA102_SCK``
-PA02                   ``A0``           ``A0`` / ``SPEAKER``         ``A0``                  ``A0``            ``A0``              ``A0`` / ``D1``            ``A0``            ``D1`` / ``A0``
+---------------------  -------------------  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+Datasheet              arduino_mkrzero      arduino_zero     circuitplayground_express    feather_m0_adalogger    feather_m0_basic  feather_m0_express  gemma_m0                   metro_m0_express  trinket_m0
+=====================  ===================  ===============  ===========================  ======================  ================  ==================  =========================  ================  ================
+PA00                                                         ``ACCELEROMETER_SDA``                                                                      ``APA102_MOSI``                              ``APA102_MOSI``
+PA01                                                         ``ACCELEROMETER_SCL``                                                                      ``APA102_SCK``                               ``APA102_SCK``
+PA02                    ``A0``              ``A0``           ``A0`` / ``SPEAKER``         ``A0``                  ``A0``            ``A0``              ``A0`` / ``D1``            ``A0``            ``D1`` / ``A0``
 PA03
-PB08                   ``A1``           ``A7`` / ``TX``              ``A1``                  ``A1``            ``A1``                                         ``A1``
-PB09                   ``A2``           ``A6`` / ``RX``              ``A2``                  ``A2``            ``A2``                                         ``A2``
-PA04                   ``A3``           ``IR_PROXIMITY``             ``A3``                  ``A3``            ``A3``              ``D0`` / ``TX`` / ``SDA``  ``A3``
-PA05                   ``A4``           ``A1``                       ``A4``                  ``A4``            ``A4``              ``D2`` / ``RX`` / ``SCL``  ``A4``
-PA06                   ``D8``           ``A2``                       ``D8`` / ``GREEN_LED``                    ``NEOPIXEL``                                   ``D8``            ``D4`` / ``TX``
-PA07                   ``D9``           ``A3``                       ``D9``                  ``D9``            ``D9``                                         ``D9``            ``D3`` / ``RX``
-PA08                   ``D4``           ``MICROPHONE_DO``            ``D4`` / ``SD_CS``                                                                       ``D4``            ``D0`` / ``SDA``
-PA09                   ``D3``           ``TEMPERATURE`` / ``A9``                                                                                              ``D3``            ``D2`` / ``SCL``
-PA10                   ``D1`` / ``TX``  ``MICROPHONE_SCK``           ``D1`` / ``TX``         ``D1`` / ``TX``   ``D1`` / ``TX``                                ``D1`` / ``TX``   ``D13``
-PA11                   ``D0`` / ``RX``  ``LIGHT`` / ``A8``           ``D0`` / ``RX``         ``D0`` / ``RX``   ``D0`` / ``RX``                                ``D0`` / ``RX``
-PB10                   ``MOSI``                                      ``MOSI``                ``MOSI``          ``MOSI``                                       ``MOSI``
-PB11                   ``SCK``                                       ``SCK``                 ``SCK``           ``SCK``                                        ``SCK``
-PA12                   ``MISO``         ``REMOTEIN`` / ``IR_RX``     ``MISO``                ``MISO``          ``MISO``                                       ``MISO``
-PA13                                    ``ACCELEROMETER_INTERRUPT``                                                                                           ``FLASH_CS``
-PA14                   ``D2``           ``BUTTON_B`` / ``D5``                                                                                                 ``D2``
-PA15                   ``D5``           ``SLIDE_SWITCH`` / ``D7``    ``D5``                  ``D5``            ``D5``                                         ``D5``
-PA16                   ``D11``          ``MISO``                     ``D11``                 ``D11``           ``D11``                                        ``D11``
-PA17                   ``D13``          ``D13``                      ``D13`` / ``RED_LED``   ``D13``           ``D13``                                        ``D13``
-PA18                   ``D10``                                       ``D10``                 ``D10``           ``D10``                                        ``D10``
-PA19                   ``D12``                                       ``D12``                 ``D12``           ``D12``                                        ``D12``
-PA20                   ``D6``           ``MOSI``                     ``D6``                  ``D6``            ``D6``                                         ``D6``
-PA21                   ``D7``           ``SCK``                      ``D7`` / ``SD_CD``                                                                       ``D7``
-PA22                   ``SDA``                                       ``SDA``                 ``SDA``           ``SDA``                                        ``SDA``
-PA23                   ``SCL``          ``REMOTEOUT`` / ``IR_TX``    ``SCL``                 ``SCL``           ``SCL``             ``L`` / ``D13``            ``SCL``
+PB08                    ``L``               ``A1``           ``A7`` / ``TX``              ``A1``                  ``A1``            ``A1``                                         ``A1``
+PB09                    ``BATTERY``         ``A2``           ``A6`` / ``RX``              ``A2``                  ``A2``            ``A2``                                         ``A2``
+PA04                    ``A3``              ``A3``           ``IR_PROXIMITY``             ``A3``                  ``A3``            ``A3``              ``D0`` / ``TX`` / ``SDA``  ``A3``
+PA05                    ``A4``              ``A4``           ``A1``                       ``A4``                  ``A4``            ``A4``              ``D2`` / ``RX`` / ``SCL``  ``A4``
+PA06                    ``A5``              ``D8``           ``A2``                       ``D8`` / ``GREEN_LED``                    ``NEOPIXEL``                                   ``D8``            ``D4`` / ``TX``
+PA07                    ``A6``              ``D9``           ``A3``                       ``D9``                  ``D9``            ``D9``                                         ``D9``            ``D3`` / ``RX``
+PA08                    ``D11`` / ``SDA``   ``D4``           ``MICROPHONE_DO``            ``D4`` / ``SD_CS``                                                                       ``D4``            ``D0`` / ``SDA``
+PA09                    ``D12`` / ``SCL``   ``D3``           ``TEMPERATURE`` / ``A9``                                                                                              ``D3``            ``D2`` / ``SCL``
+PA10                    ``D2``              ``D1`` / ``TX``  ``MICROPHONE_SCK``           ``D1`` / ``TX``         ``D1`` / ``TX``   ``D1`` / ``TX``                                ``D1`` / ``TX``   ``D13``
+PA11                    ``D3``              ``D0`` / ``RX``  ``LIGHT`` / ``A8``           ``D0`` / ``RX``         ``D0`` / ``RX``   ``D0`` / ``RX``                                ``D0`` / ``RX``
+PB10                    ``D4``              ``MOSI``                                      ``MOSI``                ``MOSI``          ``MOSI``                                       ``MOSI``
+PB11                    ``D5``              ``SCK``                                       ``SCK``                 ``SCK``           ``SCK``                                        ``SCK``
+PA12                    ``SD_MOSI``         ``MISO``         ``REMOTEIN`` / ``IR_RX``     ``MISO``                ``MISO``          ``MISO``                                       ``MISO``
+PA13                    ``SD_SCK``                           ``ACCELEROMETER_INTERRUPT``                                                                                           ``FLASH_CS``
+PA14                    ``SD_CS``           ``D2``           ``BUTTON_B`` / ``D5``                                                                                                 ``D2``
+PA15                    ``SD_MISO``         ``D5``           ``SLIDE_SWITCH`` / ``D7``    ``D5``                  ``D5``            ``D5``                                         ``D5``
+PA16                    ``D8`` / ``MOSI``   ``D11``          ``MISO``                     ``D11``                 ``D11``           ``D11``                                        ``D11``
+PA17                    ``D9`` / ``SCK``    ``D13``          ``D13``                      ``D13`` / ``RED_LED``   ``D13``           ``D13``                                        ``D13``
+PA18                                        ``D10``                                       ``D10``                 ``D10``           ``D10``                                        ``D10``
+PA19                    ``D10`` / ``MISO``  ``D12``                                       ``D12``                 ``D12``           ``D12``                                        ``D12``
+PA20                    ``D6``              ``D6``           ``MOSI``                     ``D6``                  ``D6``            ``D6``                                         ``D6``
+PA21                    ``D7``              ``D7``           ``SCK``                      ``D7`` / ``SD_CD``                                                                       ``D7``
+PA22                    ``D0``              ``SDA``                                       ``SDA``                 ``SDA``           ``SDA``                                        ``SDA``
+PA23                    ``D1``              ``SCL``          ``REMOTEOUT`` / ``IR_TX``    ``SCL``                 ``SCL``           ``SCL``             ``L`` / ``D13``            ``SCL``
 PA24
 PA25
-PB22                                    ``FLASH_CS``
-PB23                                    ``NEOPIXEL`` / ``D8``
-PA27
-PA28                                    ``BUTTON_A`` / ``D4``
+PB22                    ``D14`` / ``TX``                     ``FLASH_CS``
+PB23                    ``D13`` / ``RX``                     ``NEOPIXEL`` / ``D8``
+PA27                    ``SD_CD``
+PA28                                                         ``BUTTON_A`` / ``D4``
 PA29
-PA30                                    ``SPEAKER_ENABLE``                                                                                                    ``NEOPIXEL``
+PA30                                                         ``SPEAKER_ENABLE``                                                                                                    ``NEOPIXEL``
 PA31
-PB02                   ``A5``           ``A5`` / ``SDA``             ``A5``                  ``A5``            ``A5``                                         ``A5``
-PB03                                    ``A4`` / ``SCL``
-=====================  ===============  ===========================  ======================  ================  ==================  =========================  ================  ================
+PB02                    ``A1``              ``A5``           ``A5`` / ``SDA``             ``A5``                  ``A5``            ``A5``                                         ``A5``
+PB03                    ``A2``                               ``A4`` / ``SCL``
+=====================  ===================  ===============  ===========================  ======================  ================  ==================  =========================  ================  ================
 
 Here is a table about which pins can do what in CircuitPython terms. However,
 just because something is listed, doesn't mean it will always work. Existing use
diff --git a/ports/atmel-samd/boards/arduino_mkrzero/board.c b/ports/atmel-samd/boards/arduino_mkrzero/board.c
new file mode 100644
index 000000000..770bc8259
--- /dev/null
+++ b/ports/atmel-samd/boards/arduino_mkrzero/board.c
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "boards/board.h"
+#include "mpconfigboard.h"
+#include "hal/include/hal_gpio.h"
+
+void board_init(void)
+{
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
diff --git a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.h b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.h
new file mode 100644
index 000000000..d98da4d14
--- /dev/null
+++ b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.h
@@ -0,0 +1,24 @@
+#define MICROPY_HW_BOARD_NAME "Arduino MKR Zero"
+#define MICROPY_HW_MCU_NAME "samd21g18"
+
+#define MICROPY_PORT_A        (0)
+#define MICROPY_PORT_B        (0)
+#define MICROPY_PORT_C        (0)
+
+#define CIRCUITPY_INTERNAL_NVM_SIZE 0
+
+#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
+
+#define DEFAULT_I2C_BUS_SCL (&pin_PA09)
+#define DEFAULT_I2C_BUS_SDA (&pin_PA08)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_PA17)
+#define DEFAULT_SPI_BUS_MOSI (&pin_PA16)
+#define DEFAULT_SPI_BUS_MISO (&pin_PA19)
+
+#define DEFAULT_UART_BUS_RX (&pin_PB23)
+#define DEFAULT_UART_BUS_TX (&pin_PB22)
+
+// USB is always used internally so skip the pin objects for it.
+#define IGNORE_PIN_PA24     1
+#define IGNORE_PIN_PA25     1
diff --git a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
new file mode 100644
index 000000000..309351289
--- /dev/null
+++ b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
@@ -0,0 +1,11 @@
+LD_FILE = boards/samd21x18-bootloader.ld
+USB_VID = 0x239A
+USB_PID = 0x8035
+USB_PRODUCT = "Arduino MKRZero"
+USB_MANUFACTURER = "Arduino"
+
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = NONE
+
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/arduino_mkrzero/pins.c b/ports/atmel-samd/boards/arduino_mkrzero/pins.c
new file mode 100644
index 000000000..e06400f35
--- /dev/null
+++ b/ports/atmel-samd/boards/arduino_mkrzero/pins.c
@@ -0,0 +1,46 @@
+#include "shared-bindings/board/__init__.h"
+
+#include "board_busses.h"
+
+STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
+    { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB02) },
+    { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB03) },
+    { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) },
+    { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA05) },
+    { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA06) },
+    { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PA07) },
+    { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA22) },
+    { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA23) },
+    { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA10) },
+    { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA11) },
+    { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PB10) },
+    { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PB11) },
+    { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA20) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA21) },
+    { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA16) },
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA16) },
+    { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA17) },
+    { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA17) },
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA19) },
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA19) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA08) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA08) },
+    { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA09) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA09) },
+    { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PB23) },
+    { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB23) },
+    { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PB22) },
+    { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB22) },    
+    { MP_ROM_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_PA13) },
+    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_PA12) },
+    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_PA15) },
+    { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_PA14) },
+    { MP_ROM_QSTR(MP_QSTR_L),   MP_ROM_PTR(&pin_PB08) },
+    { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_PB09) },
+    { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_PB09) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
+};
+MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);