Skip to content

Commit 6b7e4a0

Browse files
authored
Merge pull request stm32duino#2406 from fpistm/STM32CubeF4_update
chore(f4): update to latest STM32CubeF4 v1.28.1
2 parents 16207a5 + f9a16d5 commit 6b7e4a0

Some content is hidden

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

47 files changed

+3326
-3144
lines changed

Diff for: system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f412cx.h

+12
Original file line numberDiff line numberDiff line change
@@ -8497,6 +8497,18 @@ typedef struct
84978497
#define RCC_CFGR_MCO1PRE_1 (0x2UL << RCC_CFGR_MCO1PRE_Pos) /*!< 0x02000000 */
84988498
#define RCC_CFGR_MCO1PRE_2 (0x4UL << RCC_CFGR_MCO1PRE_Pos) /*!< 0x04000000 */
84998499

8500+
#define RCC_CFGR_MCO2PRE_Pos (27U)
8501+
#define RCC_CFGR_MCO2PRE_Msk (0x7UL << RCC_CFGR_MCO2PRE_Pos) /*!< 0x38000000 */
8502+
#define RCC_CFGR_MCO2PRE RCC_CFGR_MCO2PRE_Msk
8503+
#define RCC_CFGR_MCO2PRE_0 (0x1UL << RCC_CFGR_MCO2PRE_Pos) /*!< 0x08000000 */
8504+
#define RCC_CFGR_MCO2PRE_1 (0x2UL << RCC_CFGR_MCO2PRE_Pos) /*!< 0x10000000 */
8505+
#define RCC_CFGR_MCO2PRE_2 (0x4UL << RCC_CFGR_MCO2PRE_Pos) /*!< 0x20000000 */
8506+
8507+
#define RCC_CFGR_MCO2_Pos (30U)
8508+
#define RCC_CFGR_MCO2_Msk (0x3UL << RCC_CFGR_MCO2_Pos) /*!< 0xC0000000 */
8509+
#define RCC_CFGR_MCO2 RCC_CFGR_MCO2_Msk
8510+
#define RCC_CFGR_MCO2_0 (0x1UL << RCC_CFGR_MCO2_Pos) /*!< 0x40000000 */
8511+
#define RCC_CFGR_MCO2_1 (0x2UL << RCC_CFGR_MCO2_Pos) /*!< 0x80000000 */
85008512

85018513
/******************** Bit definition for RCC_CIR register *******************/
85028514
#define RCC_CIR_LSIRDYF_Pos (0U)

