Skip to content

Commit 68d524f

Browse files
tannewttannewt
authored
Merge pull request adafruit#1506 from sparkfun/master
All files for SparkFun LumiDrive and Redboard Turbo
2 parents 765d877 + b124071 commit 68d524f

10 files changed

Lines changed: 270 additions & 1 deletion

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0" TRAVIS_SDK=arm
2626
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow" TRAVIS_SDK=arm
2727
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero" TRAVIS_SDK=arm
28-
- 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
28+
- 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
2929

3030
addons:
3131
artifacts:

‎ports/atmel-samd/boards/sparkfun_lumidrive/board.c‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include "boards/board.h"
28+
29+
void board_init(void)
30+
{
31+
}
32+
33+
bool board_requests_safe_mode(void) {
34+
return false;
35+
}
36+
37+
void reset_board(void) {
38+
}

‎ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.h‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#define MICROPY_HW_BOARD_NAME "SparkFun LUMIDrive"
2+
#define MICROPY_HW_MCU_NAME "samd21g18"
3+
4+
//#define MICROPY_HW_NEOPIXEL (&pin_PA06)
5+
6+
// Clock rates are off: Salae reads 12MHz which is the limit even though we set it to the safer 8MHz.
7+
#define SPI_FLASH_BAUDRATE (8000000)
8+
9+
#define SPI_FLASH_MOSI_PIN &PIN_PA08
10+
#define SPI_FLASH_MISO_PIN &PIN_PA14
11+
#define SPI_FLASH_SCK_PIN &PIN_PA09
12+
#define SPI_FLASH_CS_PIN &PIN_PA13
13+
14+
#define MICROPY_PORT_A ( 0 )
15+
#define MICROPY_PORT_B ( 0 )
16+
#define MICROPY_PORT_C ( 0 )
17+
18+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
19+
20+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
21+
22+
#define BOARD_HAS_CRYSTAL 1
23+
24+
//I2C
25+
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
26+
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
27+
28+
//SPI
29+
#define DEFAULT_SPI_BUS_SCK (&pin_PA19)
30+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA18)
31+
#define DEFAULT_SPI_BUS_MISO (&pin_PA21)
32+
33+
//UART
34+
#define DEFAULT_UART_BUS_RX (&pin_PA11)
35+
#define DEFAULT_UART_BUS_TX (&pin_PA10)
36+
37+
// USB is always used internally so skip the pin objects for it.
38+
#define IGNORE_PIN_PA24 1
39+
#define IGNORE_PIN_PA25 1

‎ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.mk‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
LD_FILE = boards/samd21x18-bootloader-external-flash.ld
2+
USB_VID = 0x1B4F
3+
USB_PID = 0x0017
4+
USB_PRODUCT = "LUMIDrive Board"
5+
USB_MANUFACTURER = "SparkFun Electronics"
6+
7+
SPI_FLASH_FILESYSTEM = 1
8+
LONGINT_IMPL = MPZ
9+
10+
CHIP_VARIANT = SAMD21G18A
11+
CHIP_FAMILY = samd21
12+
13+
EXTERNAL_FLASH_DEVICE_COUNT = 1
14+
EXTERNAL_FLASH_DEVICES = "W25Q32FV"
15+
16+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
17+

‎ports/atmel-samd/boards/sparkfun_lumidrive/pins.c‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
#include "board_busses.h"
4+
5+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
6+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) },
7+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA05) },
8+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA19) }, //
9+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA18) }, //
10+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) }, //
11+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) },
12+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA10) },
13+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) },
14+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA20) }, //
15+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA06) }, //
16+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA07) },
17+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) },
18+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) }, //
19+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
20+
};
21+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/atmel-samd/boards/sparkfun_redboard_turbo/board.c‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include "boards/board.h"
28+
29+
void board_init(void)
30+
{
31+
}
32+
33+
bool board_requests_safe_mode(void) {
34+
return false;
35+
}
36+
37+
void reset_board(void) {
38+
}

