Skip to content

Commit 0950415

Browse files
tannewttannewt
authored
Merge pull request #885 from dhalbert/feather_m4_reve
rev E feather M4 express; remove named AREF pins
2 parents 754c36b + eab8e43 commit 0950415

File tree

5 files changed

+27
-32
lines changed

5 files changed

+27
-32
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
#define CIRCUITPY_MCU_FAMILY samd51
55

6-
// This is for Rev C which is green
6+
// Rev E
77

8-
#define MICROPY_HW_NEOPIXEL (&pin_PB23)
8+
#define MICROPY_HW_NEOPIXEL (&pin_PB03)
99

1010
// These are pins not to reset.
11-
// QSPI Data pins and TX LED
12-
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09)
13-
// RX LED, QSPI CS, QSPI SCK and NeoPixel pin
14-
#define MICROPY_PORT_B (PORT_PB10 | PORT_PB11 | PORT_PB23 )
11+
// QSPI Data pins
12+
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11)
13+
// QSPI CS, QSPI SCK and NeoPixel pin
14+
#define MICROPY_PORT_B (PORT_PB03 | PORT_PB10 | PORT_PB11)
1515
#define MICROPY_PORT_C (0)
1616
#define MICROPY_PORT_D (0)
1717

@@ -25,8 +25,8 @@
2525

2626
#include "external_flash/devices.h"
2727

28-
#define EXTERNAL_FLASH_DEVICE_COUNT 2
29-
#define EXTERNAL_FLASH_DEVICES W25Q16FW, GD25Q16C
28+
#define EXTERNAL_FLASH_DEVICE_COUNT 1
29+
#define EXTERNAL_FLASH_DEVICES GD25Q16C
3030

3131
#define EXTERNAL_FLASH_QSPI_DUAL
3232

@@ -36,8 +36,8 @@
3636
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
3737

3838
#define DEFAULT_SPI_BUS_SCK (&pin_PA17)
39-
#define DEFAULT_SPI_BUS_MOSI (&pin_PA19)
40-
#define DEFAULT_SPI_BUS_MISO (&pin_PA18)
39+
#define DEFAULT_SPI_BUS_MOSI (&pin_PB23)
40+
#define DEFAULT_SPI_BUS_MISO (&pin_PB22)
4141

42-
#define DEFAULT_UART_BUS_RX (&pin_PA07)
43-
#define DEFAULT_UART_BUS_TX (&pin_PA04)
42+
#define DEFAULT_UART_BUS_RX (&pin_PB17)
43+
#define DEFAULT_UART_BUS_TX (&pin_PB16)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ USB_MANUFACTURER = "Adafruit Industries LLC"
77
QSPI_FLASH_FILESYSTEM = 1
88
LONGINT_IMPL = MPZ
99

10-
CHIP_VARIANT = SAMD51G19A
10+
CHIP_VARIANT = SAMD51J19A
1111
CHIP_FAMILY = samd51

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
1-
#include "samd21_pins.h"
1+
#include "samd51_pins.h"
22
#include "board_busses.h"
33

44
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
55
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
66
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA05) },
77
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB08) },
88
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PB09) },
9-
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA06) },
10-
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA10) },
11-
{ MP_ROM_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_PA03) },
12-
9+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA04) },
10+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA06) },
1311
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA17) },
14-
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA19) },
15-
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA18) },
16-
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA07) },
17-
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA07) },
18-
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA04) },
19-
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA04) },
12+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB23) },
13+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB22) },
14+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PB17) },
15+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB17) },
16+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PB16) },
17+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB16) },
2018
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12) },
2119
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13) },
22-
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA14) },
23-
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA15) },
24-
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA16) },
20+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA16) },
21+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA18) },
22+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA19) },
2523
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA20) },
2624
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA21) },
2725
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA22) },
2826
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA23) },
29-
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PB23) },
27+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PB03) },
28+
{ MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_PB01) },
3029
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
3130
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
3231
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
2828
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12) },
2929
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13) },
3030

31-
{ MP_OBJ_NEW_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_PA03) },
32-
3331
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA01) },
3432
{ MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA00) },
3533
{ MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB23) },

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ STATIC const mp_map_elem_t board_global_dict_table[] = {
3232
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDA), (mp_obj_t)&pin_PB02 },
3333
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCL), (mp_obj_t)&pin_PB03 },
3434

35-
{ MP_OBJ_NEW_QSTR(MP_QSTR_AREF), (mp_obj_t)&pin_PA03 },
36-
3735
{ MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), (mp_obj_t)&pin_PB22 },
3836

3937
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCK), (mp_obj_t)&pin_PA13 },

0 commit comments

Comments
 (0)