Skip to content

Commit 813aa02

Browse files
committed
F2: update STM32F2xx CMSIS Drivers to v2.2.5
Included in STM32CubeF2 FW v1.9.3 Signed-off-by: Frederic Pillon <[email protected]>
1 parent 0897fb9 commit 813aa02

14 files changed

+269
-124
lines changed

system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/generate.bat

-20
This file was deleted.

system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f205xx.h

+11-3
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ typedef enum
151151
OTG_HS_EP1_IN_IRQn = 75, /*!< USB OTG HS End Point 1 In global interrupt */
152152
OTG_HS_WKUP_IRQn = 76, /*!< USB OTG HS Wakeup through EXTI interrupt */
153153
OTG_HS_IRQn = 77, /*!< USB OTG HS global interrupt */
154-
RNG_IRQn = 80 /*!< Rng global interrupt */
154+
RNG_IRQn = 80 /*!< Rng global interrupt */
155155
} IRQn_Type;
156156

157157
/**
@@ -186,7 +186,7 @@ typedef struct
186186
__IO uint32_t SQR1; /*!< ADC regular sequence register 1, Address offset: 0x2C */
187187
__IO uint32_t SQR2; /*!< ADC regular sequence register 2, Address offset: 0x30 */
188188
__IO uint32_t SQR3; /*!< ADC regular sequence register 3, Address offset: 0x34 */
189-
__IO uint32_t JSQR; /*!< ADC injected sequence register, Address offset: 0x38*/
189+
__IO uint32_t JSQR; /*!< ADC injected sequence register, Address offset: 0x38 */
190190
__IO uint32_t JDR1; /*!< ADC injected data register 1, Address offset: 0x3C */
191191
__IO uint32_t JDR2; /*!< ADC injected data register 2, Address offset: 0x40 */
192192
__IO uint32_t JDR3; /*!< ADC injected data register 3, Address offset: 0x44 */
@@ -1051,7 +1051,15 @@ USB_OTG_HostChannelTypeDef;
10511051
/** @addtogroup Exported_constants
10521052
* @{
10531053
*/
1054-
1054+
1055+
/** @addtogroup Hardware_Constant_Definition
1056+
* @{
1057+
*/
1058+
#define LSI_STARTUP_TIME 40U /*!< LSI Maximum startup time in us */
1059+
/**
1060+
* @}
1061+
*/
1062+
10551063
/** @addtogroup Peripheral_Registers_Bits_Definition
10561064
* @{
10571065
*/

system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f207xx.h

+11-3
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ typedef enum
154154
OTG_HS_WKUP_IRQn = 76, /*!< USB OTG HS Wakeup through EXTI interrupt */
155155
OTG_HS_IRQn = 77, /*!< USB OTG HS global interrupt */
156156
DCMI_IRQn = 78, /*!< DCMI global interrupt */
157-
RNG_IRQn = 80 /*!< Rng global interrupt */
157+
RNG_IRQn = 80 /*!< Rng global interrupt */
158158
} IRQn_Type;
159159

160160
/**
@@ -189,7 +189,7 @@ typedef struct
189189
__IO uint32_t SQR1; /*!< ADC regular sequence register 1, Address offset: 0x2C */
190190
__IO uint32_t SQR2; /*!< ADC regular sequence register 2, Address offset: 0x30 */
191191
__IO uint32_t SQR3; /*!< ADC regular sequence register 3, Address offset: 0x34 */
192-
__IO uint32_t JSQR; /*!< ADC injected sequence register, Address offset: 0x38*/
192+
__IO uint32_t JSQR; /*!< ADC injected sequence register, Address offset: 0x38 */
193193
__IO uint32_t JDR1; /*!< ADC injected data register 1, Address offset: 0x3C */
194194
__IO uint32_t JDR2; /*!< ADC injected data register 2, Address offset: 0x40 */
195195
__IO uint32_t JDR3; /*!< ADC injected data register 3, Address offset: 0x44 */
@@ -1155,7 +1155,15 @@ USB_OTG_HostChannelTypeDef;
11551155
/** @addtogroup Exported_constants
11561156
* @{
11571157
*/
1158-
1158+
1159+
/** @addtogroup Hardware_Constant_Definition
1160+
* @{
1161+
*/
1162+
#define LSI_STARTUP_TIME 40U /*!< LSI Maximum startup time in us */
1163+
/**
1164+
* @}
1165+
*/
1166+
11591167
/** @addtogroup Peripheral_Registers_Bits_Definition
11601168
* @{
11611169
*/

