Skip to content

Commit d751740

Browse files
dhalbertdhalbert
authored
Merge pull request #1190 from ladyada/master
Add trellis m4 variant and little fix for samr21
2 parents 101531b + 14ad7d3 commit d751740

File tree

7 files changed

+137
-0
lines changed

7 files changed

+137
-0
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ env:
3333
- TRAVIS_BOARD=hallowing_m0_express
3434
- TRAVIS_BOARD=feather_nrf52832
3535
- TRAVIS_BOARD=feather_nrf52840_express
36+
- TRAVIS_BOARD=trellis_m4_express
3637

3738
addons:
3839
artifacts:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4242
{ MP_ROM_QSTR(MP_QSTR_CLKM), MP_ROM_PTR(&pin_PC16) },
4343
{ MP_ROM_QSTR(MP_QSTR_RF_SCK), MP_ROM_PTR(&pin_PC18) },
4444
{ MP_ROM_QSTR(MP_QSTR_RF_MISO), MP_ROM_PTR(&pin_PC19) },
45+
{ MP_ROM_QSTR(MP_QSTR_RESETN), MP_ROM_PTR(&pin_PB15) },
4546
};
4647
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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+
#include "mpconfigboard.h"
29+
#include "hal/include/hal_gpio.h"
30+
31+
void board_init(void) {
32+
}
33+
34+
bool board_requests_safe_mode(void) {
35+
return false;
36+
}
37+
38+
void reset_board(void) {
39+
}

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#define MICROPY_HW_BOARD_NAME "Adafruit Trellis M4 Express"
2+
#define MICROPY_HW_MCU_NAME "samd51g19"
3+
4+
#define CIRCUITPY_MCU_FAMILY samd51
5+
6+
// This is for Rev A
7+
#define MICROPY_HW_APA102_MOSI (&pin_PA01)
8+
#define MICROPY_HW_APA102_SCK (&pin_PA00)
9+
10+
#define CIRCUITPY_BITBANG_APA102
11+
12+
// These are pins not to reset.
13+
// QSPI Data pins & DotStar pins
14+
#define MICROPY_PORT_A (PORT_PA00 | PORT_PA01 | PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11)
15+
// QSPI CS, and QSPI SCK
16+
#define MICROPY_PORT_B (PORT_PB10 | PORT_PB11)
17+
#define MICROPY_PORT_C (0)
18+
#define MICROPY_PORT_D (0)
19+
20+
#define AUTORESET_DELAY_MS 500
21+
22+
// If you change this, then make sure to update the linker scripts as well to
23+
// make sure you don't overwrite code
24+
#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
25+
26+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
27+
28+
#include "external_flash/devices.h"
29+
30+
#define EXTERNAL_FLASH_DEVICE_COUNT 1
31+
#define EXTERNAL_FLASH_DEVICES GD25Q64C
32+
33+
#include "external_flash/external_flash.h"
34+
35+
#define DEFAULT_I2C_BUS_SCL (&pin_PB08)
36+
#define DEFAULT_I2C_BUS_SDA (&pin_PB09)
37+
38+
// USB is always used internally so skip the pin objects for it.
39+
#define IGNORE_PIN_PA24 1
40+
#define IGNORE_PIN_PA25 1

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
LD_FILE = boards/samd51x19-bootloader-external-flash.ld
2+
USB_VID = 0x239A
3+
USB_PID = 0x8030
4+
USB_PRODUCT = "Trellis M4 Express"
5+
USB_MANUFACTURER = "Adafruit Industries LLC"
6+
7+
QSPI_FLASH_FILESYSTEM = 1
8+
LONGINT_IMPL = MPZ
9+
10+
CHIP_VARIANT = SAMD51G19A
11+
CHIP_FAMILY = samd51

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
#include "board_busses.h"
4+
5+
// This mapping only includes functional names because pins broken
6+
// out on connectors are labeled with their MCU name available from
7+
// microcontroller.pin.
8+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
9+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
10+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA05) },
11+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA04) }, // INT pin
12+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MICOUT), MP_ROM_PTR(&pin_PA06) },
13+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MICIN), MP_ROM_PTR(&pin_PA07) },
14+
15+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PB08) },
16+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PB09) },
17+
18+
// Key Grid columns
19+
{ MP_OBJ_NEW_QSTR(MP_QSTR_COL0), MP_ROM_PTR(&pin_PA14) },
20+
{ MP_OBJ_NEW_QSTR(MP_QSTR_COL1), MP_ROM_PTR(&pin_PA15) },
21+
{ MP_OBJ_NEW_QSTR(MP_QSTR_COL2), MP_ROM_PTR(&pin_PA16) },
22+
{ MP_OBJ_NEW_QSTR(MP_QSTR_COL3), MP_ROM_PTR(&pin_PA17) },
23+
{ MP_OBJ_NEW_QSTR(MP_QSTR_COL4), MP_ROM_PTR(&pin_PA20) },
24+
{ MP_OBJ_NEW_QSTR(MP_QSTR_COL5), MP_ROM_PTR(&pin_PA21) },
25+
{ MP_OBJ_NEW_QSTR(MP_QSTR_COL6), MP_ROM_PTR(&pin_PA22) },
26+
{ MP_OBJ_NEW_QSTR(MP_QSTR_COL7), MP_ROM_PTR(&pin_PA23) },
27+
// Key Grid rows
28+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ROW0), MP_ROM_PTR(&pin_PA18) },
29+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ROW1), MP_ROM_PTR(&pin_PA19) },
30+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ROW2), MP_ROM_PTR(&pin_PB22) },
31+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ROW3), MP_ROM_PTR(&pin_PB23) },
32+
33+
// IRQ/GPIO pin
34+
{ MP_OBJ_NEW_QSTR(MP_QSTR_INT), MP_ROM_PTR(&pin_PA04) },
35+
36+
// NeoPixels
37+
{ MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA27) },
38+
39+
{ MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_PA01) },
40+
{ MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_PA00) },
41+
42+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
43+
};
44+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎tools/build_adafruit_bins.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ metro_m0_express \
2727
metro_m4_express \
2828
pirkey_m0 \
2929
trinket_m0 \
30+
trellis_m4_express \
3031
"
3132
ROSIE_SETUPS="rosie-ci"
3233

0 commit comments

Comments
 (0)