Skip to content

Commit

Permalink
Upgrade CubeMX and STM32 Framework
Browse files Browse the repository at this point in the history
  • Loading branch information
gdepuille committed Sep 5, 2024
1 parent f5a5dbc commit 16d4230
Show file tree
Hide file tree
Showing 28 changed files with 711 additions and 110 deletions.
2 changes: 1 addition & 1 deletion .mxproject

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Core/Src/stm32g4xx_hal_msp.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

/* USER CODE BEGIN Header */
/**
******************************************************************************
Expand Down
2 changes: 0 additions & 2 deletions Core/Src/stm32g4xx_hal_timebase_tim.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,8 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)

/* Enable TIM4 clock */
__HAL_RCC_TIM4_CLK_ENABLE();

/* Get clock configuration */
HAL_RCC_GetClockConfig(&clkconfig, &pFLatency);

/* Compute TIM4 clock */
uwTimclock = HAL_RCC_GetPCLK1Freq();

Expand Down
14 changes: 9 additions & 5 deletions Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g4xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* is using in the C source code, usually in main.c. This file contains:
* - Configuration section that allows to select:
* - The STM32G4xx device used in the target application
* - To use or not the peripherals drivers in application code(i.e.
* code will be based on direct access to peripherals registers
* - To use or not the peripherals drivers in application code(i.e.
* code will be based on direct access to peripherals registers
* rather than drivers API), this option is controlled by
* "#define USE_HAL_DRIVER"
*
Expand Down Expand Up @@ -58,7 +58,9 @@

#if !defined (STM32G431xx) && !defined (STM32G441xx) && !defined (STM32G471xx) && \
!defined (STM32G473xx) && !defined (STM32G474xx) && !defined (STM32G484xx) && \
!defined (STM32GBK1CB) && !defined (STM32G491xx) && !defined (STM32G4A1xx)
!defined (STM32GBK1CB) && !defined (STM32G491xx) && !defined (STM32G4A1xx) && \
!defined (STM32G414xx)
/* #define STM32G414xx */ /*!< STM32G414xx Devices */
/* #define STM32G431xx */ /*!< STM32G431xx Devices */
/* #define STM32G441xx */ /*!< STM32G441xx Devices */
/* #define STM32G471xx */ /*!< STM32G471xx Devices */
Expand All @@ -84,11 +86,11 @@
#endif /* USE_HAL_DRIVER */

/**
* @brief CMSIS Device version number V1.2.3
* @brief CMSIS Device version number V1.2.4
*/
#define __STM32G4_CMSIS_VERSION_MAIN (0x01U) /*!< [31:24] main version */
#define __STM32G4_CMSIS_VERSION_SUB1 (0x02U) /*!< [23:16] sub1 version */
#define __STM32G4_CMSIS_VERSION_SUB2 (0x03U) /*!< [15:8] sub2 version */
#define __STM32G4_CMSIS_VERSION_SUB2 (0x04U) /*!< [15:8] sub2 version */
#define __STM32G4_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
#define __STM32G4_CMSIS_VERSION ((__STM32G4_CMSIS_VERSION_MAIN << 24)\
|(__STM32G4_CMSIS_VERSION_SUB1 << 16)\
Expand Down Expand Up @@ -123,6 +125,8 @@
#include "stm32g4a1xx.h"
#elif defined(STM32GBK1CB)
#include "stm32gbk1cb.h"
#elif defined(STM32G414xx)
#include "stm32g414xx.h"
#else
#error "Please select first the target STM32G4xx device used in your application (in stm32g4xx.h file)"
#endif
Expand Down
Loading

0 comments on commit 16d4230

Please sign in to comment.