Skip to content

Update Tinyusb #2379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Dec 23, 2019
Merged

Update Tinyusb #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1244125
update tinyusb
hierophect Dec 12, 2019
885a141
Update stm32 usb.c
hierophect Dec 12, 2019
39f3063
Merge remote-tracking branch 'upstream/master' into update-tusb
hierophect Dec 12, 2019
d44a758
Add no VBUS option to blackpill
hierophect Dec 12, 2019
ebc2114
stm32 explicitily enable/disable vbus sense, fix warning
hathach Dec 17, 2019
409b5ff
Merge pull request #1 from hathach/hierophect-update-tusb
hierophect Dec 17, 2019
d1f0458
Merge branch 'master' into hierophect-update-tusb
hathach Dec 18, 2019
8e38ca1
Merge pull request #2 from hathach/hierophect-update-tusb
hierophect Dec 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#define FLASH_PAGE_SIZE (0x4000)

#define BOARD_OSC_DIV 25
#define BOARD_NO_VBUS

// On-board flash
// #define SPI_FLASH_MOSI_PIN (&pin_PA07)
Expand Down
29 changes: 28 additions & 1 deletion ports/stm32f4/supervisor/usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,33 @@
#include "lib/mp-readline/readline.h"
#include "stm32f4xx_hal.h"

#include "py/mpconfig.h"

#include "common-hal/microcontroller/Pin.h"

STATIC void init_usb_vbus_sense(void) {

#ifdef BOARD_NO_VBUS
// Disable VBUS sensing
#ifdef USB_OTG_GCCFG_VBDEN
USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBDEN;
#else
USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_NOVBUSSENS;
USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBUSBSEN;
USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBUSASEN;
#endif
#else
// Enable VBUS hardware sensing
#ifdef USB_OTG_GCCFG_VBDEN
USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_VBDEN;
#else
USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_NOVBUSSENS;
USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_VBUSBSEN; // B Device sense
#endif
#endif
}


void init_usb_hardware(void) {
//TODO: if future chips overload this with options, move to peripherals management.

Expand Down Expand Up @@ -79,7 +104,9 @@ void init_usb_hardware(void) {
HAL_GPIO_Init(GPIOG, &GPIO_InitStruct);
never_reset_pin_number(0, 8);
#endif

/* Peripheral clock enable */
__HAL_RCC_USB_OTG_FS_CLK_ENABLE();

init_usb_vbus_sense();
}