Skip to content

Update to latest STM32CubeU5 v1.2.0 and open_pin_data v6.0.80 #1965

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
Mar 9, 2023
Merged

Update to latest STM32CubeU5 v1.2.0 and open_pin_data v6.0.80 #1965

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
d7317e0
system(U5) update STM32U5xx HAL Drivers to v1.2.0
fpistm Mar 7, 2023
b197bdd
system(U5): update STM32U5xx CMSIS Drivers to v1.2.0
fpistm Mar 7, 2023
bd943c3
core(U5): update wrapped files
fpistm Mar 7, 2023
2b27bcf
system(U5): update files after cube update
fpistm Mar 7, 2023
307c9e0
ci(variant): update usb instance regex
fpistm Mar 8, 2023
bcf67e7
variants: update generated files to STM32_open_pin_data v6.0.80
fpistm Mar 7, 2023
e89ae0f
chore(cmake): update after variants update
fpistm Mar 7, 2023
4473892
core(u5): update for USB_DRD_FS support
fpistm Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion CI/update/stm32variant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def parse_mcu_file():
global mcu_refname

tim_regex = r"^(TIM\d+)$"
usb_regex = r"^(USB(?!PD|_HOST|_DEVICE).*)$"
usb_regex = r"^(USB(?!PD|_HOST|_DEVICE|X).*)$"
gpiofile = ""
del tim_inst_list[:]
del mcu_ram[:]
Expand Down
7 changes: 6 additions & 1 deletion cores/arduino/stm32/stm32_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,15 @@
#endif
#endif

/* STM32G0xx defined USB_DRD_FS */
/* STM32G0xx and some STM32U5xx defined USB_DRD_FS */
#if !defined(USB) && defined(USB_DRD_FS)
#define USB USB_DRD_FS
#define PinMap_USB PinMap_USB_DRD_FS
#if defined(STM32U5xx)
#define USB_BASE USB_DRD_BASE
#define __HAL_RCC_USB_CLK_ENABLE __HAL_RCC_USB_FS_CLK_ENABLE
#define __HAL_RCC_USB_CLK_DISABLE __HAL_RCC_USB_FS_CLK_DISABLE
#endif
#endif

/**
Expand Down
4 changes: 4 additions & 0 deletions cores/arduino/stm32/stm32_def_build.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,10 @@
#define CMSIS_STARTUP_FILE "startup_stm32mp157cxx_cm4.s"
#elif defined(STM32MP15xx)
#define CMSIS_STARTUP_FILE "startup_stm32mp15xx.s"
#elif defined(STM32U535xx)
#define CMSIS_STARTUP_FILE "startup_stm32u535xx.s"
#elif defined(STM32U545xx)
#define CMSIS_STARTUP_FILE "startup_stm32u545xx.s"
#elif defined(STM32U575xx)
#define CMSIS_STARTUP_FILE "startup_stm32u575xx.s"
#elif defined(STM32U585xx)
Expand Down
2 changes: 2 additions & 0 deletions cores/arduino/stm32/usb/usbd_conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
#ifdef __HAL_USB_WAKEUP_EXTI_ENABLE_RISING_EDGE
__HAL_USB_WAKEUP_EXTI_ENABLE_RISING_EDGE();
#endif
#ifdef __HAL_USB_WAKEUP_EXTI_ENABLE_IT
__HAL_USB_WAKEUP_EXTI_ENABLE_IT();
#endif
#if defined(USB_WKUP_IRQn)
/* USB Wakeup Interrupt */
HAL_NVIC_EnableIRQ(USB_WKUP_IRQn);
Expand Down
2 changes: 1 addition & 1 deletion cores/arduino/stm32/usb/usbd_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ extern "C" {
#elif defined(STM32G0xx)
#define USB_IRQn USB_UCPD1_2_IRQn
#define USB_IRQHandler USB_UCPD1_2_IRQHandler
#elif defined(STM32U5xx)
#elif defined(STM32U5xx) && !defined(USB_DRD_FS)
#define USB_IRQn OTG_FS_IRQn
#define USB_IRQHandler OTG_FS_IRQHandler
#elif defined(STM32L5xx)
Expand Down
Loading