Skip to content

Commit c117c7e

Browse files
fpistmfpistm
authored
Merge pull request #2235 from fpistm/STM32CubeG0_update
chore(G0): update to latest STM32CubeG0 v1.6.2
2 parents 17ca401 + 213ec65 commit c117c7e

File tree

127 files changed

+4307
-3133
lines changed

Some content is hidden

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

127 files changed

+4307
-3133
lines changed

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g030xx.h

+6
Original file line numberDiff line numberDiff line change
@@ -4045,6 +4045,12 @@ typedef struct
40454045
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
40464046
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
40474047

4048+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
4049+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
4050+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
4051+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
4052+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
4053+
40484054
/*!< HPRE configuration */
40494055
#define RCC_CFGR_HPRE_Pos (8U)
40504056
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g031xx.h

+6
Original file line numberDiff line numberDiff line change
@@ -4225,6 +4225,12 @@ typedef struct
42254225
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
42264226
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
42274227

4228+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
4229+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
4230+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
4231+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
4232+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
4233+
42284234
/*!< HPRE configuration */
42294235
#define RCC_CFGR_HPRE_Pos (8U)
42304236
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g041xx.h

+6
Original file line numberDiff line numberDiff line change
@@ -4461,6 +4461,12 @@ typedef struct
44614461
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
44624462
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
44634463

4464+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
4465+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
4466+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
4467+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
4468+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
4469+
44644470
/*!< HPRE configuration */
44654471
#define RCC_CFGR_HPRE_Pos (8U)
44664472
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g050xx.h

+6
Original file line numberDiff line numberDiff line change
@@ -4064,6 +4064,12 @@ typedef struct
40644064
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
40654065
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
40664066

4067+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
4068+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
4069+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
4070+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
4071+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
4072+
40674073
/*!< HPRE configuration */
40684074
#define RCC_CFGR_HPRE_Pos (8U)
40694075
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g051xx.h

+6
Original file line numberDiff line numberDiff line change
@@ -4561,6 +4561,12 @@ typedef struct
45614561
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
45624562
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
45634563

4564+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
4565+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
4566+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
4567+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
4568+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
4569+
45644570
/*!< HPRE configuration */
45654571
#define RCC_CFGR_HPRE_Pos (8U)
45664572
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g061xx.h

+6
Original file line numberDiff line numberDiff line change
@@ -4797,6 +4797,12 @@ typedef struct
47974797
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
47984798
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
47994799

4800+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
4801+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
4802+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
4803+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
4804+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
4805+
48004806
/*!< HPRE configuration */
48014807
#define RCC_CFGR_HPRE_Pos (8U)
48024808
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g070xx.h

+6
Original file line numberDiff line numberDiff line change
@@ -4193,6 +4193,12 @@ typedef struct
41934193
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
41944194
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
41954195

4196+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
4197+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
4198+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
4199+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
4200+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
4201+
41964202
/*!< HPRE configuration */
41974203
#define RCC_CFGR_HPRE_Pos (8U)
41984204
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g071xx.h

+6
Original file line numberDiff line numberDiff line change
@@ -4896,6 +4896,12 @@ typedef struct
48964896
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
48974897
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
48984898

4899+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
4900+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
4901+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
4902+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
4903+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
4904+
48994905
/*!< HPRE configuration */
49004906
#define RCC_CFGR_HPRE_Pos (8U)
49014907
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g081xx.h

+6
Original file line numberDiff line numberDiff line change
@@ -5132,6 +5132,12 @@ typedef struct
51325132
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
51335133
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
51345134

5135+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
5136+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
5137+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
5138+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
5139+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
5140+
51355141
/*!< HPRE configuration */
51365142
#define RCC_CFGR_HPRE_Pos (8U)
51375143
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g0b0xx.h

