Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitd328b4f

Browse files
authored
Merge pull request#1965 from fpistm/CubeU5_Update
Update to latest STM32CubeU5 v1.2.0 and open_pin_data v6.0.80
2 parents703e5be +4473892 commitd328b4f

File tree

949 files changed

+97807
-11640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

949 files changed

+97807
-11640
lines changed

‎CI/update/stm32variant.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def parse_mcu_file():
149149
globalmcu_refname
150150

151151
tim_regex=r"^(TIM\d+)$"
152-
usb_regex=r"^(USB(?!PD|_HOST|_DEVICE).*)$"
152+
usb_regex=r"^(USB(?!PD|_HOST|_DEVICE|X).*)$"
153153
gpiofile=""
154154
deltim_inst_list[:]
155155
delmcu_ram[:]

‎cores/arduino/stm32/stm32_def.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,15 @@
8686
#endif
8787
#endif
8888

89-
/* STM32G0xx defined USB_DRD_FS */
89+
/* STM32G0xxand some STM32U5xxdefined USB_DRD_FS */
9090
#if !defined(USB)&& defined(USB_DRD_FS)
9191
#defineUSB USB_DRD_FS
9292
#definePinMap_USB PinMap_USB_DRD_FS
93+
#if defined(STM32U5xx)
94+
#defineUSB_BASE USB_DRD_BASE
95+
#define__HAL_RCC_USB_CLK_ENABLE __HAL_RCC_USB_FS_CLK_ENABLE
96+
#define__HAL_RCC_USB_CLK_DISABLE __HAL_RCC_USB_FS_CLK_DISABLE
97+
#endif
9398
#endif
9499

95100
/**

‎cores/arduino/stm32/stm32_def_build.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,10 @@
414414
#defineCMSIS_STARTUP_FILE "startup_stm32mp157cxx_cm4.s"
415415
#elif defined(STM32MP15xx)
416416
#defineCMSIS_STARTUP_FILE "startup_stm32mp15xx.s"
417+
#elif defined(STM32U535xx)
418+
#defineCMSIS_STARTUP_FILE "startup_stm32u535xx.s"
419+
#elif defined(STM32U545xx)
420+
#defineCMSIS_STARTUP_FILE "startup_stm32u545xx.s"
417421
#elif defined(STM32U575xx)
418422
#defineCMSIS_STARTUP_FILE "startup_stm32u575xx.s"
419423
#elif defined(STM32U585xx)

‎cores/arduino/stm32/usb/usbd_conf.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
105105
#ifdef__HAL_USB_WAKEUP_EXTI_ENABLE_RISING_EDGE
106106
__HAL_USB_WAKEUP_EXTI_ENABLE_RISING_EDGE();
107107
#endif
108+
#ifdef__HAL_USB_WAKEUP_EXTI_ENABLE_IT
108109
__HAL_USB_WAKEUP_EXTI_ENABLE_IT();
110+
#endif
109111
#if defined(USB_WKUP_IRQn)
110112
/* USB Wakeup Interrupt */
111113
HAL_NVIC_EnableIRQ(USB_WKUP_IRQn);

‎cores/arduino/stm32/usb/usbd_conf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ extern "C" {
7474
#elif defined(STM32G0xx)
7575
#defineUSB_IRQn USB_UCPD1_2_IRQn
7676
#defineUSB_IRQHandler USB_UCPD1_2_IRQHandler
77-
#elif defined(STM32U5xx)
77+
#elif defined(STM32U5xx)&& !defined(USB_DRD_FS)
7878
#defineUSB_IRQn OTG_FS_IRQn
7979
#defineUSB_IRQHandler OTG_FS_IRQHandler
8080
#elif defined(STM32L5xx)

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp