Revert to pre-split versions of CUBE HAL and CMSIS

cmake/stm32/f0.cmake

@@ -106,6 +106,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES F0)
 
-set(CUBE_F0_VERSION  v1.11.5)
-set(CMSIS_F0_VERSION v2.3.7)
-set(HAL_F0_VERSION   v1.7.8)
+set(CUBE_F0_VERSION  v1.11.2)
+set(CMSIS_F0_VERSION v2.3.5)
+set(HAL_F0_VERSION   v1.7.5)

cmake/stm32/f1.cmake

@@ -181,6 +181,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES F1)
 
-set(CUBE_F1_VERSION  v1.8.5)
-set(CMSIS_F1_VERSION v4.3.4)
-set(HAL_F1_VERSION   v1.1.9)
+set(CUBE_F1_VERSION  v1.8.4)
+set(CMSIS_F1_VERSION v4.3.3)
+set(HAL_F1_VERSION   v1.1.8)

cmake/stm32/f2.cmake

@@ -85,6 +85,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES F2)
 
-set(CUBE_F2_VERSION  v1.9.4)
-set(CMSIS_F2_VERSION v2.2.6)
-set(HAL_F2_VERSION   v1.2.8)
+set(CUBE_F2_VERSION  v1.9.3)
+set(CMSIS_F2_VERSION v2.2.5)
+set(HAL_F2_VERSION   v1.2.7)

cmake/stm32/f3.cmake

@@ -136,6 +136,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES F3)
 
-set(CUBE_F3_VERSION  v1.11.5)
-set(CMSIS_F3_VERSION v2.3.8)
-set(HAL_F3_VERSION   v1.5.8)
+set(CUBE_F3_VERSION  v1.11.2)
+set(CMSIS_F3_VERSION v2.3.5)
+set(HAL_F3_VERSION   v1.5.5)

cmake/stm32/f7.cmake

@@ -118,6 +118,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES F7)
 
-set(CUBE_F7_VERSION  v1.17.1)
-set(CMSIS_F7_VERSION v1.2.8)
-set(HAL_F7_VERSION   v1.3.0)
+set(CUBE_F7_VERSION  v1.16.1)
+set(CMSIS_F7_VERSION v1.2.6)
+set(HAL_F7_VERSION   v1.2.9)

cmake/stm32/g0.cmake

@@ -136,6 +136,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES G0)
 
-set(CUBE_G0_VERSION  v1.6.2)
-set(CMSIS_G0_VERSION v1.4.4)
-set(HAL_G0_VERSION   v1.4.6)
+set(CUBE_G0_VERSION  v1.4.1)
+set(CMSIS_G0_VERSION v1.4.0)
+set(HAL_G0_VERSION   v1.4.1)

cmake/stm32/g4.cmake

@@ -127,6 +127,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES G4)
 
-set(CUBE_G4_VERSION  v1.5.2)
-set(CMSIS_G4_VERSION v1.2.3)
-set(HAL_G4_VERSION   v1.2.3)
+set(CUBE_G4_VERSION  v1.4.0)
+set(CMSIS_G4_VERSION v1.2.1)
+set(HAL_G4_VERSION   v1.2.1)

cmake/stm32/h5.cmake

@@ -62,6 +62,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES H5)
 
-set(CUBE_H5_VERSION  v1.2.0)
-set(CMSIS_H5_VERSION v1.2.0)
-set(HAL_H5_VERSION   v1.2.0)
+set(CUBE_H5_VERSION  v1.1.0)
+set(CMSIS_H5_VERSION v1.1.0)
+set(HAL_H5_VERSION   v1.1.0)

cmake/stm32/h7.cmake

@@ -209,6 +209,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES H7)
 
-set(CUBE_H7_VERSION  v1.11.2)
-set(CMSIS_H7_VERSION v1.10.4)
-set(HAL_H7_VERSION   v1.11.3)
+set(CUBE_H7_VERSION  v1.9.0)
+set(CMSIS_H7_VERSION v1.10.0)
+set(HAL_H7_VERSION   v1.10.0)

cmake/stm32/l0.cmake

@@ -135,6 +135,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES L0)
 
-set(CUBE_L0_VERSION  v1.12.2)
-set(CMSIS_L0_VERSION v1.9.3)
-set(HAL_L0_VERSION   v1.10.6)
+set(CUBE_L0_VERSION  v1.12.0)
+set(CMSIS_L0_VERSION v1.9.1)
+set(HAL_L0_VERSION   v1.10.4)

cmake/stm32/l1.cmake

@@ -140,6 +140,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES L1)
 
-set(CUBE_L1_VERSION  v1.10.4)
-set(CMSIS_L1_VERSION v2.3.3)
-set(HAL_L1_VERSION   v1.4.5)
+set(CUBE_L1_VERSION  v1.10.3)
+set(CMSIS_L1_VERSION v2.3.2)
+set(HAL_L1_VERSION   v1.4.4)

cmake/stm32/l4.cmake

@@ -186,6 +186,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES L4)
 
-set(CUBE_L4_VERSION  v1.18.0)
-set(CMSIS_L4_VERSION v1.7.3)
-set(HAL_L4_VERSION   v1.13.4)
+set(CUBE_L4_VERSION  v1.17.0)
+set(CMSIS_L4_VERSION v1.7.1)
+set(HAL_L4_VERSION   v1.13.0)

cmake/stm32/l5.cmake

@@ -47,6 +47,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES L5)
 
-set(CUBE_L5_VERSION  v1.5.1)
-set(CMSIS_L5_VERSION v1.0.6)
-set(HAL_L5_VERSION   v1.0.6)
+set(CUBE_L5_VERSION  v1.4.0)
+set(CMSIS_L5_VERSION v1.0.4)
+set(HAL_L5_VERSION   v1.0.4)

cmake/stm32/mp1.cmake

@@ -51,6 +51,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES MP1)
 
-set(CUBE_MP1_VERSION  1.6.0)
+set(CUBE_MP1_VERSION  1.5.0)
 set(CMSIS_MP1_VERSION cube)
 set(HAL_MP1_VERSION   cube)

cmake/stm32/u5.cmake

@@ -48,6 +48,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES U5)
 
-set(CUBE_U5_VERSION  v1.5.0)
-set(CMSIS_U5_VERSION v1.4.0)
-set(HAL_U5_VERSION   v1.5.0)
+set(CUBE_U5_VERSION  v1.4.0)
+set(CMSIS_U5_VERSION v1.3.1)
+set(HAL_U5_VERSION   v1.4.0)

cmake/stm32/wb.cmake

@@ -62,6 +62,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES WB)
 
-set(CUBE_WB_VERSION  v1.19.0)
-set(CMSIS_WB_VERSION v1.12.1)
-set(HAL_WB_VERSION   v1.14.2)
+set(CUBE_WB_VERSION  v1.12.0)
+set(CMSIS_WB_VERSION v1.9.0)
+set(HAL_WB_VERSION   v1.9.0)

cmake/stm32/wl.cmake

@@ -100,6 +100,6 @@ list(APPEND STM32_SUPPORTED_FAMILIES_LONG_NAME
 
 list(APPEND STM32_FETCH_FAMILIES WL)
 
-set(CUBE_WL_VERSION  v1.3.0)
-set(CMSIS_WL_VERSION v1.2.0)
-set(HAL_WL_VERSION   v1.3.0)
+set(CUBE_WL_VERSION  v1.1.0)
+set(CMSIS_WL_VERSION v1.1.0)
+set(HAL_WL_VERSION   v1.1.0)