Skip to content

Commit 9cc803e

Browse files
dhalbertdhalbert
authored
Merge pull request #3432 from bd34n/rename-bdmicro-vina-m0-d21
Rename board bdmicro_vina_m0 to bdmicro_vina_d21 and update boardfiles.
2 parents b28b311 + 81ee874 commit 9cc803e

File tree

5 files changed

+37
-38
lines changed

5 files changed

+37
-38
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ jobs:
179179
- "arduino_nano_33_iot"
180180
- "arduino_zero"
181181
- "bast_pro_mini_m0"
182-
- "bdmicro_vina_m0"
182+
- "bdmicro_vina_d21"
183183
- "bless_dev_board_multi_sensor"
184184
- "blm_badge"
185185
- "capablerobot_usbhub"

‎ports/atmel-samd/boards/bdmicro_vina_m0/board.c renamed to ‎ports/atmel-samd/boards/bdmicro_vina_d21/board.c

File renamed without changes.

‎ports/atmel-samd/boards/bdmicro_vina_m0/mpconfigboard.h renamed to ‎ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.h

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
1-
#define MICROPY_HW_BOARD_NAME "BDMICRO Vina M0"
1+
#define MICROPY_HW_BOARD_NAME "BDMICRO VINA-D21"
22
#define MICROPY_HW_MCU_NAME "samd21g18"
33

4-
#define MICROPY_HW_LED_STATUS (&pin_PA28)
5-
#define MICROPY_HW_LED_TX &pin_PA27
6-
#define MICROPY_HW_LED_RX &pin_PA31
7-
8-
// Clock rates are off: Salae reads 12MHz which is the limit even though we set it to the safer 8MHz.
9-
#define SPI_FLASH_BAUDRATE (8000000)
10-
11-
#define SPI_FLASH_MOSI_PIN &pin_PB22
12-
#define SPI_FLASH_MISO_PIN &pin_PB03
13-
#define SPI_FLASH_SCK_PIN &pin_PB23
14-
#define SPI_FLASH_CS_PIN &pin_PA13
15-
164
// These are pins not to reset.
175
#define MICROPY_PORT_A (0)
186
#define MICROPY_PORT_B (0)
197
#define MICROPY_PORT_C (0)
208

21-
#define BOARD_HAS_CRYSTAL 0
9+
#define SPI_FLASH_CS_PIN &pin_PA13
10+
#define SPI_FLASH_MISO_PIN &pin_PB03
11+
#define SPI_FLASH_MOSI_PIN &pin_PB22
12+
#define SPI_FLASH_SCK_PIN &pin_PB23
2213

23-
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
24-
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
14+
// Clock rates are off: Salae reads 12MHz which is the limit even though we set it to the safer 8MHz.
15+
#define SPI_FLASH_BAUDRATE (8000000)
2516

26-
#define DEFAULT_SPI_BUS_SCK (&pin_PB11)
27-
#define DEFAULT_SPI_BUS_MOSI (&pin_PB10)
28-
#define DEFAULT_SPI_BUS_MISO (&pin_PA12)
17+
#define BOARD_HAS_CRYSTAL 1
2918

30-
#define DEFAULT_UART_BUS_RX (&pin_PA11)
3119
#define DEFAULT_UART_BUS_TX (&pin_PA10)
20+
#define DEFAULT_UART_BUS_RX (&pin_PA11)
21+
#define DEFAULT_SPI_BUS_MISO (&pin_PA12)
22+
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
23+
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
24+
#define MICROPY_HW_LED_TX (&pin_PA27)
25+
#define MICROPY_HW_LED_STATUS (&pin_PA28)
26+
#define MICROPY_HW_LED_RX (&pin_PA31)
27+
#define DEFAULT_SPI_BUS_MOSI (&pin_PB10)
28+
#define DEFAULT_SPI_BUS_SCK (&pin_PB11)
3229

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

‎ports/atmel-samd/boards/bdmicro_vina_m0/mpconfigboard.mk renamed to ‎ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
USB_VID = 0x31e2
2-
USB_PID = 0x2002
3-
USB_PRODUCT = "Vina M0"
2+
USB_PID = 0x2001
3+
USB_PRODUCT = "VINA-D21"
44
USB_MANUFACTURER = "BDMICRO LLC"
55

66
CHIP_VARIANT = SAMD21G18A
77
CHIP_FAMILY = samd21
88

99
SPI_FLASH_FILESYSTEM = 1
10-
EXTERNAL_FLASH_DEVICE_COUNT = 1
11-
EXTERNAL_FLASH_DEVICES = "MX25L51245G"
10+
EXTERNAL_FLASH_DEVICE_COUNT = 2
11+
EXTERNAL_FLASH_DEVICES = "MX25L51245G","GD25S512MD"
1212
LONGINT_IMPL = MPZ
1313

1414
CIRCUITPY_BITBANGIO = 0
15+
CIRCUITPY_COUNTIO = 0
1516
CIRCUITPY_I2CPERIPHERAL = 0
1617
CIRCUITPY_VECTORIO = 0
1718

18-
CFLAGS_INLINE_LIMIT = 50
19+
CFLAGS_INLINE_LIMIT = 60
1920
SUPEROPT_GC = 0
21+
22+
CFLAGS_BOARD = --param max-inline-insns-auto=15

‎ports/atmel-samd/boards/bdmicro_vina_m0/pins.c renamed to ‎ports/atmel-samd/boards/bdmicro_vina_d21/pins.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#include "shared-bindings/board/__init__.h"
22

33
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_RTC_INT), MP_ROM_PTR(&pin_PA00) },
5-
{ MP_ROM_QSTR(MP_QSTR_RTC_CLK), MP_ROM_PTR(&pin_PA01) },
64
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
75
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) },
86
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB09) },
@@ -13,25 +11,26 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
1311
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) },
1412
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA10) },
1513
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) },
14+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) },
15+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA16) },
16+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA19) },
17+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) },
1618
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA14) },
17-
{ MP_ROM_QSTR(MP_QSTR_RTC_TS), MP_ROM_PTR(&pin_PA14) },
1819
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA09) },
1920
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA08) },
2021
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA15) },
2122
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA20) },
2223
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA21) },
2324
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA06) },
2425
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA07) },
25-
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) },
26-
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA16) },
27-
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA19) },
28-
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) },
29-
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) },
30-
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) },
31-
{ MP_ROM_QSTR(MP_QSTR_PGM_LED), MP_ROM_PTR(&pin_PA28) },
32-
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) },
33-
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB10) },
26+
{ MP_ROM_QSTR(MP_QSTR_LED_STATUS), MP_ROM_PTR(&pin_PA28) },
27+
{ MP_ROM_QSTR(MP_QSTR_LED_TX), MP_ROM_PTR(&pin_PA27) },
3428
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA12) },
29+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB10) },
30+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) },
31+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) },
32+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) },
33+
{ MP_ROM_QSTR(MP_QSTR_LED_RX), MP_ROM_PTR(&pin_PA31) },
3534
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
3635
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
3736
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },

0 commit comments

Comments
 (0)