Skip to content

chore(wba): update to latest STM32CubeWBA v1.7.0 #2776

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.

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 9 commits into from
Jul 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion CI/update/stm32variant.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,10 @@ def parse_mcu_file():
if "FS" in inst.group(1):
usb_inst["otg_fs"] = inst.group(1)
else:
usb_inst["otg_hs"] = inst.group(1)
if inst.group(1).endswith("HS1"):
usb_inst["otg_hs"] = inst.group(1)[:-1]
else:
usb_inst["otg_hs"] = inst.group(1)
else:
usb_inst["usb"] = inst.group(1)
else:
Expand Down
10 changes: 10 additions & 0 deletions cores/arduino/stm32/stm32_def_build.h
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,16 @@
#define CMSIS_STARTUP_FILE "startup_stm32wba55xx.s"
#elif defined(STM32WBA5Mxx)
#define CMSIS_STARTUP_FILE "startup_stm32wba5mxx.s"
#elif defined(STM32WBA62xx)
#define CMSIS_STARTUP_FILE "startup_stm32wba62xx.s"
#elif defined(STM32WBA63xx)
#define CMSIS_STARTUP_FILE "startup_stm32wba63xx.s"
#elif defined(STM32WBA64xx)
#define CMSIS_STARTUP_FILE "startup_stm32wba64xx.s"
#elif defined(STM32WBA65xx)
#define CMSIS_STARTUP_FILE "startup_stm32wba65xx.s"
#elif defined(STM32WBA6Mxx)
#define CMSIS_STARTUP_FILE "startup_stm32wba6mxx.s"
#elif defined(STM32WB10xx)
#define CMSIS_STARTUP_FILE "startup_stm32wb10xx_cm4.s"
#elif defined(STM32WB15xx)
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/inc/LL/stm32yyxx_ll_usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
#include "stm32u5xx_ll_usb.h"
#elif STM32WBxx
#include "stm32wbxx_ll_usb.h"
#elif STM32WBAxx
#include "stm32wbaxx_ll_usb.h"
#endif
#pragma GCC diagnostic pop
#endif /* _STM32YYXX_LL_USB_H_ */
3 changes: 3 additions & 0 deletions libraries/SrcWrapper/inc/stm32_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ __STATIC_INLINE void LL_RTC_SetBinMixBCDU(RTC_TypeDef *RTCx, uint32_t BinMixBcdU
#define GPIO_AF7_USART3 ((uint8_t)0x07)
#endif // STM32C0xx && !defined(USART3)

#if defined(STM32WBAxx) && defined(USB_OTG_HS) && !defined(GPIO_AF4_USB_OTG_HS)
#define GPIO_AF4_USB_OTG_HS GPIO_AF4_OTG_HS
#endif // STM32WBAxx && defined(USB_OTG_HS) && !defined(GPIO_AF4_USB_OTG_HS)

/**
* Libc porting layers
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@
#include "stm32u3xx_hal_hcd.c"
#elif STM32U5xx
#include "stm32u5xx_hal_hcd.c"
#elif STM32WBAxx
#include "stm32wbaxx_hal_hcd.c"
#endif
#pragma GCC diagnostic pop
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,7 @@
#include "stm32u5xx_hal_pcd.c"
#elif STM32WBxx
#include "stm32wbxx_hal_pcd.c"
#elif STM32WBAxx
#include "stm32wbaxx_hal_pcd.c"
#endif
#pragma GCC diagnostic pop
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd_ex.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,7 @@
#include "stm32u5xx_hal_pcd_ex.c"
#elif STM32WBxx
#include "stm32wbxx_hal_pcd_ex.c"
#elif STM32WBAxx
#include "stm32wbaxx_hal_pcd_ex.c"
#endif
#pragma GCC diagnostic pop
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/LL/stm32yyxx_ll_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,7 @@
#include "stm32u5xx_ll_usb.c"
#elif STM32WBxx
#include "stm32wbxx_ll_usb.c"
#elif STM32WBAxx
#include "stm32wbaxx_ll_usb.c"
#endif
#pragma GCC diagnostic pop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@
/*
// <o>Start Address <0-0xFFFFFFE0>
*/
#define SAU_INIT_START3 0x20010000 /* start address of SAU region 3 */
#define SAU_INIT_START3 0x20008000 /* start address of SAU region 3 */

/*
// <o>End Address <0x1F-0xFFFFFFFF>
*/
#define SAU_INIT_END3 0x2001FFFF /* end address of SAU region 3 */
#define SAU_INIT_END3 0x2000FFFF /* end address of SAU region 3 */

/*
// <o>Region is
Expand Down Expand Up @@ -207,17 +207,17 @@
// <e>Initialize SAU Region 5
// <i> Setup SAU Region 5 memory attributes
*/
#define SAU_INIT_REGION5 0
#define SAU_INIT_REGION5 1

/*
// <o>Start Address <0-0xFFFFFFE0>
*/
#define SAU_INIT_START5 0x00000000 /* start address of SAU region 5 */
#define SAU_INIT_START5 0x20018000 /* start address of SAU region 5 */

/*
// <o>End Address <0x1F-0xFFFFFFFF>
*/
#define SAU_INIT_END5 0x00000000 /* end address of SAU region 5 */
#define SAU_INIT_END5 0x2001FFFF /* end address of SAU region 5 */

/*
// <o>Region is
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@
/*
// <o>Start Address <0-0xFFFFFFE0>
*/
#define SAU_INIT_START3 0x20010000 /* start address of SAU region 3 */
#define SAU_INIT_START3 0x20008000 /* start address of SAU region 3 */

/*
// <o>End Address <0x1F-0xFFFFFFFF>
*/
#define SAU_INIT_END3 0x2001FFFF /* end address of SAU region 3 */
#define SAU_INIT_END3 0x2000FFFF /* end address of SAU region 3 */

/*
// <o>Region is
Expand Down Expand Up @@ -207,17 +207,17 @@
// <e>Initialize SAU Region 5
// <i> Setup SAU Region 5 memory attributes
*/
#define SAU_INIT_REGION5 0
#define SAU_INIT_REGION5 1

/*
// <o>Start Address <0-0xFFFFFFE0>
*/
#define SAU_INIT_START5 0x00000000 /* start address of SAU region 5 */
#define SAU_INIT_START5 0x20018000 /* start address of SAU region 5 */

/*
// <o>End Address <0x1F-0xFFFFFFFF>
*/
#define SAU_INIT_END5 0x00000000 /* end address of SAU region 5 */
#define SAU_INIT_END5 0x2001FFFF /* end address of SAU region 5 */

/*
// <o>Region is
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@
/*
// <o>Start Address <0-0xFFFFFFE0>
*/
#define SAU_INIT_START3 0x20010000 /* start address of SAU region 3 */
#define SAU_INIT_START3 0x20008000 /* start address of SAU region 3 */

/*
// <o>End Address <0x1F-0xFFFFFFFF>
*/
#define SAU_INIT_END3 0x2001FFFF /* end address of SAU region 3 */
#define SAU_INIT_END3 0x2000FFFF /* end address of SAU region 3 */

/*
// <o>Region is
Expand Down Expand Up @@ -207,17 +207,17 @@
// <e>Initialize SAU Region 5
// <i> Setup SAU Region 5 memory attributes
*/
#define SAU_INIT_REGION5 0
#define SAU_INIT_REGION5 1

/*
// <o>Start Address <0-0xFFFFFFE0>
*/
#define SAU_INIT_START5 0x00000000 /* start address of SAU region 5 */
#define SAU_INIT_START5 0x20018000 /* start address of SAU region 5 */

/*
// <o>End Address <0x1F-0xFFFFFFFF>
*/
#define SAU_INIT_END5 0x00000000 /* end address of SAU region 5 */
#define SAU_INIT_END5 0x2001FFFF /* end address of SAU region 5 */

/*
// <o>Region is
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@
/*
// <o>Start Address <0-0xFFFFFFE0>
*/
#define SAU_INIT_START3 0x20010000 /* start address of SAU region 3 */
#define SAU_INIT_START3 0x20008000 /* start address of SAU region 3 */

/*
// <o>End Address <0x1F-0xFFFFFFFF>
*/
#define SAU_INIT_END3 0x2001FFFF /* end address of SAU region 3 */
#define SAU_INIT_END3 0x2000FFFF /* end address of SAU region 3 */

/*
// <o>Region is
Expand Down Expand Up @@ -207,17 +207,17 @@
// <e>Initialize SAU Region 5
// <i> Setup SAU Region 5 memory attributes
*/
#define SAU_INIT_REGION5 0
#define SAU_INIT_REGION5 1

/*
// <o>Start Address <0-0xFFFFFFE0>
*/
#define SAU_INIT_START5 0x00000000 /* start address of SAU region 5 */
#define SAU_INIT_START5 0x20018000 /* start address of SAU region 5 */

/*
// <o>End Address <0x1F-0xFFFFFFFF>
*/
#define SAU_INIT_END5 0x00000000 /* end address of SAU region 5 */
#define SAU_INIT_END5 0x2001FFFF /* end address of SAU region 5 */

/*
// <o>Region is
Expand Down
Loading