Merge pull request #1786 from maholli/master

keeping travis happy (with proper load-leveling)
2019-04-12 12:58:42 -07:00 · 2019-04-12 12:58:42 -07:00 · 22ca98501b
commit 22ca98501b
parent 29615dae06 7161038d6b
5 changed files with 127 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -24,7 +24,7 @@ env:
  - TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini" TRAVIS_SDK=arm:nrf
  - TRAVIS_BOARDS="metro_m0_express metro_m4_express metro_m4_airlift_lite pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo bast_pro_mini_m0" TRAVIS_SDK=arm
  - TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip" TRAVIS_SDK=arm
-  - TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10" TRAVIS_SDK=arm
+  - TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10 kicksat-sprite" TRAVIS_SDK=arm
  - TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev pybadge" TRAVIS_SDK=arm

 addons:
--- a/ports/atmel-samd/boards/kicksat-sprite/board.c
+++ b/ports/atmel-samd/boards/kicksat-sprite/board.c
@ -0,0 +1,41 @@
+/*
+ * 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 <string.h>
+
+#include "boards/board.h"
+#include "py/mpconfig.h"
+
+void board_init(void) {
+}
+
+bool board_requests_safe_mode(void) {
+    return false;
+}
+
+void reset_board(void) {
+}
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
@ -0,0 +1,30 @@
+
+#define MICROPY_HW_BOARD_NAME "Sprite_v2b"
+#define MICROPY_HW_MCU_NAME "samd51G19"
+#define CIRCUITPY_MCU_FAMILY samd51
+
+#define MICROPY_HW_LED_STATUS   (&pin_PB03)
+
+#define MICROPY_PORT_A        (PORT_PA24 | PORT_PA25)
+#define MICROPY_PORT_B        (0)
+#define MICROPY_PORT_C        (0)
+#define MICROPY_PORT_D 		  (0)
+
+#define CALIBRATE_CRYSTALLESS 1
+
+#define CIRCUITPY_INTERNAL_NVM_SIZE 0
+
+#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - 0x010000)
+
+#define DEFAULT_I2C_BUS_SCL  (&pin_PA17)
+#define DEFAULT_I2C_BUS_SDA  (&pin_PA16)
+
+#define DEFAULT_SPI_BUS_SCK  (&pin_PA05)
+#define DEFAULT_SPI_BUS_MOSI (&pin_PA07)
+#define DEFAULT_SPI_BUS_MISO (&pin_PA04)
+
+#define DEFAULT_UART_BUS_TX  (&pin_PB09)
+#define DEFAULT_UART_BUS_RX  (&pin_PB08)
+
+#define IGNORE_PIN_PA24     1
+#define IGNORE_PIN_PA25     1
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
@ -0,0 +1,17 @@
+LD_FILE = boards/samd51x19-bootloader.ld
+USB_VID = 0x04D8
+USB_PID = 0xED94
+USB_PRODUCT = "kicksat-sprite"
+USB_MANUFACTURER = "maholli"
+
+QSPI_FLASH_FILESYSTEM = 0
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = MPZ
+
+# No touch on SAMD51 yet
+CIRCUITPY_TOUCHIO = 0
+CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_DISPLAYIO = 0
+
+CHIP_VARIANT = SAMD51G19A
+CHIP_FAMILY = samd51
--- a/ports/atmel-samd/boards/kicksat-sprite/pins.c
+++ b/ports/atmel-samd/boards/kicksat-sprite/pins.c
@ -0,0 +1,38 @@
+#include "shared-bindings/board/__init__.h"
+#include "boards/board.h"
+
+STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_SCK),     MP_ROM_PTR(&pin_PA05)  },
+    { MP_ROM_QSTR(MP_QSTR_MOSI),    MP_ROM_PTR(&pin_PA07)  },
+    { MP_ROM_QSTR(MP_QSTR_MISO),    MP_ROM_PTR(&pin_PA04)  },
+
+    { MP_ROM_QSTR(MP_QSTR_radioCS), MP_ROM_PTR(&pin_PA00)  },
+    { MP_ROM_QSTR(MP_QSTR_WAKE),    MP_ROM_PTR(&pin_PA01)  },
+	{ MP_ROM_QSTR(MP_QSTR_SHDWN),   MP_ROM_PTR(&pin_PB10)  },
+    { MP_ROM_QSTR(MP_QSTR_PWDWN),   MP_ROM_PTR(&pin_PB11)  },
+    { MP_ROM_QSTR(MP_QSTR_TST),     MP_ROM_PTR(&pin_PA11)  },
+    { MP_ROM_QSTR(MP_QSTR_FSYNC),   MP_ROM_PTR(&pin_PA13)  },
+	{ MP_ROM_QSTR(MP_QSTR_VCLK),    MP_ROM_PTR(&pin_PA14)  },
+    { MP_ROM_QSTR(MP_QSTR_FSYNC),   MP_ROM_PTR(&pin_PA15)  },
+    { MP_ROM_QSTR(MP_QSTR_MD),   	MP_ROM_PTR(&pin_PA18)  },
+    { MP_ROM_QSTR(MP_QSTR_MC),   	MP_ROM_PTR(&pin_PA19)  },
+
+    { MP_ROM_QSTR(MP_QSTR_PA08),   	MP_ROM_PTR(&pin_PA08)  },
+    { MP_ROM_QSTR(MP_QSTR_PA10),   	MP_ROM_PTR(&pin_PA10)  },
+    { MP_ROM_QSTR(MP_QSTR_PA09),   	MP_ROM_PTR(&pin_PA09)  },
+    { MP_ROM_QSTR(MP_QSTR_PA06),   	MP_ROM_PTR(&pin_PA06)  },
+    { MP_ROM_QSTR(MP_QSTR_DAC0),   	MP_ROM_PTR(&pin_PA02)  },
+   
+    { MP_ROM_QSTR(MP_QSTR_TX),      MP_ROM_PTR(&pin_PB09)  },
+    { MP_ROM_QSTR(MP_QSTR_RX),      MP_ROM_PTR(&pin_PB08)  },
+    { MP_ROM_QSTR(MP_QSTR_SDA),     MP_ROM_PTR(&pin_PA16)  },
+    { MP_ROM_QSTR(MP_QSTR_SCL),     MP_ROM_PTR(&pin_PA17)  },
+
+
+    { MP_ROM_QSTR(MP_QSTR_LED),     MP_ROM_PTR(&pin_PB03)  },
+    
+    { MP_ROM_QSTR(MP_QSTR_UART),    MP_ROM_PTR(&board_uart_obj) },
+    { 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_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);