Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit808edbe

Browse files
authored
Merge pull request#2352 from fpistm/STM32CubeF3_update
chore(f3): update to latest STM32CubeF3 v1.11.5
2 parentsf75dace +3932a8e commit808edbe

File tree

125 files changed

+2104
-1458
lines changed

Some content is hidden

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

125 files changed

+2104
-1458
lines changed

‎system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f303xc.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,9 +1996,9 @@ typedef struct
19961996
#define ADC34_CSR_ADRDY_EOS_SLV_Pos (19U)
19971997
#define ADC34_CSR_ADRDY_EOS_SLV_Msk (0x1UL << ADC34_CSR_ADRDY_EOS_SLV_Pos) /*!< 0x00080000 */
19981998
#define ADC34_CSR_ADRDY_EOS_SLV ADC34_CSR_ADRDY_EOS_SLV_Msk /*!< End of regular sequence flag of the slave ADC */
1999-
#defineADC12_CSR_ADRDY_OVR_SLV_Pos (20U)
2000-
#defineADC12_CSR_ADRDY_OVR_SLV_Msk (0x1UL <<ADC12_CSR_ADRDY_OVR_SLV_Pos) /*!< 0x00100000 */
2001-
#defineADC12_CSR_ADRDY_OVR_SLVADC12_CSR_ADRDY_OVR_SLV_Msk /*!< Overrun flag of the slave ADC */
1999+
#defineADC34_CSR_ADRDY_OVR_SLV_Pos (20U)
2000+
#defineADC34_CSR_ADRDY_OVR_SLV_Msk (0x1UL <<ADC34_CSR_ADRDY_OVR_SLV_Pos) /*!< 0x00100000 */
2001+
#defineADC34_CSR_ADRDY_OVR_SLVADC34_CSR_ADRDY_OVR_SLV_Msk /*!< Overrun flag of the slave ADC */
20022002
#define ADC34_CSR_ADRDY_JEOC_SLV_Pos (21U)
20032003
#define ADC34_CSR_ADRDY_JEOC_SLV_Msk (0x1UL << ADC34_CSR_ADRDY_JEOC_SLV_Pos) /*!< 0x00200000 */
20042004
#define ADC34_CSR_ADRDY_JEOC_SLV ADC34_CSR_ADRDY_JEOC_SLV_Msk /*!< End of injected conversion of the slave ADC */

‎system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f303xe.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,9 +2107,9 @@ typedef struct
21072107
#define ADC34_CSR_ADRDY_EOS_SLV_Pos (19U)
21082108
#define ADC34_CSR_ADRDY_EOS_SLV_Msk (0x1UL << ADC34_CSR_ADRDY_EOS_SLV_Pos) /*!< 0x00080000 */
21092109
#define ADC34_CSR_ADRDY_EOS_SLV ADC34_CSR_ADRDY_EOS_SLV_Msk /*!< End of regular sequence flag of the slave ADC */
2110-
#defineADC12_CSR_ADRDY_OVR_SLV_Pos (20U)
2111-
#defineADC12_CSR_ADRDY_OVR_SLV_Msk (0x1UL <<ADC12_CSR_ADRDY_OVR_SLV_Pos) /*!< 0x00100000 */
2112-
#defineADC12_CSR_ADRDY_OVR_SLVADC12_CSR_ADRDY_OVR_SLV_Msk /*!< Overrun flag of the slave ADC */
2110+
#defineADC34_CSR_ADRDY_OVR_SLV_Pos (20U)
2111+
#defineADC34_CSR_ADRDY_OVR_SLV_Msk (0x1UL <<ADC34_CSR_ADRDY_OVR_SLV_Pos) /*!< 0x00100000 */
2112+
#defineADC34_CSR_ADRDY_OVR_SLVADC34_CSR_ADRDY_OVR_SLV_Msk /*!< Overrun flag of the slave ADC */
21132113
#define ADC34_CSR_ADRDY_JEOC_SLV_Pos (21U)
21142114
#define ADC34_CSR_ADRDY_JEOC_SLV_Msk (0x1UL << ADC34_CSR_ADRDY_JEOC_SLV_Pos) /*!< 0x00200000 */
21152115
#define ADC34_CSR_ADRDY_JEOC_SLV ADC34_CSR_ADRDY_JEOC_SLV_Msk /*!< End of injected conversion of the slave ADC */

