Skip to content

Commit aec39fd

Browse files
bwshockleybwshockley
committed
Updated to new D21G18 MCU
Updated MIni SAM M0 to new D21G18A MCU to match layout/design of M4
1 parent e3041e8 commit aec39fd

File tree

5 files changed

+88
-52
lines changed

5 files changed

+88
-52
lines changed

‎lib/uzlib

Submodule uzlib updated 251 files

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626

2727
#include "boards/board.h"
2828

29-
void board_init(void)
30-
{
29+
void board_init(void) {
3130
}
3231

3332
bool board_requests_safe_mode(void) {

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

Lines changed: 49 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,62 @@
11
// Board Name / MCU Type
22
#define MICROPY_HW_BOARD_NAME "Mini Sam M0"
3-
#define MICROPY_HW_MCU_NAME "samd21e18"
4-
5-
// LED
6-
#define MICROPY_HW_NEOPIXEL (&pin_PA27)
7-
//#define MICROPY_HW_LED_MSC PIN_PA15 // red
8-
9-
// Do not reset these pins.
10-
#define MICROPY_PORT_A (PORT_PA24 | PORT_PA25)
11-
#define MICROPY_PORT_B (0)
3+
#define MICROPY_HW_MCU_NAME "samd21g18"
4+
5+
// RGB LED Definition
6+
#define CIRCUITPY_BITBANG_APA102
7+
#define MICROPY_HW_APA102_MOSI (&pin_PA00)
8+
#define MICROPY_HW_APA102_SCK (&pin_PB02)
9+
10+
// Set at 8Mhz
11+
#define SPI_FLASH_BAUDRATE (8000000)
12+
13+
#define SPI_FLASH_MOSI_PIN PIN_PA10
14+
#define SPI_FLASH_MISO_PIN PIN_PA08
15+
#define SPI_FLASH_SCK_PIN PIN_PA11
16+
#define SPI_FLASH_CS_PIN PIN_PA09
17+
#define SPI_FLASH_MOSI_PIN_FUNCTION PINMUX_PA10D_SERCOM0_PAD2
18+
#define SPI_FLASH_MISO_PIN_FUNCTION PINMUX_PA08D_SERCOM0_PAD0
19+
#define SPI_FLASH_SCK_PIN_FUNCTION PINMUX_PA11D_SERCOM0_PAD3
20+
#define SPI_FLASH_SERCOM SERCOM0
21+
#define SPI_FLASH_SERCOM_INDEX 0
22+
#define SPI_FLASH_MOSI_PAD 2
23+
#define SPI_FLASH_MISO_PAD 0
24+
#define SPI_FLASH_SCK_PAD 3
25+
// <o> Transmit Data Pinout
26+
// <0x0=>PAD[0,1]_DO_SCK
27+
// <0x1=>PAD[2,3]_DO_SCK
28+
// <0x2=>PAD[3,1]_DO_SCK
29+
// <0x3=>PAD[0,3]_DO_SCK
30+
#define SPI_FLASH_DOPO 1
31+
#define SPI_FLASH_DIPO 1 // same as MISO pad
32+
33+
// These are pins not to reset.
34+
#define MICROPY_PORT_A (PORT_PA00 | PORT_PA08 | PORT_PA09 | PORT_PA10 |PORT_PA11 | PORT_PA24 | PORT_PA25)
35+
#define MICROPY_PORT_B (PORT_PB02)
1236
#define MICROPY_PORT_C (0)
1337

14-
#include "internal_flash.h"
38+
// If you change this, then make sure to update the linker scripts as well to
39+
// make sure you don't overwrite code.
40+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
41+
42+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
1543

16-
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
44+
#include "external_flash/devices.h"
1745

18-
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
46+
#define EXTERNAL_FLASH_DEVICE_COUNT 1
47+
#define EXTERNAL_FLASH_DEVICES W25Q16JV_IM
1948

20-
#define BOARD_HAS_CRYSTAL 1
49+
#include "external_flash/external_flash.h"
2150

22-
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
23-
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
51+
#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
52+
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
2453

25-
#define DEFAULT_SPI_BUS_SCK (&pin_PA17)
26-
#define DEFAULT_SPI_BUS_MOSI (&pin_PA16)
27-
#define DEFAULT_SPI_BUS_MISO (&pin_PA19)
54+
#define DEFAULT_SPI_BUS_SCK (&pin_PB03)
55+
#define DEFAULT_SPI_BUS_MOSI (&pin_PB22)
56+
#define DEFAULT_SPI_BUS_MISO (&pin_PA23)
2857

29-
#define DEFAULT_UART_BUS_RX (&pin_PA11)
30-
#define DEFAULT_UART_BUS_TX (&pin_PA10)
58+
#define DEFAULT_UART_BUS_RX (&pin_PA16)
59+
#define DEFAULT_UART_BUS_TX (&pin_PA17)
3160

3261
// USB is always used internally so skip the pin objects for it.
3362
#define IGNORE_PIN_PA24 1

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
LD_FILE = boards/samd21x18-bootloader.ld
1+
LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
22
USB_VID = 0x1209
33
USB_PID = 0x2017
44
USB_PRODUCT = "Mini SAM M0"
55
USB_MANUFACTURER = "Benjamin Shockley"
66

7-
INTERNAL_FLASH_FILESYSTEM = 1
8-
LONGINT_IMPL = NONE
7+
SPI_FLASH_FILESYSTEM = 1
8+
LONGINT_IMPL = MPZ
99

10-
CHIP_VARIANT = SAMD21E18A
10+
CHIP_VARIANT = SAMD21G18A
1111
CHIP_FAMILY = samd21
12-
13-
# Include these Python libraries in firmware.
14-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

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

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,41 @@
44

55
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
66
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
7-
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA06) },
8-
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA07) },
7+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) },
8+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB09) },
99
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) },
1010
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA05) },
11-
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA08) },
12-
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PA09) },
13-
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA17) },
14-
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA16) },
15-
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA19) },
16-
{ MP_ROM_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_PA18) },
17-
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) },
18-
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) },
19-
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA10) },
20-
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) },
21-
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) },
22-
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) },
23-
{ MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PA14) },
24-
{ MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_PA15) },
25-
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA15) },
26-
{ MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_PA18) },
27-
{ MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_PA27) },
28-
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA27) },
29-
{ MP_ROM_QSTR(MP_QSTR_D28), MP_ROM_PTR(&pin_PA28) },
30-
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_PA28) },
11+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA06) },
12+
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PA07) },
13+
14+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB03) },
15+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB22) },
16+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB23) },
17+
18+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA16) },
19+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA16) },
20+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA17) },
21+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA17) },
22+
23+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12) },
24+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13) },
25+
26+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA07) },
27+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA19) },
28+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA20) },
29+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA21) },
30+
31+
// Built-in User Button
32+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA01) },
33+
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_PA01) },
34+
35+
// Built-in Red LED
36+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PA15) },
37+
{ MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA15) },
38+
{ MP_OBJ_NEW_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_PA15) },
39+
40+
{ MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_PA00) },
41+
{ MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_PB02) },
3142
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
3243
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
3344
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },

0 commit comments

Comments
 (0)