‎ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.h‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#define MICROPY_HW_BOARD_NAME "SparkFun RedBoard Turbo"
2+
#define MICROPY_HW_MCU_NAME "samd21g18"
3+
4+
5+
#define MICROPY_HW_LED_TX &pin_PA27
6+
#define MICROPY_HW_LED_RX &pin_PA31
7+
8+
#define MICROPY_HW_NEOPIXEL (&pin_PA30)
9+
10+
// Clock rates are off: Salae reads 12MHz which is the limit even though we set it to the safer 8MHz.
11+
#define SPI_FLASH_BAUDRATE (8000000)
12+
13+
#define SPI_FLASH_MOSI_PIN &pin_PB22
14+
#define SPI_FLASH_MISO_PIN &pin_PB03
15+
#define SPI_FLASH_SCK_PIN &pin_PB23
16+
#define SPI_FLASH_CS_PIN &pin_PA13
17+
18+
#define MICROPY_PORT_A ( 0 )
19+
#define MICROPY_PORT_B ( 0 )
20+
#define MICROPY_PORT_C ( 0 )
21+
22+
23+
// If you change this, then make sure to update the linker scripts as well to
24+
// make sure you don't overwrite code.
25+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
26+
27+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
28+
29+
#define BOARD_HAS_CRYSTAL 1
30+
31+
32+
// I2C - also QWIIC
33+
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
34+
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
35+
36+
37+
#define DEFAULT_SPI_BUS_SCK (&pin_PB11)
38+
#define DEFAULT_SPI_BUS_MOSI (&pin_PB10)
39+
#define DEFAULT_SPI_BUS_MISO (&pin_PA12)
40+
41+
42+
#define DEFAULT_UART_BUS_RX (&pin_PA11)
43+
#define DEFAULT_UART_BUS_TX (&pin_PA10)
44+
45+
// USB is always used internally so skip the pin objects for it.
46+
#define IGNORE_PIN_PA24 1
47+
#define IGNORE_PIN_PA25 1

‎ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
LD_FILE = boards/samd21x18-bootloader-external-flash.ld
2+
USB_VID = 0x1B4F
3+
USB_PID = 0x0015
4+
USB_PRODUCT = "RedBoard Turbo Board"
5+
USB_MANUFACTURER = "SparkFun Electronics"
6+
7+
SPI_FLASH_FILESYSTEM = 1
8+
LONGINT_IMPL = MPZ
9+
10+
CHIP_VARIANT = SAMD21G18A
11+
CHIP_FAMILY = samd21
12+
13+
EXTERNAL_FLASH_DEVICE_COUNT = 1
14+
EXTERNAL_FLASH_DEVICES = "W25Q32FV"

‎ports/atmel-samd/boards/sparkfun_redboard_turbo/pins.c‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
#include "board_busses.h"
4+
5+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
6+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
7+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) },
8+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB09) },
9+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) },
10+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA05) },
11+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PB02) },
12+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) },
13+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) },
14+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA10) },
15+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) },
16+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA14) },
17+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA09) },
18+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA08) },
19+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA15) },
20+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA20) },
21+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA21) },
22+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA06) },
23+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA07) },
24+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) },
25+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA16) },
26+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA19) },
27+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) },
28+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) },
29+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) },
30+
{ MP_ROM_QSTR(MP_QSTR_RGB_LED), MP_ROM_PTR(&pin_PA30) },
31+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) },
32+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB10) },
33+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA12) },
34+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
35+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
36+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
37+
};
38+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎supervisor/shared/external_flash/devices.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,4 +407,21 @@ typedef struct {
407407
.write_status_register_split = false, \
408408
}
409409

410+
// Settings for the Winbond W25Q32FV 4MiB SPI flash.
411+
// Datasheet:http://www.winbond.com/resource-files/w25q32fv%20revj%2006032016.pdf?__locale=en
412+
#define W25Q32FV {\
413+
.total_size = (1 << 22), /* 4 MiB */ \
414+
.start_up_time_us = 5000, \
415+
.manufacturer_id = 0xef, \
416+
.memory_type = 0x40, \
417+
.capacity = 0x16, \
418+
.max_clock_speed_mhz = 104, \
419+
.quad_enable_bit_mask = 0x00, \
420+
.has_sector_protection = false, \
421+
.supports_fast_read = true, \
422+
.supports_qspi = false, \
423+
.supports_qspi_writes = false, \
424+
.write_status_register_split = false, \
425+
.single_status_byte = false, \
426+
}
410427
#endif // MICROPY_INCLUDED_ATMEL_SAMD_EXTERNAL_FLASH_DEVICES_H

0 commit comments

Comments
 (0)