diff --git a/README.md b/README.md index e54c5aaf07..1353cefcb6 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![GitHub release](https://img.shields.io/github/release/stm32duino/Arduino_Core_STM32.svg)](https://github.com/stm32duino/Arduino_Core_STM32/releases/latest) ![GitHub All Releases](https://img.shields.io/github/downloads/stm32duino/Arduino_Core_STM32/total.svg?label=downloads%20since%201.4.0) -[![GitHub commits since latest release](https://img.shields.io/github/commits-since/stm32duino/Arduino_Core_STM32/latest/main)](https://github.com/stm32duino/Arduino_Core_STM32/compare/2.10.0...main) +[![GitHub commits since latest release](https://img.shields.io/github/commits-since/stm32duino/Arduino_Core_STM32/latest/main)](https://github.com/stm32duino/Arduino_Core_STM32/compare/2.10.1...main) * [Introduction](https://github.com/stm32duino/Arduino_Core_STM32#Introduction)
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 diff --git a/libraries/SrcWrapper/inc/stm32_def.h b/libraries/SrcWrapper/inc/stm32_def.h index 2b8abb395e..920babfadd 100644 --- a/libraries/SrcWrapper/inc/stm32_def.h +++ b/libraries/SrcWrapper/inc/stm32_def.h @@ -7,7 +7,7 @@ */ #define STM32_CORE_VERSION_MAJOR (0x02U) /*!< [31:24] major version */ #define STM32_CORE_VERSION_MINOR (0x10U) /*!< [23:16] minor version */ -#define STM32_CORE_VERSION_PATCH (0x00U) /*!< [15:8] patch version */ +#define STM32_CORE_VERSION_PATCH (0x01U) /*!< [15:8] patch version */ /* * Extra label for development: * 0: official release 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 /* diff --git a/platform.txt b/platform.txt index eff47d4751..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.10.0 +version=2.10.1 # Define variables used multiple times in platform file @@ -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