Merge pull request #2776 from fpistm/stm32cubewba_update

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

Author: fpistm

CI/update/stm32variant.py

@@ -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:

cores/arduino/stm32/stm32_def_build.h

@@ -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)

libraries/SrcWrapper/inc/LL/stm32yyxx_ll_usb.h

@@ -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_ */

libraries/SrcWrapper/inc/stm32_def.h

@@ -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

libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hcd.c

@@ -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

libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd.c

@@ -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

libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd_ex.c

@@ -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

libraries/SrcWrapper/src/LL/stm32yyxx_ll_usb.c

@@ -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

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

@@ -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
@@ -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

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

@@ -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
@@ -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