Skip to content

Commit 7453d93

Browse files
fpistmfpistm
authored
Merge pull request #2776 from fpistm/stm32cubewba_update
chore(wba): update to latest STM32CubeWBA v1.7.0
2 parents 8da0622 + 15da5f2 commit 7453d93

File tree

257 files changed

+151352
-16726
lines changed

Some content is hidden

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

257 files changed

+151352
-16726
lines changed

‎CI/update/stm32variant.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,10 @@ def parse_mcu_file():
221221
if "FS" in inst.group(1):
222222
usb_inst["otg_fs"] = inst.group(1)
223223
else:
224-
usb_inst["otg_hs"] = inst.group(1)
224+
if inst.group(1).endswith("HS1"):
225+
usb_inst["otg_hs"] = inst.group(1)[:-1]
226+
else:
227+
usb_inst["otg_hs"] = inst.group(1)
225228
else:
226229
usb_inst["usb"] = inst.group(1)
227230
else:

‎cores/arduino/stm32/stm32_def_build.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,16 @@
492492
#define CMSIS_STARTUP_FILE "startup_stm32wba55xx.s"
493493
#elif defined(STM32WBA5Mxx)
494494
#define CMSIS_STARTUP_FILE "startup_stm32wba5mxx.s"
495+
#elif defined(STM32WBA62xx)
496+
#define CMSIS_STARTUP_FILE "startup_stm32wba62xx.s"
497+
#elif defined(STM32WBA63xx)
498+
#define CMSIS_STARTUP_FILE "startup_stm32wba63xx.s"
499+
#elif defined(STM32WBA64xx)
500+
#define CMSIS_STARTUP_FILE "startup_stm32wba64xx.s"
501+
#elif defined(STM32WBA65xx)
502+
#define CMSIS_STARTUP_FILE "startup_stm32wba65xx.s"
503+
#elif defined(STM32WBA6Mxx)
504+
#define CMSIS_STARTUP_FILE "startup_stm32wba6mxx.s"
495505
#elif defined(STM32WB10xx)
496506
#define CMSIS_STARTUP_FILE "startup_stm32wb10xx_cm4.s"
497507
#elif defined(STM32WB15xx)

‎libraries/SrcWrapper/inc/LL/stm32yyxx_ll_usb.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
#include "stm32u5xx_ll_usb.h"
4747
#elif STM32WBxx
4848
#include "stm32wbxx_ll_usb.h"
49+
#elif STM32WBAxx
50+
#include "stm32wbaxx_ll_usb.h"
4951
#endif
5052
#pragma GCC diagnostic pop
5153
#endif /* _STM32YYXX_LL_USB_H_ */