‎system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f334x8.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,9 +1998,9 @@ typedef struct
19981998
#define ADC34_CSR_ADRDY_EOS_SLV_Pos (19U)
19991999
#define ADC34_CSR_ADRDY_EOS_SLV_Msk (0x1UL << ADC34_CSR_ADRDY_EOS_SLV_Pos) /*!< 0x00080000 */
20002000
#define ADC34_CSR_ADRDY_EOS_SLV ADC34_CSR_ADRDY_EOS_SLV_Msk /*!< End of regular sequence flag of the slave ADC */
2001-
#defineADC12_CSR_ADRDY_OVR_SLV_Pos (20U)
2002-
#defineADC12_CSR_ADRDY_OVR_SLV_Msk (0x1UL <<ADC12_CSR_ADRDY_OVR_SLV_Pos) /*!< 0x00100000 */
2003-
#defineADC12_CSR_ADRDY_OVR_SLVADC12_CSR_ADRDY_OVR_SLV_Msk /*!< Overrun flag of the slave ADC */
2001+
#defineADC34_CSR_ADRDY_OVR_SLV_Pos (20U)
2002+
#defineADC34_CSR_ADRDY_OVR_SLV_Msk (0x1UL <<ADC34_CSR_ADRDY_OVR_SLV_Pos) /*!< 0x00100000 */
2003+
#defineADC34_CSR_ADRDY_OVR_SLVADC34_CSR_ADRDY_OVR_SLV_Msk /*!< Overrun flag of the slave ADC */
20042004
#define ADC34_CSR_ADRDY_JEOC_SLV_Pos (21U)
20052005
#define ADC34_CSR_ADRDY_JEOC_SLV_Msk (0x1UL << ADC34_CSR_ADRDY_JEOC_SLV_Pos) /*!< 0x00200000 */
20062006
#define ADC34_CSR_ADRDY_JEOC_SLV ADC34_CSR_ADRDY_JEOC_SLV_Msk /*!< End of injected conversion of the slave ADC */

‎system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f358xx.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1954,9 +1954,9 @@ typedef struct
19541954
#define ADC34_CSR_ADRDY_EOS_SLV_Pos (19U)
19551955
#define ADC34_CSR_ADRDY_EOS_SLV_Msk (0x1UL << ADC34_CSR_ADRDY_EOS_SLV_Pos) /*!< 0x00080000 */
19561956
#define ADC34_CSR_ADRDY_EOS_SLV ADC34_CSR_ADRDY_EOS_SLV_Msk /*!< End of regular sequence flag of the slave ADC */
1957-
#defineADC12_CSR_ADRDY_OVR_SLV_Pos (20U)
1958-
#defineADC12_CSR_ADRDY_OVR_SLV_Msk (0x1UL <<ADC12_CSR_ADRDY_OVR_SLV_Pos) /*!< 0x00100000 */
1959-
#defineADC12_CSR_ADRDY_OVR_SLVADC12_CSR_ADRDY_OVR_SLV_Msk /*!< Overrun flag of the slave ADC */
1957+
#defineADC34_CSR_ADRDY_OVR_SLV_Pos (20U)
1958+
#defineADC34_CSR_ADRDY_OVR_SLV_Msk (0x1UL <<ADC34_CSR_ADRDY_OVR_SLV_Pos) /*!< 0x00100000 */
1959+
#defineADC34_CSR_ADRDY_OVR_SLVADC34_CSR_ADRDY_OVR_SLV_Msk /*!< Overrun flag of the slave ADC */
19601960
#define ADC34_CSR_ADRDY_JEOC_SLV_Pos (21U)
19611961
#define ADC34_CSR_ADRDY_JEOC_SLV_Msk (0x1UL << ADC34_CSR_ADRDY_JEOC_SLV_Pos) /*!< 0x00200000 */
19621962
#define ADC34_CSR_ADRDY_JEOC_SLV ADC34_CSR_ADRDY_JEOC_SLV_Msk /*!< End of injected conversion of the slave ADC */

‎system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f373xc.h‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7363,9 +7363,13 @@ typedef struct
73637363
#define CEC_TXDR_TXD CEC_TXDR_TXD_Msk /*!< CEC Tx Data */
73647364

73657365
/******************* Bit definition for CEC_RXDR register *******************/
7366-
#define CEC_TXDR_RXD_Pos (0U)
7367-
#define CEC_TXDR_RXD_Msk (0xFFUL << CEC_TXDR_RXD_Pos) /*!< 0x000000FF */
7368-
#define CEC_TXDR_RXD CEC_TXDR_RXD_Msk /*!< CEC Rx Data */
7366+
#define CEC_RXDR_RXD_Pos (0U)
7367+
#define CEC_RXDR_RXD_Msk (0xFFUL << CEC_RXDR_RXD_Pos) /*!< 0x000000FF */
7368+
#define CEC_RXDR_RXD CEC_RXDR_RXD_Msk /*!< CEC Rx Data */
7369+
/* Legacy aliases */
7370+
#define CEC_TXDR_RXD_Pos CEC_RXDR_RXD_Pos
7371+
#define CEC_TXDR_RXD_Msk CEC_RXDR_RXD_Msk
7372+
#define CEC_TXDR_RXD CEC_RXDR_RXD
73697373

73707374
/******************* Bit definition for CEC_ISR register ********************/
73717375
#define CEC_ISR_RXBR_Pos (0U)

‎system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f378xx.h‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7304,9 +7304,13 @@ typedef struct
73047304
#define CEC_TXDR_TXD CEC_TXDR_TXD_Msk /*!< CEC Tx Data */
73057305