system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f215xx.h

+10-2
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ typedef struct
187187
__IO uint32_t SQR1; /*!< ADC regular sequence register 1, Address offset: 0x2C */
188188
__IO uint32_t SQR2; /*!< ADC regular sequence register 2, Address offset: 0x30 */
189189
__IO uint32_t SQR3; /*!< ADC regular sequence register 3, Address offset: 0x34 */
190-
__IO uint32_t JSQR; /*!< ADC injected sequence register, Address offset: 0x38*/
190+
__IO uint32_t JSQR; /*!< ADC injected sequence register, Address offset: 0x38 */
191191
__IO uint32_t JDR1; /*!< ADC injected data register 1, Address offset: 0x3C */
192192
__IO uint32_t JDR2; /*!< ADC injected data register 2, Address offset: 0x40 */
193193
__IO uint32_t JDR3; /*!< ADC injected data register 3, Address offset: 0x44 */
@@ -1101,7 +1101,15 @@ USB_OTG_HostChannelTypeDef;
11011101
/** @addtogroup Exported_constants
11021102
* @{
11031103
*/
1104-
1104+
1105+
/** @addtogroup Hardware_Constant_Definition
1106+
* @{
1107+
*/
1108+
#define LSI_STARTUP_TIME 40U /*!< LSI Maximum startup time in us */
1109+
/**
1110+
* @}
1111+
*/
1112+
11051113
/** @addtogroup Peripheral_Registers_Bits_Definition
11061114
* @{
11071115
*/

system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f217xx.h

+10-2
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ typedef struct
190190
__IO uint32_t SQR1; /*!< ADC regular sequence register 1, Address offset: 0x2C */
191191
__IO uint32_t SQR2; /*!< ADC regular sequence register 2, Address offset: 0x30 */
192192
__IO uint32_t SQR3; /*!< ADC regular sequence register 3, Address offset: 0x34 */
193-
__IO uint32_t JSQR; /*!< ADC injected sequence register, Address offset: 0x38*/
193+
__IO uint32_t JSQR; /*!< ADC injected sequence register, Address offset: 0x38 */
194194
__IO uint32_t JDR1; /*!< ADC injected data register 1, Address offset: 0x3C */
195195
__IO uint32_t JDR2; /*!< ADC injected data register 2, Address offset: 0x40 */
196196
__IO uint32_t JDR3; /*!< ADC injected data register 3, Address offset: 0x44 */
@@ -1205,7 +1205,15 @@ USB_OTG_HostChannelTypeDef;
12051205
/** @addtogroup Exported_constants
12061206
* @{
12071207
*/
1208-
1208+
1209+
/** @addtogroup Hardware_Constant_Definition
1210+
* @{
1211+
*/
1212+
#define LSI_STARTUP_TIME 40U /*!< LSI Maximum startup time in us */
1213+
/**
1214+
* @}
1215+
*/
1216+
12091217
/** @addtogroup Peripheral_Registers_Bits_Definition
12101218
* @{
12111219
*/

system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@
8181
#endif /* USE_HAL_DRIVER */
8282

