Skip to content

chore(f4): update to latest STM32CubeF4 v1.28.1 #2406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412cx.h
Original file line number Diff line number Diff line change
Expand Up @@ -8497,6 +8497,18 @@ typedef struct
#define RCC_CFGR_MCO1PRE_1 (0x2UL << RCC_CFGR_MCO1PRE_Pos) /*!< 0x02000000 */
#define RCC_CFGR_MCO1PRE_2 (0x4UL << RCC_CFGR_MCO1PRE_Pos) /*!< 0x04000000 */

#define RCC_CFGR_MCO2PRE_Pos (27U)
#define RCC_CFGR_MCO2PRE_Msk (0x7UL << RCC_CFGR_MCO2PRE_Pos) /*!< 0x38000000 */
#define RCC_CFGR_MCO2PRE RCC_CFGR_MCO2PRE_Msk
#define RCC_CFGR_MCO2PRE_0 (0x1UL << RCC_CFGR_MCO2PRE_Pos) /*!< 0x08000000 */
#define RCC_CFGR_MCO2PRE_1 (0x2UL << RCC_CFGR_MCO2PRE_Pos) /*!< 0x10000000 */
#define RCC_CFGR_MCO2PRE_2 (0x4UL << RCC_CFGR_MCO2PRE_Pos) /*!< 0x20000000 */

#define RCC_CFGR_MCO2_Pos (30U)
#define RCC_CFGR_MCO2_Msk (0x3UL << RCC_CFGR_MCO2_Pos) /*!< 0xC0000000 */
#define RCC_CFGR_MCO2 RCC_CFGR_MCO2_Msk
#define RCC_CFGR_MCO2_0 (0x1UL << RCC_CFGR_MCO2_Pos) /*!< 0x40000000 */
#define RCC_CFGR_MCO2_1 (0x2UL << RCC_CFGR_MCO2_Pos) /*!< 0x80000000 */