‎libraries/SrcWrapper/inc/stm32_def.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ __STATIC_INLINE void LL_RTC_SetBinMixBCDU(RTC_TypeDef *RTCx, uint32_t BinMixBcdU
224224
#define GPIO_AF7_USART3 ((uint8_t)0x07)
225225
#endif // STM32C0xx && !defined(USART3)
226226

227+
#if defined(STM32WBAxx) && defined(USB_OTG_HS) && !defined(GPIO_AF4_USB_OTG_HS)
228+
#define GPIO_AF4_USB_OTG_HS GPIO_AF4_OTG_HS
229+
#endif // STM32WBAxx && defined(USB_OTG_HS) && !defined(GPIO_AF4_USB_OTG_HS)
227230

228231
/**
229232
* Libc porting layers

‎libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hcd.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,7 @@
2424
#include "stm32u3xx_hal_hcd.c"
2525
#elif STM32U5xx
2626
#include "stm32u5xx_hal_hcd.c"
27+
#elif STM32WBAxx
28+
#include "stm32wbaxx_hal_hcd.c"
2729
#endif
2830
#pragma GCC diagnostic pop

‎libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,7 @@
4040
#include "stm32u5xx_hal_pcd.c"
4141
#elif STM32WBxx
4242
#include "stm32wbxx_hal_pcd.c"
43+
#elif STM32WBAxx
44+
#include "stm32wbaxx_hal_pcd.c"
4345
#endif
4446
#pragma GCC diagnostic pop

‎libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd_ex.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,7 @@
4040
#include "stm32u5xx_hal_pcd_ex.c"
4141
#elif STM32WBxx
4242
#include "stm32wbxx_hal_pcd_ex.c"
43+
#elif STM32WBAxx
44+
#include "stm32wbaxx_hal_pcd_ex.c"
4345
#endif
4446
#pragma GCC diagnostic pop

‎libraries/SrcWrapper/src/LL/stm32yyxx_ll_usb.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,7 @@
4040
#include "stm32u5xx_ll_usb.c"
4141
#elif STM32WBxx
4242
#include "stm32wbxx_ll_usb.c"
43+
#elif STM32WBAxx
44+
#include "stm32wbaxx_ll_usb.c"
4345
#endif
4446
#pragma GCC diagnostic pop

‎system/Drivers/CMSIS/Device/ST/STM32WBAxx/Include/Templates/partition_stm32wba52xx.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@
160160
/*
161161
// <o>Start Address <0-0xFFFFFFE0>
162162
*/
163-
#define SAU_INIT_START3 0x20010000 /* start address of SAU region 3 */
163+
#define SAU_INIT_START3 0x20008000 /* start address of SAU region 3 */
164164

165165
/*
166166
// <o>End Address <0x1F-0xFFFFFFFF>
167167
*/
168-
#define SAU_INIT_END3 0x2001FFFF /* end address of SAU region 3 */
168+
#define SAU_INIT_END3 0x2000FFFF /* end address of SAU region 3 */
169169

170170
/*
171171
// <o>Region is
@@ -207,17 +207,17 @@
207207
// <e>Initialize SAU Region 5
208208
// <i> Setup SAU Region 5 memory attributes
209209
*/
210-
#define SAU_INIT_REGION5 0
210+
#define SAU_INIT_REGION5 1
211211

212212
/*
213213
// <o>Start Address <0-0xFFFFFFE0>
214214
*/
215-
#define SAU_INIT_START5 0x00000000 /* start address of SAU region 5 */
215+
#define SAU_INIT_START5 0x20018000 /* start address of SAU region 5 */
216216

217217
/*
218218
// <o>End Address <0x1F-0xFFFFFFFF>
219219
*/
220-
#define SAU_INIT_END5 0x00000000 /* end address of SAU region 5 */
220+
#define SAU_INIT_END5 0x2001FFFF /* end address of SAU region 5 */
221221

222222
/*
223223
// <o>Region is

‎system/Drivers/CMSIS/Device/ST/STM32WBAxx/Include/Templates/partition_stm32wba54xx.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@
160160
/*
161161
// <o>Start Address <0-0xFFFFFFE0>
162162
*/
163-
#define SAU_INIT_START3 0x20010000 /* start address of SAU region 3 */
163+
#define SAU_INIT_START3 0x20008000 /* start address of SAU region 3 */
164164

165165
/*
166166
// <o>End Address <0x1F-0xFFFFFFFF>
167167
*/
168-
#define SAU_INIT_END3 0x2001FFFF /* end address of SAU region 3 */
168+
#define SAU_INIT_END3 0x2000FFFF /* end address of SAU region 3 */
169169

170170
/*
171171
// <o>Region is
@@ -207,17 +207,17 @@
207207
// <e>Initialize SAU Region 5
208208
// <i> Setup SAU Region 5 memory attributes
209209
*/
210-
#define SAU_INIT_REGION5 0
210+
#define SAU_INIT_REGION5 1
211211

212212
/*
213213
// <o>Start Address <0-0xFFFFFFE0>
214214
*/
215-
#define SAU_INIT_START5 0x00000000 /* start address of SAU region 5 */
215+
#define SAU_INIT_START5 0x20018000 /* start address of SAU region 5 */
216216

217217
/*
218218
// <o>End Address <0x1F-0xFFFFFFFF>
219219
*/
220-
#define SAU_INIT_END5 0x00000000 /* end address of SAU region 5 */
220+
#define SAU_INIT_END5 0x2001FFFF /* end address of SAU region 5 */
221221

222222
/*
223223
// <o>Region is

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy