From 495c4cfc0cd6e2f088ed00869b85dcf12294917b Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Fri, 14 Mar 2025 09:49:50 +0100
Subject: [PATCH 1/5] chore: update core version to 2.11.0-dev (0x021100F0)
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
libraries/SrcWrapper/inc/stm32_def.h | 4 ++--
platform.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libraries/SrcWrapper/inc/stm32_def.h b/libraries/SrcWrapper/inc/stm32_def.h
index 2b8abb395e..82c8591178 100644
--- a/libraries/SrcWrapper/inc/stm32_def.h
+++ b/libraries/SrcWrapper/inc/stm32_def.h
@@ -6,7 +6,7 @@
* @brief STM32 core version number
*/
#define STM32_CORE_VERSION_MAJOR (0x02U) /*!< [31:24] major version */
-#define STM32_CORE_VERSION_MINOR (0x10U) /*!< [23:16] minor version */
+#define STM32_CORE_VERSION_MINOR (0x11U) /*!< [23:16] minor version */
#define STM32_CORE_VERSION_PATCH (0x00U) /*!< [15:8] patch version */
/*
* Extra label for development:
@@ -14,7 +14,7 @@
* [1-9]: release candidate
* F[0-9]: development
*/
-#define STM32_CORE_VERSION_EXTRA (0x00U) /*!< [7:0] extra version */
+#define STM32_CORE_VERSION_EXTRA (0xF0U) /*!< [7:0] extra version */
#define STM32_CORE_VERSION ((STM32_CORE_VERSION_MAJOR << 24U)\
|(STM32_CORE_VERSION_MINOR << 16U)\
|(STM32_CORE_VERSION_PATCH << 8U )\
diff --git a/platform.txt b/platform.txt
index eff47d4751..651928558f 100644
--- a/platform.txt
+++ b/platform.txt
@@ -5,7 +5,7 @@
# https://arduino.github.io/arduino-cli/latest/platform-specification/
name=STM32 boards groups (Board to be selected from Tools submenu 'Board part number')
-version=2.10.0
+version=2.11.0-dev
# Define variables used multiple times in platform file
From e2c8f4237089d2706df73e2a0ebcd8ef83d8e662 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Fri, 14 Mar 2025 10:01:12 +0100
Subject: [PATCH 2/5] fix: remove extra semi-colons
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
libraries/SrcWrapper/src/stm32/analog.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/libraries/SrcWrapper/src/stm32/analog.cpp b/libraries/SrcWrapper/src/stm32/analog.cpp
index 7ef35f054d..c4dde7069a 100644
--- a/libraries/SrcWrapper/src/stm32/analog.cpp
+++ b/libraries/SrcWrapper/src/stm32/analog.cpp
@@ -32,30 +32,30 @@ static PinName g_current_pin = NC;
#ifndef ADC_SAMPLINGTIME
#if defined(ADC_SAMPLETIME_8CYCLES_5)
-#define ADC_SAMPLINGTIME ADC_SAMPLETIME_8CYCLES_5;
+#define ADC_SAMPLINGTIME ADC_SAMPLETIME_8CYCLES_5
#elif defined(ADC_SAMPLETIME_11CYCLES_5)
-#define ADC_SAMPLINGTIME ADC_SAMPLETIME_11CYCLES_5;
+#define ADC_SAMPLINGTIME ADC_SAMPLETIME_11CYCLES_5
#elif defined(ADC_SAMPLETIME_12CYCLES)
#define ADC_SAMPLINGTIME ADC_SAMPLETIME_12CYCLES;
#elif defined(ADC_SAMPLETIME_12CYCLES_5)
-#define ADC_SAMPLINGTIME ADC_SAMPLETIME_12CYCLES_5;
+#define ADC_SAMPLINGTIME ADC_SAMPLETIME_12CYCLES_5
#elif defined(ADC_SAMPLETIME_13CYCLES_5)
-#define ADC_SAMPLINGTIME ADC_SAMPLETIME_13CYCLES_5;
+#define ADC_SAMPLINGTIME ADC_SAMPLETIME_13CYCLES_5
#elif defined(ADC_SAMPLETIME_15CYCLES)
-#define ADC_SAMPLINGTIME ADC_SAMPLETIME_15CYCLES;
+#define ADC_SAMPLINGTIME ADC_SAMPLETIME_15CYCLES
#elif defined(ADC_SAMPLETIME_16CYCLES)
-#define ADC_SAMPLINGTIME ADC_SAMPLETIME_16CYCLES;
+#define ADC_SAMPLINGTIME ADC_SAMPLETIME_16CYCLES
#elif defined(ADC_SAMPLETIME_19CYCLES_5)
-#define ADC_SAMPLINGTIME ADC_SAMPLETIME_19CYCLES_5;
+#define ADC_SAMPLINGTIME ADC_SAMPLETIME_19CYCLES_5
#endif
#endif /* !ADC_SAMPLINGTIME */
#if defined(ADC_VER_V5_V90) && !defined(ADC3_SAMPLINGTIME)
-#define ADC3_SAMPLINGTIME ADC3_SAMPLETIME_24CYCLES_5;
+#define ADC3_SAMPLINGTIME ADC3_SAMPLETIME_24CYCLES_5
#endif
#if defined(ADC4_SAMPLETIME_19CYCLES_5) && !defined(ADC4_SAMPLINGTIME)
-#define ADC4_SAMPLINGTIME ADC4_SAMPLETIME_19CYCLES_5;
+#define ADC4_SAMPLINGTIME ADC4_SAMPLETIME_19CYCLES_5
#endif
/*
From 2370384f0765137244041e4fba3a358a9f1abf9e Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Fri, 14 Mar 2025 10:37:47 +0100
Subject: [PATCH 3/5] fix(openocd): update to xpack-openocd v0.12.0-6
https://github.com/xpack-dev-tools/openocd-xpack/releases/tag/v0.12.0-6
Fixes #2683.
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
platform.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platform.txt b/platform.txt
index 651928558f..faeddf45fa 100644
--- a/platform.txt
+++ b/platform.txt
@@ -17,7 +17,7 @@ busybox=
busybox.windows={runtime.tools.STM32Tools.path}/win/busybox.exe
toolchain_dir={runtime.tools.xpack-arm-none-eabi-gcc-14.2.1-1.1.path}
-openocd_dir={runtime.tools.xpack-openocd-0.12.0-5.path}
+openocd_dir={runtime.tools.xpack-openocd-0.12.0-6.path}
tools_bin_path.windows={runtime.tools.STM32Tools.path}/win
tools_bin_path.macosx={runtime.tools.STM32Tools.path}/macosx
From 91c4afe215fbd100d1e9e88eb2a6f3d75abf483e Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Fri, 14 Mar 2025 10:38:27 +0100
Subject: [PATCH 4/5] feat: STM32U0xx is no supported by openocd
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
boards.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/boards.txt b/boards.txt
index a7fafc3db2..9d8fb3b19e 100644
--- a/boards.txt
+++ b/boards.txt
@@ -12298,8 +12298,7 @@ GenU0.build.st_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSer
GenU0.build.flash_offset=0x0
GenU0.upload.maximum_size=0
GenU0.upload.maximum_data_size=0
-# Current openocd version does not support U0
-# GenU0.openocd.target=stm32u0x
+GenU0.openocd.target=stm32u0x
GenU0.vid.0=0x0483
GenU0.pid.0=0x5740
From 8e173d627a1cea8139bfb7ea85f8f0cf8ea8443f Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Fri, 14 Mar 2025 10:48:40 +0100
Subject: [PATCH 5/5] chore: bump release version to 2.10.1
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
README.md | 2 +-
libraries/SrcWrapper/inc/stm32_def.h | 6 +++---
platform.txt | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index e54c5aaf07..1353cefcb6 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
[](https://github.com/stm32duino/Arduino_Core_STM32/releases/latest)
-[](https://github.com/stm32duino/Arduino_Core_STM32/compare/2.10.0...main)
+[](https://github.com/stm32duino/Arduino_Core_STM32/compare/2.10.1...main)
* [Introduction](https://github.com/stm32duino/Arduino_Core_STM32#Introduction)<br>
diff --git a/libraries/SrcWrapper/inc/stm32_def.h b/libraries/SrcWrapper/inc/stm32_def.h
index 82c8591178..920babfadd 100644
--- a/libraries/SrcWrapper/inc/stm32_def.h
+++ b/libraries/SrcWrapper/inc/stm32_def.h
@@ -6,15 +6,15 @@
* @brief STM32 core version number
*/
#define STM32_CORE_VERSION_MAJOR (0x02U) /*!< [31:24] major version */
-#define STM32_CORE_VERSION_MINOR (0x11U) /*!< [23:16] minor version */
-#define STM32_CORE_VERSION_PATCH (0x00U) /*!< [15:8] patch version */
+#define STM32_CORE_VERSION_MINOR (0x10U) /*!< [23:16] minor version */
+#define STM32_CORE_VERSION_PATCH (0x01U) /*!< [15:8] patch version */
/*
* Extra label for development:
* 0: official release
* [1-9]: release candidate
* F[0-9]: development
*/
-#define STM32_CORE_VERSION_EXTRA (0xF0U) /*!< [7:0] extra version */
+#define STM32_CORE_VERSION_EXTRA (0x00U) /*!< [7:0] extra version */
#define STM32_CORE_VERSION ((STM32_CORE_VERSION_MAJOR << 24U)\
|(STM32_CORE_VERSION_MINOR << 16U)\
|(STM32_CORE_VERSION_PATCH << 8U )\
diff --git a/platform.txt b/platform.txt
index faeddf45fa..ac80a8ab7a 100644
--- a/platform.txt
+++ b/platform.txt
@@ -5,7 +5,7 @@
# https://arduino.github.io/arduino-cli/latest/platform-specification/
name=STM32 boards groups (Board to be selected from Tools submenu 'Board part number')
-version=2.11.0-dev
+version=2.10.1
# Define variables used multiple times in platform file