/******************** Bit definition for RCC_CIR register *******************/
#define RCC_CIR_LSIRDYF_Pos (0U)
Expand Down
4 changes: 2 additions & 2 deletions system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ extern "C" {
#endif /* USE_HAL_DRIVER */

/**
* @brief CMSIS version number V2.6.9
* @brief CMSIS version number V2.6.10
*/
#define __STM32F4xx_CMSIS_VERSION_MAIN (0x02U) /*!< [31:24] main version */
#define __STM32F4xx_CMSIS_VERSION_SUB1 (0x06U) /*!< [23:16] sub1 version */
#define __STM32F4xx_CMSIS_VERSION_SUB2 (0x09U) /*!< [15:8] sub2 version */
#define __STM32F4xx_CMSIS_VERSION_SUB2 (0x0AU) /*!< [15:8] sub2 version */
#define __STM32F4xx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
#define __STM32F4xx_CMSIS_VERSION ((__STM32F4xx_CMSIS_VERSION_MAIN << 24)\
|(__STM32F4xx_CMSIS_VERSION_SUB1 << 16)\
Expand Down
71 changes: 40 additions & 31 deletions system/Drivers/CMSIS/Device/ST/STM32F4xx/Release_Notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,19 @@ <h1 id="purpose">Purpose</h1>
<div class="col-sm-12 col-lg-8">
<h1 id="update-history">Update History</h1>
<div class="collapse">
<input type="checkbox" id="collapse-section31" checked aria-hidden="true"> <label for="collapse-section3" aria-hidden="true">V2.6.9 / 22-September-2022</label>
<input type="checkbox" id="collapse-section32" checked aria-hidden="true"> <label for="collapse-section32" aria-hidden="true">V2.6.10 / 31-May-2024</label>
<div>
<h2 id="main-changes">Main Changes</h2>
<ul>
<li>Add MCO2PRE[2:0] and MCO2[1:0] bits definition within CMSIS files.</li>
</ul>
</div>
</div>
<div class="collapse">
<input type="checkbox" id="collapse-section31" aria-hidden="true"> <label for="collapse-section31" aria-hidden="true">V2.6.9 / 22-September-2022</label>
<div>
<h2 id="main-changes-1">Main Changes</h2>
<ul>
<li>Added new atomic register access macros in stm32f4xx.h file.</li>
<li>Update FLASH_SCALE2_LATENCY4_FREQ value to 120MHz instead of 12MHz.</li>
<li>Update the GCC startup file to be aligned to IAR/Keil IDE.</li>
Expand All @@ -50,7 +59,7 @@ <h2 id="main-changes">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section30" aria-hidden="true"> <label for="collapse-section30" aria-hidden="true">V2.6.8 / 11-Fabruary-2022</label>
<div>
<h2 id="main-changes-1">Main Changes</h2>
<h2 id="main-changes-2">Main Changes</h2>
<ul>
<li>All source files: update disclaimer to add reference to the new license agreement.</li>
<li>Correct ETH bits definitions to be in line with naming used in the STM32F4 reference manual documents.</li>
Expand All @@ -60,7 +69,7 @@ <h2 id="main-changes-1">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section29" aria-hidden="true"> <label for="collapse-section29" aria-hidden="true">V2.6.7 / 16-July-2021</label>
<div>
<h2 id="main-changes-2">Main Changes</h2>
<h2 id="main-changes-3">Main Changes</h2>
<ul>
<li>Add missing definition FLASH_CR_ERRIE to the CMSIS header file.</li>
<li>Remove unsupported “GPIOF_BASE” and “GPIOG_BASE” defines from STM32F412Vx device.</li>
Expand All @@ -73,7 +82,7 @@ <h2 id="main-changes-2">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section28" aria-hidden="true"> <label for="collapse-section28" aria-hidden="true">V2.6.6 / 12-Fabruary-2021</label>
<div>
<h2 id="main-changes-3">Main Changes</h2>
<h2 id="main-changes-4">Main Changes</h2>
<ul>
<li>system_stm32f4xx.c:
<ul>
Expand All @@ -94,7 +103,7 @@ <h2 id="main-changes-3">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section27" aria-hidden="true"> <label for="collapse-section27" aria-hidden="true">V2.6.5 / 10-Fabruary-2020</label>
<div>
<h2 id="main-changes-4">Main Changes</h2>
<h2 id="main-changes-5">Main Changes</h2>
<ul>
<li>All header files
<ul>
Expand All @@ -110,7 +119,7 @@ <h2 id="main-changes-4">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section26" aria-hidden="true"> <label for="collapse-section26" aria-hidden="true">V2.6.4 / 06-December-2019</label>
<div>
<h2 id="main-changes-5">Main Changes</h2>
<h2 id="main-changes-6">Main Changes</h2>
<ul>
<li>stm32f446xx.h file
<ul>
Expand All @@ -134,7 +143,7 @@ <h2 id="main-changes-5">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section25" aria-hidden="true"> <label for="collapse-section25" aria-hidden="true">V2.6.3 / 08-Fabruary-2019</label>
<div>
<h2 id="main-changes-6">Main Changes</h2>
<h2 id="main-changes-7">Main Changes</h2>
<ul>
<li>CRYP:
<ul>
Expand Down Expand Up @@ -204,7 +213,7 @@ <h2 id="main-changes-6">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section24" aria-hidden="true"> <label for="collapse-section24" aria-hidden="true">V2.6.2 / 06-October-2017</label>
<div>
<h2 id="main-changes-7">Main Changes</h2>
<h2 id="main-changes-8">Main Changes</h2>
<ul>
<li>Remove Date and Version from all header files</li>
<li>USB_OTG register clean up: remove duplicated bits definitions</li>
Expand All @@ -230,7 +239,7 @@ <h2 id="main-changes-7">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section23" aria-hidden="true"> <label for="collapse-section23" aria-hidden="true">V2.6.1 / 14-Fabruary-2017</label>
<div>
<h2 id="main-changes-8">Main Changes</h2>
<h2 id="main-changes-9">Main Changes</h2>
<ul>
<li>General updates in header files to support LL drivers
<ul>
Expand Down Expand Up @@ -286,7 +295,7 @@ <h2 id="main-changes-8">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section22" aria-hidden="true"> <label for="collapse-section22" aria-hidden="true">V2.6.0 / 04-November-2016</label>
<div>
<h2 id="main-changes-9">Main Changes</h2>
<h2 id="main-changes-10">Main Changes</h2>
<ul>
<li>Add support of STM32F413xx and STM32F423xx devices
<ul>
Expand Down Expand Up @@ -334,7 +343,7 @@ <h2 id="main-changes-9">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section21" aria-hidden="true"> <label for="collapse-section21" aria-hidden="true">V2.5.1 / 28-June-2016</label>
<div>
<h2 id="main-changes-10">Main Changes</h2>
<h2 id="main-changes-11">Main Changes</h2>
<ul>
<li>stm32f412rx.h, stm32f412vx.h and stm32f412zx.h files:
<ul>
Expand All @@ -346,7 +355,7 @@ <h2 id="main-changes-10">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section20" aria-hidden="true"> <label for="collapse-section20" aria-hidden="true">V2.5.0 / 22-April-2016</label>
<div>
<h2 id="main-changes-11">Main Changes</h2>
<h2 id="main-changes-12">Main Changes</h2>
<ul>
<li>Add support of STM32F412Cx, STM32F412Rx, STM32F412Vx and STM32F412Zx devices
<ul>
Expand Down Expand Up @@ -402,7 +411,7 @@ <h2 id="main-changes-11">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section19" aria-hidden="true"> <label for="collapse-section19" aria-hidden="true">V2.4.3 / 29-January-2016</label>
<div>
<h2 id="main-changes-12">Main Changes</h2>
<h2 id="main-changes-13">Main Changes</h2>
<ul>
<li>Header file for all STM32 devices
<ul>
Expand Down Expand Up @@ -446,7 +455,7 @@ <h2 id="main-changes-12">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section18" aria-hidden="true"> <label for="collapse-section18" aria-hidden="true">V2.4.2 / 13-November-2015</label>
<div>
<h2 id="main-changes-13">Main Changes</h2>
<h2 id="main-changes-14">Main Changes</h2>
<ul>
<li>system_stm32f4xx.c file
<ul>
Expand Down Expand Up @@ -479,7 +488,7 @@ <h2 id="main-changes-13">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section17" aria-hidden="true"> <label for="collapse-section17" aria-hidden="true">V2.4.1 / 09-October-2015</label>
<div>
<h2 id="main-changes-14">Main Changes</h2>
<h2 id="main-changes-15">Main Changes</h2>
<ul>
<li>“stm32f469xx.h”, “stm32f479xx.h”
<ul>
Expand All @@ -491,7 +500,7 @@ <h2 id="main-changes-14">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section16" aria-hidden="true"> <label for="collapse-section16" aria-hidden="true">V2.4.0 / 14-August-2015</label>
<div>
<h2 id="main-changes-15">Main Changes</h2>
<h2 id="main-changes-16">Main Changes</h2>
<ul>
<li>Add support of STM32F469xx and STM32F479xx devices
<ul>
Expand All @@ -511,7 +520,7 @@ <h2 id="main-changes-15">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section15" aria-hidden="true"> <label for="collapse-section15" aria-hidden="true">V2.3.2 / 26-June-2015</label>
<div>
<h2 id="main-changes-16">Main Changes</h2>
<h2 id="main-changes-17">Main Changes</h2>
<ul>
<li>“stm32f405xx.h”, “stm32f407xx.h”, “stm32f415xx.h” and “stm32f417xx.h”
<ul>
Expand Down Expand Up @@ -540,7 +549,7 @@ <h2 id="main-changes-16">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section14" aria-hidden="true"> <label for="collapse-section14" aria-hidden="true">V2.3.1 / 03-April-2015</label>
<div>
<h2 id="main-changes-17">Main Changes</h2>
<h2 id="main-changes-18">Main Changes</h2>
<ul>
<li>Header file for all STM32 devices
<ul>
Expand All @@ -555,7 +564,7 @@ <h2 id="main-changes-17">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section13" aria-hidden="true"> <label for="collapse-section13" aria-hidden="true">V2.3.0 / 02-March-2015</label>
<div>
<h2 id="main-changes-18">Main Changes</h2>
<h2 id="main-changes-19">Main Changes</h2>
<ul>
<li>Add support of STM32F446xx devices
<ul>
Expand All @@ -576,7 +585,7 @@ <h2 id="main-changes-18">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section12" aria-hidden="true"> <label for="collapse-section12" aria-hidden="true">V2.2.0 / 15-December-2014</label>
<div>
<h2 id="main-changes-19">Main Changes</h2>
<h2 id="main-changes-20">Main Changes</h2>
<ul>
<li>stm32f4xx.h
<ul>
Expand All @@ -597,7 +606,7 @@ <h2 id="main-changes-19">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section11" aria-hidden="true"> <label for="collapse-section11" aria-hidden="true">V2.1.0 / 19-June-2014</label>
<div>
<h2 id="main-changes-20">Main Changes</h2>
<h2 id="main-changes-21">Main Changes</h2>
<ul>
<li>Add support of STM32F411xExx devices
<ul>
Expand Down Expand Up @@ -651,7 +660,7 @@ <h2 id="main-changes-20">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section10" aria-hidden="true"> <label for="collapse-section10" aria-hidden="true">V2.0.0 / 18-Fabruary-2014</label>
<div>
<h2 id="main-changes-21">Main Changes</h2>
<h2 id="main-changes-22">Main Changes</h2>
<ul>
<li>Update based on STM32Cube specification</li>
<li>This version and later has to be used only with STM32CubeF4 based development</li>
Expand All @@ -661,7 +670,7 @@ <h2 id="main-changes-21">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section9" aria-hidden="true"> <label for="collapse-section9" aria-hidden="true">V1.3.0 / 08-November-2013</label>
<div>
<h2 id="main-changes-22">Main Changes</h2>
<h2 id="main-changes-23">Main Changes</h2>
<ul>
<li>Add support of STM32F401xExx devices</li>
<li>Update startup files “startup_stm32f401xx.s” for EWARM, MDK-ARM, TrueSTUDIO and Ride toolchains: Add SPI4 interrupt handler entry in the vector table</li>
Expand All @@ -671,7 +680,7 @@ <h2 id="main-changes-22">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section8" aria-hidden="true"> <label for="collapse-section8" aria-hidden="true">V1.2.1 / 19-September-2013</label>
<div>
<h2 id="main-changes-23">Main Changes</h2>
<h2 id="main-changes-24">Main Changes</h2>
<ul>
<li>system_stm32f4xx.c : Update FMC SDRAM configuration (RBURST mode activation)</li>
<li>Update startup files “startup_stm32f427_437xx.s” and “startup_stm32f429_439xx.s” for TrueSTUDIO and Ride toolchains and maintain the old name of startup files for legacy purpose</li>
Expand All @@ -681,7 +690,7 @@ <h2 id="main-changes-23">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section7" aria-hidden="true"> <label for="collapse-section7" aria-hidden="true">V1.2.0 / 11-September-2013</label>
<div>
<h2 id="main-changes-24">Main Changes</h2>
<h2 id="main-changes-25">Main Changes</h2>
<ul>
<li>Add support of STM32F429/439xx and STM32F401xCxx devices</li>
<li>Update definition of STM32F427/437xx devices : extension of the features to include system clock up to 180MHz, dual bank Flash, reduced STOP Mode current, SAI, PCROP, SDRAM and DMA2D</li>
Expand All @@ -708,7 +717,7 @@ <h2 id="main-changes-24">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section6" aria-hidden="true"> <label for="collapse-section6" aria-hidden="true">V1.1.0 / 11-January-2013</label>
<div>
<h2 id="main-changes-25">Main Changes</h2>
<h2 id="main-changes-26">Main Changes</h2>
<ul>
<li>Official release for STM32F427x/437x devices.</li>
<li>stm32f4xx.h
Expand All @@ -734,7 +743,7 @@ <h2 id="main-changes-25">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section5" aria-hidden="true"> <label for="collapse-section5" aria-hidden="true">V1.0.2 / 05-March-2012</label>
<div>
<h2 id="main-changes-26">Main Changes</h2>
<h2 id="main-changes-27">Main Changes</h2>
<ul>
<li>All source files: license disclaimer text update and add link to the License file on ST Internet.</li>
</ul>
Expand All @@ -743,7 +752,7 @@ <h2 id="main-changes-26">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section4" aria-hidden="true"> <label for="collapse-section4" aria-hidden="true">V1.0.1 / 28-December-2011</label>
<div>
<h2 id="main-changes-27">Main Changes</h2>
<h2 id="main-changes-28">Main Changes</h2>
<ul>
<li>All source files: update disclaimer to add reference to the new license agreement</li>
<li>stm32f4xx.h
Expand All @@ -756,7 +765,7 @@ <h2 id="main-changes-27">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section3" aria-hidden="true"> <label for="collapse-section3" aria-hidden="true">V1.0.0 / 30-September-2011</label>
<div>
<h2 id="main-changes-28">Main Changes</h2>
<h2 id="main-changes-29">Main Changes</h2>
<ul>
<li>First official release for STM32F40x/41x devices</li>
<li>Add startup file for TASKING toolchain</li>
Expand All @@ -767,7 +776,7 @@ <h2 id="main-changes-28">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section2" aria-hidden="true"> <label for="collapse-section2" aria-hidden="true">V1.0.0RC2 / 26-September-2011</label>
<div>
<h2 id="main-changes-29">Main Changes</h2>
<h2 id="main-changes-30">Main Changes</h2>
<ul>
<li>Official version (V1.0.0) Release Candidate2 for STM32F40x/41x devices</li>
<li>stm32f4xx.h
Expand Down Expand Up @@ -805,7 +814,7 @@ <h2 id="main-changes-29">Main Changes</h2>
<div class="collapse">
<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">V1.0.0RC1 / 25-August-2011</label>
<div>
<h2 id="main-changes-30">Main Changes</h2>
<h2 id="main-changes-31">Main Changes</h2>
<ul>
<li>Official version (V1.0.0) Release Candidate1 for STM32F4xx devices</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion system/Drivers/CMSIS/Device/ST/STM32YYxx_CMSIS_version.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* STM32F1: 4.3.4
* STM32F2: 2.2.6
* STM32F3: 2.3.8
* STM32F4: 2.6.9
* STM32F4: 2.6.10
* STM32F7: 1.2.9
* STM32G0: 1.4.4
* STM32G4: 1.2.3
Expand Down
Loading
Loading