8383
/**
84-
* @brief CMSIS Device version number V2.2.4
84+
* @brief CMSIS Device version number V2.2.5
8585
*/
8686
#define __STM32F2xx_CMSIS_VERSION_MAIN (0x02U) /*!< [31:24] main version */
8787
#define __STM32F2xx_CMSIS_VERSION_SUB1 (0x02U) /*!< [23:16] sub1 version */
88-
#define __STM32F2xx_CMSIS_VERSION_SUB2 (0x04U) /*!< [15:8] sub2 version */
88+
#define __STM32F2xx_CMSIS_VERSION_SUB2 (0x05U) /*!< [15:8] sub2 version */
8989
#define __STM32F2xx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
9090
#define __STM32F2xx_CMSIS_VERSION ((__STM32F2xx_CMSIS_VERSION_MAIN << 24)\
9191
|(__STM32F2xx_CMSIS_VERSION_SUB1 << 16)\
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
10+
11+
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
12+
13+
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
14+
15+
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
16+
17+
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
18+
19+
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
20+
21+
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
22+
23+
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
24+
25+
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
26+
27+
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
28+
29+
2. Grant of Copyright License.
30+
31+
Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
32+
33+
3. Grant of Patent License.
34+
35+
Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
36+
37+
4. Redistribution.
38+
39+
You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
40+
1.You must give any other recipients of the Work or Derivative Works a copy of this License; and
41+
2.You must cause any modified files to carry prominent notices stating that You changed the files; and
42+
3.You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
43+
4.If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
44+
45+
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
46+
47+
5. Submission of Contributions.
48+
49+
Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
50+
51+
6. Trademarks.
52+
53+
This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
54+
55+
7. Disclaimer of Warranty.
56+
57+
Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
58+
59+
8. Limitation of Liability.
60+
61+
In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
62+
63+
9. Accepting Warranty or Additional Liability.
64+
65+
While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
66+
67+
END OF TERMS AND CONDITIONS
68+
69+
APPENDIX:
70+
71+
Copyright [2019] [STMicroelectronics]
72+
73+
Licensed under the Apache License, Version 2.0 (the "License");
74+
you may not use this file except in compliance with the License.
75+
You may obtain a copy of the License at
76+
77+
http://www.apache.org/licenses/LICENSE-2.0
78+
79+
Unless required by applicable law or agreed to in writing, software
80+
distributed under the License is distributed on an "AS IS" BASIS,
81+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
82+
See the License for the specific language governing permissions and
83+
limitations under the License.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# STM32CubeF2 CMSIS Device MCU Component
2+
3+
## Overview
4+
5+
**STM32Cube** is an STMicroelectronics original initiative to ease the developers life by reducing efforts, time and cost.
6+
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.
13+
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 repository (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.
17+
18+
## Description
19+
20+
This **cmsis_device_f2** MCU component repo is one element of the STM32CubeF2 MCU embedded software package, providing the **cmsis device** part.
21+
22+
## Release note
23+
24+
Details about the content of this release are available in the release note [here](https://htmlpreview.github.io/?https://github.com/STMicroelectronics/cmsis_device_f2/blob/master/Release_Notes.html).
25+
26+
## Compatibility information
27+
28+
In this table, you can find the successive versions of this CMSIS Device component, in-line with the corresponding versions of the full MCU package:
29+
30+
CMSIS Device F2 | CMSIS Core | Was delivered in the full MCU package
31+
--------------- | ---------- | -------------------------------------
32+
Tag v2.2.2 | Tag v5.4.0_cm3 | Tag v1.8.0 (and later, if any, till next tag)
33+
Tag v2.2.3 | Tag v5.4.0_cm3 | Tag v1.9.0 (and later, if any, till next tag)
34+
Tag v2.2.4 | Tag v5.4.0_cm3 | Tag v1.9.1 (and later, if any, till next tag)
35+
Tag v2.2.5 | Tag v5.4.0_cm3 | Tag v1.9.3 (and later, if any, till next tag)
36+
37+
The full **STM32CubeF2** MCU package is available [here](https://github.com/STMicroelectronics/STM32CubeF2).
38+
39+
## Troubleshooting
40+
If you have any issue with the **Software content** of this repository, you can [file an issue on Github](https://github.com/STMicroelectronics/cmsis_device_f2/issues/new).
41+
42+
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).

0 commit comments

Comments
 (0)