+10-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ typedef struct
325325
typedef struct
326326
{
327327
__IO uint32_t CR1; /*!< PWR Power Control Register 1, Address offset: 0x00 */
328-
uint32_t RESERVED0; /*!< Reserved, Address offset: 0x04 */
328+
__IO uint32_t CR2; /*!< PWR Power Control Register 2, Address offset: 0x04 */
329329
__IO uint32_t CR3; /*!< PWR Power Control Register 3, Address offset: 0x08 */
330330
__IO uint32_t CR4; /*!< PWR Power Control Register 4, Address offset: 0x0C */
331331
__IO uint32_t SR1; /*!< PWR Power Status Register 1, Address offset: 0x10 */
@@ -4363,6 +4363,9 @@ typedef struct
43634363
#define PWR_CR1_LPR_Msk (0x1UL << PWR_CR1_LPR_Pos) /*!< 0x00004000 */
43644364
#define PWR_CR1_LPR PWR_CR1_LPR_Msk /*!< Regulator Low-Power Run mode */
43654365

4366+
#define PWR_CR2_USV_Pos (10U)
4367+
#define PWR_CR2_USV_Msk (0x1UL << PWR_CR2_USV_Pos) /*!< 0x00000400 */
4368+
#define PWR_CR2_USV PWR_CR2_USV_Msk /*!< VDD USB Supply Valid */
43664369

43674370
/******************** Bit definition for PWR_CR3 register ********************/
43684371
#define PWR_CR3_EWUP_Pos (0U)
@@ -5162,6 +5165,12 @@ typedef struct
51625165
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
51635166
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
51645167

5168+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
5169+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
5170+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
5171+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
5172+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
5173+
51655174
/*!< HPRE configuration */
51665175
#define RCC_CFGR_HPRE_Pos (8U)
51675176
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g0b1xx.h

+6
Original file line numberDiff line numberDiff line change
@@ -6146,6 +6146,12 @@ typedef struct
61466146
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
61476147
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
61486148

6149+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
6150+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
6151+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
6152+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
6153+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
6154+
61496155
/*!< HPRE configuration */
61506156
#define RCC_CFGR_HPRE_Pos (8U)
61516157
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g0c1xx.h

+6
Original file line numberDiff line numberDiff line change
@@ -6382,6 +6382,12 @@ typedef struct
63826382
#define RCC_CFGR_SWS_1 (0x2UL << RCC_CFGR_SWS_Pos) /*!< 0x00000010 */
63836383
#define RCC_CFGR_SWS_2 (0x4UL << RCC_CFGR_SWS_Pos) /*!< 0x00000020 */
63846384

6385+
#define RCC_CFGR_SWS_HSISYS (0x00000000UL) /*!< HSISYS used as system clock */
6386+
#define RCC_CFGR_SWS_HSE (0x00000008UL) /*!< HSE used as system clock */
6387+
#define RCC_CFGR_SWS_PLLRCLK (0x00000010UL) /*!< PLLRCLK used as system clock */
6388+
#define RCC_CFGR_SWS_LSI (0x00000018UL) /*!< LSI used as system clock */
6389+
#define RCC_CFGR_SWS_LSE (0x00000100UL) /*!< LSE used as system clock */
6390+
63856391
/*!< HPRE configuration */
63866392
#define RCC_CFGR_HPRE_Pos (8U)
63876393
#define RCC_CFGR_HPRE_Msk (0xFUL << RCC_CFGR_HPRE_Pos) /*!< 0x00000F00 */

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/Include/stm32g0xx.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
*/
9191
#define __STM32G0_CMSIS_VERSION_MAIN (0x01U) /*!< [31:24] main version */
9292
#define __STM32G0_CMSIS_VERSION_SUB1 (0x04U) /*!< [23:16] sub1 version */
93-
#define __STM32G0_CMSIS_VERSION_SUB2 (0x03U) /*!< [15:8] sub2 version */
93+
#define __STM32G0_CMSIS_VERSION_SUB2 (0x04U) /*!< [15:8] sub2 version */
9494
#define __STM32G0_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
9595
#define __STM32G0_CMSIS_VERSION ((__STM32G0_CMSIS_VERSION_MAIN << 24)\
9696
|(__STM32G0_CMSIS_VERSION_SUB1 << 16)\

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/License.md renamed to ‎system/Drivers/CMSIS/Device/ST/STM32G0xx/LICENSE.md

File renamed without changes.

‎system/Drivers/CMSIS/Device/ST/STM32G0xx/README.md

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
# STM32CubeG0 CMSIS Device MCU Component
22

3+
![latest tag](https://img.shields.io/github/v/tag/STMicroelectronics/cmsis_device_g0.svg?color=brightgreen)
4+
35
## Overview
46

57
**STM32Cube** is an STMicroelectronics original initiative to ease the developers life by reducing efforts, time and cost.
68

7-
**STM32Cube** covers the overall STM32 products portfolio. It includes a comprehensive embedded software platform, delivered for each STM32 series.
8-
* The CMSIS modules (core and device) corresponding to the ARM(tm) core implemented in this STM32 product
9-
* The STM32 HAL-LL drivers : an abstraction drivers layer, the API ensuring maximized portability across the STM32 portfolio
10-
* The BSP Drivers of each evaluation or demonstration board provided by this STM32 series
11-
* A consistent set of middlewares components such as RTOS, USB, FatFS, Graphics, STM32_TouchSensing_Library ...
12-
* A full set of software projects (basic examples, applications or demonstrations) for each board provided by this STM32 series
9+
**STM32Cube** covers the overall STM32 products portfolio. It includes a comprehensive embedded software platform delivered for each STM32 series.
10+
* The CMSIS modules (core and device) corresponding to the ARM(tm) core implemented in this STM32 product.
11+
* The STM32 HAL-LL drivers, an abstraction layer offering a set of APIs ensuring maximized portability across the STM32 portfolio.
12+
* The BSP drivers of each evaluation, demonstration or nucleo board provided for this STM32 series.
13+
* A consistent set of middleware libraries such as RTOS, USB, FatFS, graphics, touch sensing library...
14+
* A full set of software projects (basic examples, applications, and demonstrations) for each board provided for this STM32 series.
1315

14-
Two models of publication are proposed for the STM32Cube embedded software :
15-
* The monolithic **MCU Package** : all STM32Cube software modules of one STM32 series are present (Drivers, Middlewares, Projects, Utilities) in the repo (usual name **STM32Cubexx**, xx corresponding to the STM32 series)
16-
* The **MCU component** : progressively from November 2019, each STM32Cube software module being part of the STM32Cube MCU Package, will be delivered as an individual repo, allowing the user to select and get only the required software functions.
16+
Two models of publication are proposed for the STM32Cube embedded software:
17+
* The monolithic **MCU Package**: all STM32Cube software modules of one STM32 series are present (Drivers, Middleware, Projects, Utilities) in the repository (usual name **STM32Cubexx**, xx corresponding to the STM32 series).
18+
* The **MCU component**: each STM32Cube software module being part of the STM32Cube MCU Package, is delivered as an individual repository, allowing the user to select and get only the required software functions.
1719

1820
## Description
1921

@@ -30,6 +32,5 @@ It is **crucial** that you use a consistent set of versions for the CMSIS Core -
3032
The full **STM32CubeG0** MCU package is available [here](https://github.com/STMicroelectronics/STM32CubeG0).
3133

3234
## Troubleshooting
33-
If you have any issue with the **Software content** of this repo, you can [file an issue on Github](https://github.com/STMicroelectronics/cmsis_device_g0/issues/new).
3435

35-
For any other question related to the product, the tools, the environment, you can submit a topic on the [ST Community/STM32 MCUs forum](https://community.st.com/s/group/0F90X000000AXsASAW/stm32-mcus).
36+
Please refer to the [CONTRIBUTING.md](CONTRIBUTING.md) guide.

0 commit comments

Comments
 (0)