73067306
/******************* Bit definition for CEC_RXDR register *******************/
7307-
#define CEC_TXDR_RXD_Pos (0U)
7308-
#define CEC_TXDR_RXD_Msk (0xFFUL << CEC_TXDR_RXD_Pos) /*!< 0x000000FF */
7309-
#define CEC_TXDR_RXD CEC_TXDR_RXD_Msk /*!< CEC Rx Data */
7307+
#define CEC_RXDR_RXD_Pos (0U)
7308+
#define CEC_RXDR_RXD_Msk (0xFFUL << CEC_RXDR_RXD_Pos) /*!< 0x000000FF */
7309+
#define CEC_RXDR_RXD CEC_RXDR_RXD_Msk /*!< CEC Rx Data */
7310+
/* Legacy aliases */
7311+
#define CEC_TXDR_RXD_Pos CEC_RXDR_RXD_Pos
7312+
#define CEC_TXDR_RXD_Msk CEC_RXDR_RXD_Msk
7313+
#define CEC_TXDR_RXD CEC_RXDR_RXD
73107314

73117315
/******************* Bit definition for CEC_ISR register ********************/
73127316
#define CEC_ISR_RXBR_Pos (0U)

‎system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f398xx.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2063,9 +2063,9 @@ typedef struct
20632063
#define ADC34_CSR_ADRDY_EOS_SLV_Pos (19U)
20642064
#define ADC34_CSR_ADRDY_EOS_SLV_Msk (0x1UL << ADC34_CSR_ADRDY_EOS_SLV_Pos) /*!< 0x00080000 */
20652065
#define ADC34_CSR_ADRDY_EOS_SLV ADC34_CSR_ADRDY_EOS_SLV_Msk /*!< End of regular sequence flag of the slave ADC */
2066-
#defineADC12_CSR_ADRDY_OVR_SLV_Pos (20U)
2067-
#defineADC12_CSR_ADRDY_OVR_SLV_Msk (0x1UL <<ADC12_CSR_ADRDY_OVR_SLV_Pos) /*!< 0x00100000 */
2068-
#defineADC12_CSR_ADRDY_OVR_SLVADC12_CSR_ADRDY_OVR_SLV_Msk /*!< Overrun flag of the slave ADC */
2066+
#defineADC34_CSR_ADRDY_OVR_SLV_Pos (20U)
2067+
#defineADC34_CSR_ADRDY_OVR_SLV_Msk (0x1UL <<ADC34_CSR_ADRDY_OVR_SLV_Pos) /*!< 0x00100000 */
2068+
#defineADC34_CSR_ADRDY_OVR_SLVADC34_CSR_ADRDY_OVR_SLV_Msk /*!< Overrun flag of the slave ADC */
20692069
#define ADC34_CSR_ADRDY_JEOC_SLV_Pos (21U)
20702070
#define ADC34_CSR_ADRDY_JEOC_SLV_Msk (0x1UL << ADC34_CSR_ADRDY_JEOC_SLV_Pos) /*!< 0x00200000 */
20712071
#define ADC34_CSR_ADRDY_JEOC_SLV ADC34_CSR_ADRDY_JEOC_SLV_Msk /*!< End of injected conversion of the slave ADC */

‎system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f3xx.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@
102102
#endif /* USE_HAL_DRIVER */
103103

104104
/**
105-
* @brief CMSIS Device version number V2.3.7
105+
* @brief CMSIS Device version number V2.3.8
106106
*/
107107
#define __STM32F3_CMSIS_VERSION_MAIN (0x02) /*!< [31:24] main version */
108108
#define __STM32F3_CMSIS_VERSION_SUB1 (0x03) /*!< [23:16] sub1 version */
109-
#define __STM32F3_CMSIS_VERSION_SUB2 (0x07) /*!< [15:8] sub2 version */
109+
#define __STM32F3_CMSIS_VERSION_SUB2 (0x08) /*!< [15:8] sub2 version */
110110
#define __STM32F3_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */
111111
#define __STM32F3_CMSIS_VERSION ((__STM32F3_CMSIS_VERSION_MAIN << 24)\
112112
|(__STM32F3_CMSIS_VERSION_SUB1 << 16)\
File renamed without changes.

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
# STM32CubeF3 CMSIS Device MCU Component
22

3+
![latest tag](https://img.shields.io/github/v/tag/STMicroelectronics/cmsis_device_f3.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 abstractiondriverslayer, the APIensuring maximized portability across the STM32 portfolio
10-
* The BSPDrivers of each evaluationordemonstration board providedby this STM32 series
11-
* A consistent set ofmiddlewares 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 providedby 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 APIsensuring maximized portability across the STM32 portfolio.
12+
* The BSPdrivers of each evaluation, demonstrationornucleo board providedfor this STM32 series.
13+
* A consistent set ofmiddleware 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 providedfor 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 therepo (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 bedelivered as an individualrepo, 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 therepository (usual name **STM32Cubexx**, xx corresponding to the STM32 series).
18+
* The **MCU component**:each STM32Cube software module being part of the STM32Cube MCU Package,isdelivered as an individualrepository, allowing the user to select and get only the required software functions.
1719

1820
## Description
1921

@@ -32,4 +34,4 @@ The full **STM32CubeF3** MCU package is available [here](https://github.com/STMi
3234
## Troubleshooting
3335
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_f3/issues/new).
3436

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).
37+
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/topic/0TO0X000000BSqSWAW/stm32-mcus).

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp