Skip to content

Commit 1daac3a

Browse files
authored
Merge pull request #2534 from CapableRobot/capablerobot-usbhub
Pin name updates and add additional SPI flash part for Capable Robot USB Hub
2 parents 85c7317 + 9742099 commit 1daac3a

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

ports/atmel-samd/boards/capablerobot_usbhub/board.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@
3030
#include "common-hal/microcontroller/Pin.h"
3131

3232
void board_init(void) {
33-
// Don't reset:
34-
// - USB Host Enable Pin
35-
// - reset pin of the USB Hub
36-
//
37-
// If either are reset, USB devices will disconnect when the MCU restarts
38-
never_reset_pin_number(PIN_PA07);
39-
never_reset_pin_number(PIN_PB08);
4033
}
4134

4235
bool board_requests_safe_mode(void) {

ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ CHIP_VARIANT = SAMD51G19A
77
CHIP_FAMILY = samd51
88

99
QSPI_FLASH_FILESYSTEM = 1
10-
EXTERNAL_FLASH_DEVICE_COUNT = 1
11-
EXTERNAL_FLASH_DEVICES = GD25Q16C
10+
EXTERNAL_FLASH_DEVICE_COUNT = 2
11+
EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JV_IQ"
1212
LONGINT_IMPL = MPZ
1313

1414
# No I2S on SAMD51G

ports/atmel-samd/boards/capablerobot_usbhub/pins.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
1717
{ MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA16) },
1818
{ MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA17) },
1919

20-
{ MP_OBJ_NEW_QSTR(MP_QSTR_USBHEN), MP_ROM_PTR(&pin_PA07) },
21-
{ MP_OBJ_NEW_QSTR(MP_QSTR_USBRST), MP_ROM_PTR(&pin_PB08) },
20+
{ MP_OBJ_NEW_QSTR(MP_QSTR_USBHOSTEN), MP_ROM_PTR(&pin_PA07) },
21+
{ MP_OBJ_NEW_QSTR(MP_QSTR_USBRESET), MP_ROM_PTR(&pin_PB08) },
22+
{ MP_OBJ_NEW_QSTR(MP_QSTR_USBBCEN), MP_ROM_PTR(&pin_PB22) },
2223

2324
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) },
2425
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) },

0 commit comments

Comments
 (0)