Skip to content

Commit 47b19eb

Browse files
authored
Merge pull request #14548 from JeanMarcR/STM32F4_NEW_CUBE
STM32F4 update drivers version to CUBE V1.26.1
2 parents 4eff89c + 5f279ef commit 47b19eb

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

targets/TARGET_STM/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ This table summarizes the STM32Cube versions currently used in Mbed OS master br
6565
| F1 | 1.8.3 | https://github.com/STMicroelectronics/STM32CubeF1 |
6666
| F2 | 1.6.0 | https://github.com/STMicroelectronics/STM32CubeF2 |
6767
| F3 | 1.11.2 | https://github.com/STMicroelectronics/STM32CubeF3 |
68-
| F4 | 1.26.0 | https://github.com/STMicroelectronics/STM32CubeF4 |
68+
| F4 | 1.26.1 | https://github.com/STMicroelectronics/STM32CubeF4 |
6969
| F7 | 1.16.0 | https://github.com/STMicroelectronics/STM32CubeF7 |
7070
| G0 | 1.4.1 | https://github.com/STMicroelectronics/STM32CubeG0 |
7171
| G4 | 1.1.0 | https://github.com/STMicroelectronics/STM32CubeG4 |

targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/stm32f4xx_hal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
* @{
5151
*/
5252
/**
53-
* @brief STM32F4xx HAL Driver version number V1.7.11
53+
* @brief STM32F4xx HAL Driver version number V1.7.12
5454
*/
5555
#define __STM32F4xx_HAL_VERSION_MAIN (0x01U) /*!< [31:24] main version */
5656
#define __STM32F4xx_HAL_VERSION_SUB1 (0x07U) /*!< [23:16] sub1 version */
57-
#define __STM32F4xx_HAL_VERSION_SUB2 (0x0BU) /*!< [15:8] sub2 version */
57+
#define __STM32F4xx_HAL_VERSION_SUB2 (0x0CU) /*!< [15:8] sub2 version */
5858
#define __STM32F4xx_HAL_VERSION_RC (0x00U) /*!< [7:0] release candidate */
5959
#define __STM32F4xx_HAL_VERSION ((__STM32F4xx_HAL_VERSION_MAIN << 24U)\
6060
|(__STM32F4xx_HAL_VERSION_SUB1 << 16U)\

targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/stm32f4xx_hal_usart.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2557,7 +2557,7 @@ static HAL_StatusTypeDef USART_Receive_IT(USART_HandleTypeDef *husart)
25572557
pdata8bits = (uint8_t *) husart->pRxBuffPtr;
25582558
pdata16bits = NULL;
25592559

2560-
if ((husart->Init.WordLength == UART_WORDLENGTH_9B) || ((husart->Init.WordLength == UART_WORDLENGTH_8B) && (husart->Init.Parity == UART_PARITY_NONE)))
2560+
if ((husart->Init.WordLength == USART_WORDLENGTH_9B) || ((husart->Init.WordLength == USART_WORDLENGTH_8B) && (husart->Init.Parity == USART_PARITY_NONE)))
25612561
{
25622562
*pdata8bits = (uint8_t)(husart->Instance->DR & (uint8_t)0x00FF);
25632563
}
@@ -2662,7 +2662,7 @@ static HAL_StatusTypeDef USART_TransmitReceive_IT(USART_HandleTypeDef *husart)
26622662
{
26632663
pdata8bits = (uint8_t *) husart->pRxBuffPtr;
26642664
pdata16bits = NULL;
2665-
if ((husart->Init.WordLength == UART_WORDLENGTH_9B) || ((husart->Init.WordLength == UART_WORDLENGTH_8B) && (husart->Init.Parity == UART_PARITY_NONE)))
2665+
if ((husart->Init.WordLength == USART_WORDLENGTH_9B) || ((husart->Init.WordLength == USART_WORDLENGTH_8B) && (husart->Init.Parity == USART_PARITY_NONE)))
26662666
{
26672667
*pdata8bits = (uint8_t)(husart->Instance->DR & (uint8_t)0x00FF);
26682668
}

targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/system_stm32f4xx.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,7 @@
104104
#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field.
105105
This value must be a multiple of 0x200. */
106106
#else
107-
#include "nvic_addr.h" // MBED
108-
SCB->VTOR = NVIC_FLASH_VECTOR_ADDRESS; // MBED
109-
This value must be a multiple of 0x200. */
107+
110108
#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field.
111109
This value must be a multiple of 0x200. */
112110
#endif /* VECT_TAB_SRAM */
@@ -166,8 +164,11 @@ const uint8_t APBPrescTable[8] = {0, 0, 0, 0, 1, 2, 3, 4};
166164
* @param None
167165
* @retval None
168166
*/
169-
void SystemInit(void)
167+
__weak void SystemInit(void)
170168
{
169+
#include "nvic_addr.h" // MBED
170+
SCB->VTOR = NVIC_FLASH_VECTOR_ADDRESS; // MBED
171+
171172
/* FPU settings ------------------------------------------------------------*/
172173
#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
173174
SCB->CPACR |= ((3UL << 10*2)|(3UL << 11*2)); /* set CP10 and CP11 Full Access */

0 commit comments

Comments
 (0)