diff --git a/.travis.yml b/.travis.yml index 90ed07506e..1f47f7e9a4 100755 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ env: - TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0" TRAVIS_SDK=arm - TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow" TRAVIS_SDK=arm - TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero" 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" 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 sparkfun_lumidrive sparkfun_redboard_turbo" TRAVIS_SDK=arm addons: artifacts: diff --git a/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.h b/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.h index 855b00c6fc..7c7579f6c2 100755 --- a/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.h +++ b/ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.h @@ -11,28 +11,16 @@ #define SPI_FLASH_SCK_PIN &PIN_PA09 #define SPI_FLASH_CS_PIN &PIN_PA13 -// All port(pin) definitions should be deleted unless PA06 -- SERCOM0/PAD[2] -// Will need to scour the repo to figure out why this was done. -// I'm guessing these ports are defined elsewehere by default rather than needing to -// repeatedly define them. Saves time to name outliers than participants in -// some cases. #define MICROPY_PORT_A ( 0 ) #define MICROPY_PORT_B ( 0 ) #define MICROPY_PORT_C ( 0 ) -// If you change this, then make sure to update the linker scripts as well to -// make sure you don't overwrite code. #define CIRCUITPY_INTERNAL_NVM_SIZE 256 #define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE) #define BOARD_HAS_CRYSTAL 1 - -// The LUMIDrive board exposed pins are limited, and I2C, TX/RX, and SPI are not -// really exposed but if they are not define (and included in pins.h), Python -// won't start/operate. So define here: - //I2C #define DEFAULT_I2C_BUS_SCL (&pin_PA23) #define DEFAULT_I2C_BUS_SDA (&pin_PA22) diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.h b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.h index 4bd872dd39..cf7c3998bb 100755 --- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.h +++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.h @@ -10,48 +10,11 @@ // Clock rates are off: Salae reads 12MHz which is the limit even though we set it to the safer 8MHz. #define SPI_FLASH_BAUDRATE (8000000) -// -// SPI Flash definitions. The flash SPI MOSI, MISO and SCK need to be on the -// same SERCOM - check the SAMD21 spec to determien which SERCOM to use -// (post PINs have 2 SERCOMS to work with) -// #define SPI_FLASH_MOSI_PIN &pin_PB22 #define SPI_FLASH_MISO_PIN &pin_PB03 #define SPI_FLASH_SCK_PIN &pin_PB23 #define SPI_FLASH_CS_PIN &pin_PA13 - -// #define SPI_FLASH_MOSI_PIN_FUNCTION PINMUX_PB22D_SERCOM5_PAD2 -// #define SPI_FLASH_MISO_PIN_FUNCTION PINMUX_PB03D_SERCOM5_PAD1 -// #define SPI_FLASH_SCK_PIN_FUNCTION PINMUX_PB23D_SERCOM5_PAD3 -// #define SPI_FLASH_SERCOM SERCOM5 -// #define SPI_FLASH_SERCOM_INDEX 5 -// #define SPI_FLASH_MOSI_PAD 2 -// #define SPI_FLASH_MISO_PAD 1 -// #define SPI_FLASH_SCK_PAD 3 - - -// // Transmit Data Pinout - -// // -// // The logic for DOPO and DIPO is the following -// // In master SPI operation -// // DIPO = MISO -// // DOPO - Based on the below table, where -// // = [MOSI PAD, SCK PAD] -// // <0x0> = PAD[0,1] -// // <0x1> = PAD[2,3] -// // <0x2> = PAD[3,1] -// // <0x3> = PAD[0,3] -// // -// /// For the RedBoard Turbo Board DOPO [2,3] => 1 -// #define SPI_FLASH_DOPO 1 -// #define SPI_FLASH_DIPO 1 // same as MISO pad - -// These are pins not to reset. -// This map to the pins as defined above for FLASH. Note the PORT letters - assign A-to-A, B-to-B ..etc -// PA24 and PA25 are for USB - #define MICROPY_PORT_A ( 0 ) #define MICROPY_PORT_B ( 0 ) #define MICROPY_PORT_C ( 0 ) @@ -63,22 +26,6 @@ #define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE) - -// What external flash device is being used on this board? -// The devices are defined in "exteral_flash/devices.h", which -// contains a flash struct def and a list of #defines for each -// supported/defined flash module. -// -// This board - the LUMIDrive - uses a W25Q32FV component. It's -// definition was added to devices.h, based on the winbond spec sheet. -// -// You can list N number of devices - just update the count define and comma -// seperate the EXTERNAL_FLASH_DEVICES list of devices. - -// #define EXTERNAL_FLASH_DEVICE_COUNT 1 -// #define EXTERNAL_FLASH_DEVICES W25Q32FV - - #define BOARD_HAS_CRYSTAL 1