Diff for: system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f4xx.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ extern "C" {
105105
#endif /* USE_HAL_DRIVER */
106106

107107
/**
108-
* @brief CMSIS version number V2.6.9
108+
* @brief CMSIS version number V2.6.10
109109
*/
110110
#define __STM32F4xx_CMSIS_VERSION_MAIN (0x02U) /*!< [31:24] main version */
111111
#define __STM32F4xx_CMSIS_VERSION_SUB1 (0x06U) /*!< [23:16] sub1 version */
112-
#define __STM32F4xx_CMSIS_VERSION_SUB2 (0x09U) /*!< [15:8] sub2 version */
112+
#define __STM32F4xx_CMSIS_VERSION_SUB2 (0x0AU) /*!< [15:8] sub2 version */
113113
#define __STM32F4xx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
114114
#define __STM32F4xx_CMSIS_VERSION ((__STM32F4xx_CMSIS_VERSION_MAIN << 24)\
115115
|(__STM32F4xx_CMSIS_VERSION_SUB1 << 16)\

Diff for: system/Drivers/CMSIS/Device/ST/STM32F4xx/Release_Notes.html

+40-31
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,19 @@ <h1 id="purpose">Purpose</h1>
3333
<div class="col-sm-12 col-lg-8">
3434
<h1 id="update-history">Update History</h1>
3535
<div class="collapse">
36-
<input type="checkbox" id="collapse-section31" checked aria-hidden="true"> <label for="collapse-section3" aria-hidden="true">V2.6.9 / 22-September-2022</label>
36+
<input type="checkbox" id="collapse-section32" checked aria-hidden="true"> <label for="collapse-section32" aria-hidden="true">V2.6.10 / 31-May-2024</label>
3737
<div>
3838
<h2 id="main-changes">Main Changes</h2>
3939
<ul>
40+
<li>Add MCO2PRE[2:0] and MCO2[1:0] bits definition within CMSIS files.</li>
41+
</ul>
42+
</div>
43+
</div>
44+
<div class="collapse">
45+
<input type="checkbox" id="collapse-section31" aria-hidden="true"> <label for="collapse-section31" aria-hidden="true">V2.6.9 / 22-September-2022</label>
46+
<div>
47+
<h2 id="main-changes-1">Main Changes</h2>
48+
<ul>
4049
<li>Added new atomic register access macros in stm32f4xx.h file.</li>
4150
<li>Update FLASH_SCALE2_LATENCY4_FREQ value to 120MHz instead of 12MHz.</li>
4251
<li>Update the GCC startup file to be aligned to IAR/Keil IDE.</li>
@@ -50,7 +59,7 @@ <h2 id="main-changes">Main Changes</h2>
5059
<div class="collapse">
5160
<input type="checkbox" id="collapse-section30" aria-hidden="true"> <label for="collapse-section30" aria-hidden="true">V2.6.8 / 11-Fabruary-2022</label>
5261
<div>
53-
<h2 id="main-changes-1">Main Changes</h2>
62+
<h2 id="main-changes-2">Main Changes</h2>
5463
<ul>
5564
<li>All source files: update disclaimer to add reference to the new license agreement.</li>
5665
<li>Correct ETH bits definitions to be in line with naming used in the STM32F4 reference manual documents.</li>
@@ -60,7 +69,7 @@ <h2 id="main-changes-1">Main Changes</h2>
6069
<div class="collapse">
6170
<input type="checkbox" id="collapse-section29" aria-hidden="true"> <label for="collapse-section29" aria-hidden="true">V2.6.7 / 16-July-2021</label>
6271
<div>
63-
<h2 id="main-changes-2">Main Changes</h2>
72+
<h2 id="main-changes-3">Main Changes</h2>
6473
<ul>
6574
<li>Add missing definition FLASH_CR_ERRIE to the CMSIS header file.</li>
6675
<li>Remove unsupported “GPIOF_BASE” and “GPIOG_BASE” defines from STM32F412Vx device.</li>
@@ -73,7 +82,7 @@ <h2 id="main-changes-2">Main Changes</h2>
7382
<div class="collapse">
7483
<input type="checkbox" id="collapse-section28" aria-hidden="true"> <label for="collapse-section28" aria-hidden="true">V2.6.6 / 12-Fabruary-2021</label>
7584
<div>
76-
<h2 id="main-changes-3">Main Changes</h2>
85+
<h2 id="main-changes-4">Main Changes</h2>
7786
<ul>
7887
<li>system_stm32f4xx.c:
7988
<ul>
@@ -94,7 +103,7 @@ <h2 id="main-changes-3">Main Changes</h2>
94103
<div class="collapse">
95104
<input type="checkbox" id="collapse-section27" aria-hidden="true"> <label for="collapse-section27" aria-hidden="true">V2.6.5 / 10-Fabruary-2020</label>
96105
<div>
97-
<h2 id="main-changes-4">Main Changes</h2>
106+
<h2 id="main-changes-5">Main Changes</h2>
98107
<ul>
99108
<li>All header files
100109
<ul>
@@ -110,7 +119,7 @@ <h2 id="main-changes-4">Main Changes</h2>
110119
<div class="collapse">
111120
<input type="checkbox" id="collapse-section26" aria-hidden="true"> <label for="collapse-section26" aria-hidden="true">V2.6.4 / 06-December-2019</label>
112121
<div>
113-
<h2 id="main-changes-5">Main Changes</h2>
122+
<h2 id="main-changes-6">Main Changes</h2>
114123
<ul>
115124
<li>stm32f446xx.h file
116125
<ul>
@@ -134,7 +143,7 @@ <h2 id="main-changes-5">Main Changes</h2>
134143
<div class="collapse">
135144
<input type="checkbox" id="collapse-section25" aria-hidden="true"> <label for="collapse-section25" aria-hidden="true">V2.6.3 / 08-Fabruary-2019</label>
136145
<div>
137-
<h2 id="main-changes-6">Main Changes</h2>
146+
<h2 id="main-changes-7">Main Changes</h2>
138147
<ul>
139148
<li>CRYP:
140149
<ul>
@@ -204,7 +213,7 @@ <h2 id="main-changes-6">Main Changes</h2>
204213
<div class="collapse">
205214
<input type="checkbox" id="collapse-section24" aria-hidden="true"> <label for="collapse-section24" aria-hidden="true">V2.6.2 / 06-October-2017</label>
206215
<div>
207-
<h2 id="main-changes-7">Main Changes</h2>
216+
<h2 id="main-changes-8">Main Changes</h2>
208217
<ul>
209218
<li>Remove Date and Version from all header files</li>
210219
<li>USB_OTG register clean up: remove duplicated bits definitions</li>
@@ -230,7 +239,7 @@ <h2 id="main-changes-7">Main Changes</h2>
230239
<div class="collapse">
231240
<input type="checkbox" id="collapse-section23" aria-hidden="true"> <label for="collapse-section23" aria-hidden="true">V2.6.1 / 14-Fabruary-2017</label>
232241
<div>
233-
<h2 id="main-changes-8">Main Changes</h2>
242+
<h2 id="main-changes-9">Main Changes</h2>
234243
<ul>
235244
<li>General updates in header files to support LL drivers
236245
<ul>
@@ -286,7 +295,7 @@ <h2 id="main-changes-8">Main Changes</h2>
286295
<div class="collapse">
287296
<input type="checkbox" id="collapse-section22" aria-hidden="true"> <label for="collapse-section22" aria-hidden="true">V2.6.0 / 04-November-2016</label>
288297
<div>
289-
<h2 id="main-changes-9">Main Changes</h2>
298+
<h2 id="main-changes-10">Main Changes</h2>
290299
<ul>
291300
<li>Add support of STM32F413xx and STM32F423xx devices
292301
<ul>
@@ -334,7 +343,7 @@ <h2 id="main-changes-9">Main Changes</h2>
334343
<div class="collapse">
335344
<input type="checkbox" id="collapse-section21" aria-hidden="true"> <label for="collapse-section21" aria-hidden="true">V2.5.1 / 28-June-2016</label>
336345
<div>
337-
<h2 id="main-changes-10">Main Changes</h2>
346+
<h2 id="main-changes-11">Main Changes</h2>
338347
<ul>
339348
<li>stm32f412rx.h, stm32f412vx.h and stm32f412zx.h files:
340349
<ul>
@@ -346,7 +355,7 @@ <h2 id="main-changes-10">Main Changes</h2>
346355
<div class="collapse">
347356
<input type="checkbox" id="collapse-section20" aria-hidden="true"> <label for="collapse-section20" aria-hidden="true">V2.5.0 / 22-April-2016</label>
348357
<div>
349-
<h2 id="main-changes-11">Main Changes</h2>
358+
<h2 id="main-changes-12">Main Changes</h2>
350359
<ul>
351360
<li>Add support of STM32F412Cx, STM32F412Rx, STM32F412Vx and STM32F412Zx devices
352361
<ul>
@@ -402,7 +411,7 @@ <h2 id="main-changes-11">Main Changes</h2>
402411
<div class="collapse">
403412
<input type="checkbox" id="collapse-section19" aria-hidden="true"> <label for="collapse-section19" aria-hidden="true">V2.4.3 / 29-January-2016</label>
404413
<div>
405-
<h2 id="main-changes-12">Main Changes</h2>
414+
<h2 id="main-changes-13">Main Changes</h2>
406415
<ul>
407416
<li>Header file for all STM32 devices
408417
<ul>
@@ -446,7 +455,7 @@ <h2 id="main-changes-12">Main Changes</h2>
446455
<div class="collapse">
447456
<input type="checkbox" id="collapse-section18" aria-hidden="true"> <label for="collapse-section18" aria-hidden="true">V2.4.2 / 13-November-2015</label>
448457
<div>
449-
<h2 id="main-changes-13">Main Changes</h2>
458+
<h2 id="main-changes-14">Main Changes</h2>
450459
<ul>
451460
<li>system_stm32f4xx.c file
452461
<ul>
@@ -479,7 +488,7 @@ <h2 id="main-changes-13">Main Changes</h2>
479488
<div class="collapse">
480489
<input type="checkbox" id="collapse-section17" aria-hidden="true"> <label for="collapse-section17" aria-hidden="true">V2.4.1 / 09-October-2015</label>
481490
<div>
482-
<h2 id="main-changes-14">Main Changes</h2>
491+
<h2 id="main-changes-15">Main Changes</h2>
483492
<ul>
484493
<li>“stm32f469xx.h”, “stm32f479xx.h”
485494
<ul>
@@ -491,7 +500,7 @@ <h2 id="main-changes-14">Main Changes</h2>
491500
<div class="collapse">
492501
<input type="checkbox" id="collapse-section16" aria-hidden="true"> <label for="collapse-section16" aria-hidden="true">V2.4.0 / 14-August-2015</label>
493502
<div>
494-
<h2 id="main-changes-15">Main Changes</h2>
503+
<h2 id="main-changes-16">Main Changes</h2>
495504
<ul>
496505
<li>Add support of STM32F469xx and STM32F479xx devices
497506
<ul>
@@ -511,7 +520,7 @@ <h2 id="main-changes-15">Main Changes</h2>
511520
<div class="collapse">
512521
<input type="checkbox" id="collapse-section15" aria-hidden="true"> <label for="collapse-section15" aria-hidden="true">V2.3.2 / 26-June-2015</label>
513522
<div>
514-
<h2 id="main-changes-16">Main Changes</h2>
523+
<h2 id="main-changes-17">Main Changes</h2>
515524
<ul>
516525
<li>“stm32f405xx.h”, “stm32f407xx.h”, “stm32f415xx.h” and “stm32f417xx.h”
517526
<ul>
@@ -540,7 +549,7 @@ <h2 id="main-changes-16">Main Changes</h2>
540549
<div class="collapse">
541550
<input type="checkbox" id="collapse-section14" aria-hidden="true"> <label for="collapse-section14" aria-hidden="true">V2.3.1 / 03-April-2015</label>
542551
<div>
543-
<h2 id="main-changes-17">Main Changes</h2>
552+
<h2 id="main-changes-18">Main Changes</h2>
544553
<ul>
545554
<li>Header file for all STM32 devices
546555
<ul>
@@ -555,7 +564,7 @@ <h2 id="main-changes-17">Main Changes</h2>
555564
<div class="collapse">
556565
<input type="checkbox" id="collapse-section13" aria-hidden="true"> <label for="collapse-section13" aria-hidden="true">V2.3.0 / 02-March-2015</label>
557566
<div>
558-
<h2 id="main-changes-18">Main Changes</h2>
567+
<h2 id="main-changes-19">Main Changes</h2>
559568
<ul>
560569
<li>Add support of STM32F446xx devices
561570
<ul>
@@ -576,7 +585,7 @@ <h2 id="main-changes-18">Main Changes</h2>
576585
<div class="collapse">
577586
<input type="checkbox" id="collapse-section12" aria-hidden="true"> <label for="collapse-section12" aria-hidden="true">V2.2.0 / 15-December-2014</label>
578587
<div>
579-
<h2 id="main-changes-19">Main Changes</h2>
588+
<h2 id="main-changes-20">Main Changes</h2>
580589
<ul>
581590
<li>stm32f4xx.h
582591
<ul>
@@ -597,7 +606,7 @@ <h2 id="main-changes-19">Main Changes</h2>
597606
<div class="collapse">
598607
<input type="checkbox" id="collapse-section11" aria-hidden="true"> <label for="collapse-section11" aria-hidden="true">V2.1.0 / 19-June-2014</label>
599608
<div>
600-
<h2 id="main-changes-20">Main Changes</h2>
609+
<h2 id="main-changes-21">Main Changes</h2>
601610
<ul>
602611
<li>Add support of STM32F411xExx devices
603612
<ul>
@@ -651,7 +660,7 @@ <h2 id="main-changes-20">Main Changes</h2>
651660
<div class="collapse">
652661
<input type="checkbox" id="collapse-section10" aria-hidden="true"> <label for="collapse-section10" aria-hidden="true">V2.0.0 / 18-Fabruary-2014</label>
653662
<div>
654-
<h2 id="main-changes-21">Main Changes</h2>
663+
<h2 id="main-changes-22">Main Changes</h2>
655664
<ul>
656665
<li>Update based on STM32Cube specification</li>
657666
<li>This version and later has to be used only with STM32CubeF4 based development</li>
@@ -661,7 +670,7 @@ <h2 id="main-changes-21">Main Changes</h2>
661670
<div class="collapse">
662671
<input type="checkbox" id="collapse-section9" aria-hidden="true"> <label for="collapse-section9" aria-hidden="true">V1.3.0 / 08-November-2013</label>
663672
<div>
664-
<h2 id="main-changes-22">Main Changes</h2>
673+
<h2 id="main-changes-23">Main Changes</h2>
665674
<ul>
666675
<li>Add support of STM32F401xExx devices</li>
667676
<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>
@@ -671,7 +680,7 @@ <h2 id="main-changes-22">Main Changes</h2>
671680
<div class="collapse">
672681
<input type="checkbox" id="collapse-section8" aria-hidden="true"> <label for="collapse-section8" aria-hidden="true">V1.2.1 / 19-September-2013</label>
673682
<div>
674-
<h2 id="main-changes-23">Main Changes</h2>
683+
<h2 id="main-changes-24">Main Changes</h2>
675684
<ul>
676685
<li>system_stm32f4xx.c : Update FMC SDRAM configuration (RBURST mode activation)</li>
677686
<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>
@@ -681,7 +690,7 @@ <h2 id="main-changes-23">Main Changes</h2>
681690
<div class="collapse">
682691
<input type="checkbox" id="collapse-section7" aria-hidden="true"> <label for="collapse-section7" aria-hidden="true">V1.2.0 / 11-September-2013</label>
683692
<div>
684-
<h2 id="main-changes-24">Main Changes</h2>
693+
<h2 id="main-changes-25">Main Changes</h2>
685694
<ul>
686695
<li>Add support of STM32F429/439xx and STM32F401xCxx devices</li>
687696
<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>
@@ -708,7 +717,7 @@ <h2 id="main-changes-24">Main Changes</h2>
708717
<div class="collapse">
709718
<input type="checkbox" id="collapse-section6" aria-hidden="true"> <label for="collapse-section6" aria-hidden="true">V1.1.0 / 11-January-2013</label>
710719
<div>
711-
<h2 id="main-changes-25">Main Changes</h2>
720+
<h2 id="main-changes-26">Main Changes</h2>
712721
<ul>
713722
<li>Official release for STM32F427x/437x devices.</li>
714723
<li>stm32f4xx.h
@@ -734,7 +743,7 @@ <h2 id="main-changes-25">Main Changes</h2>
734743
<div class="collapse">
735744
<input type="checkbox" id="collapse-section5" aria-hidden="true"> <label for="collapse-section5" aria-hidden="true">V1.0.2 / 05-March-2012</label>
736745
<div>
737-
<h2 id="main-changes-26">Main Changes</h2>
746+
<h2 id="main-changes-27">Main Changes</h2>
738747
<ul>
739748
<li>All source files: license disclaimer text update and add link to the License file on ST Internet.</li>
740749
</ul>
@@ -743,7 +752,7 @@ <h2 id="main-changes-26">Main Changes</h2>
743752
<div class="collapse">
744753
<input type="checkbox" id="collapse-section4" aria-hidden="true"> <label for="collapse-section4" aria-hidden="true">V1.0.1 / 28-December-2011</label>
745754
<div>
746-
<h2 id="main-changes-27">Main Changes</h2>
755+
<h2 id="main-changes-28">Main Changes</h2>
747756
<ul>
748757
<li>All source files: update disclaimer to add reference to the new license agreement</li>
749758
<li>stm32f4xx.h
@@ -756,7 +765,7 @@ <h2 id="main-changes-27">Main Changes</h2>
756765
<div class="collapse">
757766
<input type="checkbox" id="collapse-section3" aria-hidden="true"> <label for="collapse-section3" aria-hidden="true">V1.0.0 / 30-September-2011</label>
758767
<div>
759-
<h2 id="main-changes-28">Main Changes</h2>
768+
<h2 id="main-changes-29">Main Changes</h2>
760769
<ul>
761770
<li>First official release for STM32F40x/41x devices</li>
762771
<li>Add startup file for TASKING toolchain</li>
@@ -767,7 +776,7 @@ <h2 id="main-changes-28">Main Changes</h2>
767776
<div class="collapse">
768777
<input type="checkbox" id="collapse-section2" aria-hidden="true"> <label for="collapse-section2" aria-hidden="true">V1.0.0RC2 / 26-September-2011</label>
769778
<div>
770-
<h2 id="main-changes-29">Main Changes</h2>
779+
<h2 id="main-changes-30">Main Changes</h2>
771780
<ul>
772781
<li>Official version (V1.0.0) Release Candidate2 for STM32F40x/41x devices</li>
773782
<li>stm32f4xx.h
@@ -805,7 +814,7 @@ <h2 id="main-changes-29">Main Changes</h2>
805814
<div class="collapse">
806815
<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">V1.0.0RC1 / 25-August-2011</label>
807816
<div>
808-
<h2 id="main-changes-30">Main Changes</h2>
817+
<h2 id="main-changes-31">Main Changes</h2>
809818
<ul>
810819
<li>Official version (V1.0.0) Release Candidate1 for STM32F4xx devices</li>
811820
</ul>

Diff for: system/Drivers/CMSIS/Device/ST/STM32YYxx_CMSIS_version.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* STM32F1: 4.3.4
66
* STM32F2: 2.2.6
77
* STM32F3: 2.3.8
8-
* STM32F4: 2.6.9
8+
* STM32F4: 2.6.10
99
* STM32F7: 1.2.9
1010
* STM32G0: 1.4.4
1111
* STM32G4: 1.2.3

0 commit comments

Comments
 (0)