Merge pull request adafruit#2534 from CapableRobot/capablerobot-usbhub

tannewt · web-flow · commit 1daac3a5f41a · 2020-01-20T22:27:55.000-08:00
Pin name updates and add additional SPI flash part for Capable Robot USB Hub
diff --git a/ports/atmel-samd/boards/capablerobot_usbhub/board.c b/ports/atmel-samd/boards/capablerobot_usbhub/board.c
@@ -30,13 +30,6 @@
 #include "common-hal/microcontroller/Pin.h"
 
 void board_init(void) {
-	// Don't reset:
-	// 	- USB Host Enable Pin
-	// 	- reset pin of the USB Hub
-	//
-	// If either are reset, USB devices will disconnect when the MCU restarts
-	never_reset_pin_number(PIN_PA07);
-	never_reset_pin_number(PIN_PB08);
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.mk b/ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.mk
@@ -7,8 +7,8 @@ CHIP_VARIANT = SAMD51G19A
 CHIP_FAMILY = samd51
 
 QSPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICE_COUNT = 1
-EXTERNAL_FLASH_DEVICES = GD25Q16C
+EXTERNAL_FLASH_DEVICE_COUNT = 2
+EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JV_IQ"
 LONGINT_IMPL = MPZ
 
 # No I2S on SAMD51G
diff --git a/ports/atmel-samd/boards/capablerobot_usbhub/pins.c b/ports/atmel-samd/boards/capablerobot_usbhub/pins.c
@@ -17,8 +17,9 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_RX),     MP_ROM_PTR(&pin_PA16) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_TX),     MP_ROM_PTR(&pin_PA17) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_USBHEN), MP_ROM_PTR(&pin_PA07) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_USBRST), MP_ROM_PTR(&pin_PB08) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_USBHOSTEN),  MP_ROM_PTR(&pin_PA07) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_USBRESET),   MP_ROM_PTR(&pin_PB08) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_USBBCEN),    MP_ROM_PTR(&pin_PB22) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_SDA),    MP_ROM_PTR(&pin_PA22) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SCL),    MP_ROM_PTR(&pin_PA23) },
