Review system Timer config

Set TICK_INT_PRIORITY to 0 (Highest priority) by default, it can be redefined. Time base configuration function (HAL_InitTick ()) is called automatically at the beginning of the program after reset by HAL_Init() or at any time when clock is configured, by HAL_RCC_ClockConfig(). The HAL_SYSTICK_Config()function calls the SysTick_Config() function which is a CMSIS function that: Configures the SysTick Reload register with value passed as function parameter. Configures the SysTick IRQ priority to the TICK_INT_PRIORITY. Resets the SysTick Counter register. Configures the SysTick Counter clock source to be Core Clock Source (HCLK). Enables the SysTick Interrupt. Starts the SysTick Counter. So, SystemClock_Config() (variant.cpp) does not need to be set explicitly. Signed-off-by: Frederic.Pillon <[email protected]>
fpistm · May 17, 2019 · 9f757b4 · 9f757b4
1 parent 6159139
commit 9f757b4
Show file tree

Hide file tree

Showing 62 changed files with 12 additions and 423 deletions.
diff --git a/system/STM32F0xx/stm32f0xx_hal_conf_default.h b/system/STM32F0xx/stm32f0xx_hal_conf_default.h
@@ -167,7 +167,7 @@ in voltage and temperature.  */
   */
 #define  VDD_VALUE                    3300U  /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            ((uint32_t)(1U<<__NVIC_PRIO_BITS) - 1U) /*!< tick interrupt priority (lowest by default)             */
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0U

diff --git a/system/STM32F1xx/stm32f1xx_hal_conf_default.h b/system/STM32F1xx/stm32f1xx_hal_conf_default.h
@@ -144,7 +144,7 @@ extern "C" {
   */
 #define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            0x0FU /*!< tick interrupt priority */
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0U

diff --git a/system/STM32F2xx/stm32f2xx_hal_conf_default.h b/system/STM32F2xx/stm32f2xx_hal_conf_default.h
@@ -150,7 +150,7 @@ in voltage and temperature.*/
   */
 #define  VDD_VALUE                      3300U /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY              0x0FU /*!< tick interrupt priority */
+#define  TICK_INT_PRIORITY              0x00U /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0U

diff --git a/system/STM32F3xx/stm32f3xx_hal_conf_default.h b/system/STM32F3xx/stm32f3xx_hal_conf_default.h
@@ -167,7 +167,7 @@ in voltage and temperature.  */
   */
 #define  VDD_VALUE                    (3300U) /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            ((uint32_t)(1U<<__NVIC_PRIO_BITS) - 1U)   /*!< tick interrupt priority (lowest by default) */
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0U

diff --git a/system/STM32F4xx/stm32f4xx_hal_conf_default.h b/system/STM32F4xx/stm32f4xx_hal_conf_default.h
@@ -148,7 +148,7 @@ in voltage and temperature. */
   */
 #define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            0x0FU /*!< tick interrupt priority */
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0U

diff --git a/system/STM32F7xx/stm32f7xx_hal_conf_default.h b/system/STM32F7xx/stm32f7xx_hal_conf_default.h
@@ -148,7 +148,7 @@ in voltage and temperature.  */
   */
 #define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            0x0FU /*!< tick interrupt priority */
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0U

diff --git a/system/STM32G0xx/stm32g0xx_hal_conf_default.h b/system/STM32G0xx/stm32g0xx_hal_conf_default.h
@@ -150,7 +150,7 @@ in voltage and temperature.*/
   */
 #define  VDD_VALUE                    (3300UL) /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            ((1UL<<__NVIC_PRIO_BITS) - 1UL) /*!< tick interrupt priority */
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0U

diff --git a/system/STM32H7xx/stm32h7xx_hal_conf_default.h b/system/STM32H7xx/stm32h7xx_hal_conf_default.h
@@ -161,7 +161,7 @@ in voltage and temperature.*/
   */
 #define  VDD_VALUE                    ((uint32_t)3300) /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            ((uint32_t)0x0F) /*!< tick interrupt priority */
+#define  TICK_INT_PRIORITY            ((uint32_t)0x00) /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0

diff --git a/system/STM32L0xx/stm32l0xx_hal_conf_default.h b/system/STM32L0xx/stm32l0xx_hal_conf_default.h
@@ -141,7 +141,7 @@ in voltage and temperature.*/
   */
 #define  VDD_VALUE                    ((uint32_t)3300U) /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            (((uint32_t)1U<<__NVIC_PRIO_BITS) - 1U)    /*!< tick interrupt priority */
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0U

diff --git a/system/STM32L1xx/stm32l1xx_hal_conf_default.h b/system/STM32L1xx/stm32l1xx_hal_conf_default.h
@@ -131,7 +131,7 @@ in voltage and temperature.*/
   */
 #define  VDD_VALUE                    (3300U) /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            (0x000FU)    /*!< tick interrupt priority */
+#define  TICK_INT_PRIORITY            (0x0000U)    /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0U

diff --git a/system/STM32L4xx/stm32l4xx_hal_conf_default.h b/system/STM32L4xx/stm32l4xx_hal_conf_default.h
@@ -179,7 +179,7 @@ in voltage and temperature.*/
   */
 #define  VDD_VALUE                    3300U /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            0x0FU /*!< tick interrupt priority */
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0U

diff --git a/system/STM32WBxx/stm32wbxx_hal_conf_default.h b/system/STM32WBxx/stm32wbxx_hal_conf_default.h
@@ -180,7 +180,7 @@ in voltage and temperature.*/
   */
 #define  VDD_VALUE                    (3300UL) /*!< Value of VDD in mv */
 #if !defined (TICK_INT_PRIORITY)
-#define  TICK_INT_PRIORITY            ((1UL<<__NVIC_PRIO_BITS) - 1UL) /*!< tick interrupt priority (lowest by default) */
+#define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */
 #endif
 #if !defined (USE_RTOS)
 #define  USE_RTOS                     0

diff --git a/variants/ARMED_V1/variant.cpp b/variants/ARMED_V1/variant.cpp
@@ -178,12 +178,6 @@ WEAK void SystemClock_Config(void)
     /* Enable the Flash prefetch */
     __HAL_FLASH_PREFETCH_BUFFER_ENABLE();
   }
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/BLACK_F407XX/variant.cpp b/variants/BLACK_F407XX/variant.cpp
@@ -222,17 +222,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
     _Error_Handler(__FILE__, __LINE__);
   }
-
-  /**Configure the Systick interrupt time
-  */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /**Configure the Systick
-  */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/BLACK_F407XX/variant.h b/variants/BLACK_F407XX/variant.h
@@ -316,9 +316,6 @@ extern "C" {
 #define PIN_SERIAL_RX           PA10
 #define PIN_SERIAL_TX           PA9
 
-/* HAL configuration */
-#define TICK_INT_PRIORITY       0U
-
 /* Extra HAL modules */
 #define HAL_DAC_MODULE_ENABLED
 #define HAL_SD_MODULE_ENABLED

diff --git a/variants/BLUEPILL_F103XX/variant.cpp b/variants/BLUEPILL_F103XX/variant.cpp
@@ -138,15 +138,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
     while (1);
   }
-
-  /* Configure the Systick interrupt time */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /* Configure the Systick */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/BLUE_F407VE_Mini/variant.cpp b/variants/BLUE_F407VE_Mini/variant.cpp
@@ -202,17 +202,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
     _Error_Handler(__FILE__, __LINE__);
   }
-
-  /**Configure the Systick interrupt time
-  */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /**Configure the Systick
-  */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/BLUE_F407VE_Mini/variant.h b/variants/BLUE_F407VE_Mini/variant.h
@@ -193,7 +193,6 @@ extern "C" {
 
 /* HAL configuration */
 #define HSE_VALUE               25000000U
-#define TICK_INT_PRIORITY       0U
 
 /* Extra HAL modules */
 #define HAL_DAC_MODULE_ENABLED

diff --git a/variants/DEMO_F030F4/variant.cpp b/variants/DEMO_F030F4/variant.cpp
@@ -110,15 +110,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) {
     _Error_Handler(__FILE__, __LINE__);
   }
-
-  /* Configure the Systick interrupt time */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /* Configure the Systick */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/DISCO_F030R8/variant.cpp b/variants/DISCO_F030R8/variant.cpp
@@ -164,15 +164,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) {
     Error_Handler();
   }
-
-  /* Configure the Systick interrupt time */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /* Configure the Systick */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/DISCO_F072RB/variant.cpp b/variants/DISCO_F072RB/variant.cpp
@@ -160,15 +160,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
     Error_Handler();
   }
-
-  /* Configure the Systick interrupt time */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /* Configure the Systick */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/DISCO_F100RB/variant.cpp b/variants/DISCO_F100RB/variant.cpp
@@ -150,13 +150,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
     while (1);
   }
-
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/DISCO_F407VG/variant.cpp b/variants/DISCO_F407VG/variant.cpp
@@ -188,12 +188,6 @@ WEAK void SystemClock_Config(void)
     /* Enable the Flash prefetch */
     __HAL_FLASH_PREFETCH_BUFFER_ENABLE();
   }
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/DISCO_F746NG/variant.cpp b/variants/DISCO_F746NG/variant.cpp
@@ -138,15 +138,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
     _Error_Handler(__FILE__, __LINE__);
   }
-
-  /* Configure the Systick interrupt time */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /* Configure the Systick */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/DISCO_L072CZ_LRWAN1/variant.cpp b/variants/DISCO_L072CZ_LRWAN1/variant.cpp
@@ -120,13 +120,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
     Error_Handler();
   }
-
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/DISCO_L475VG_IOT/variant.cpp b/variants/DISCO_L475VG_IOT/variant.cpp
@@ -229,20 +229,9 @@ WEAK void SystemClock_Config(void)
     Error_Handler();
   }
 
-  /**Configure the Systick interrupt time
-  */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /**Configure the Systick
-  */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
   /**Enable MSI Auto calibration
   */
   HAL_RCCEx_EnableMSIPLLMode();
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/DIYMROE_F407VGT/variant.cpp b/variants/DIYMROE_F407VGT/variant.cpp
@@ -203,15 +203,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
     _Error_Handler(__FILE__, __LINE__);
   }
-
-  /* Configure the Systick interrupt time */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /* Configure the Systick */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/EEXTR_F030_V1/variant.cpp b/variants/EEXTR_F030_V1/variant.cpp
@@ -136,15 +136,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
     Error_Handler();
   }
-
-  /* Configure the Systick interrupt time */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /* Configure the Systick */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/FK407M1/variant.cpp b/variants/FK407M1/variant.cpp
@@ -150,15 +150,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_5) != HAL_OK) {
     _Error_Handler(__FILE__, __LINE__);
   }
-
-  /* Configure the Systick interrupt time */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /* Configure the Systick */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus

diff --git a/variants/FK407M1/variant.h b/variants/FK407M1/variant.h
@@ -165,10 +165,6 @@ extern "C" {
 #define PIN_SERIAL_RX           PA10
 #define PIN_SERIAL_TX           PA9
 
-
-/* HAL configuration */
-#define TICK_INT_PRIORITY       0U
-
 /* Extra HAL modules */
 #define HAL_DAC_MODULE_ENABLED
 

diff --git a/variants/HY_TinySTM103T/variant.cpp b/variants/HY_TinySTM103T/variant.cpp
@@ -143,15 +143,6 @@ WEAK void SystemClock_Config(void)
   if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
     while (1);
   }
-
-  /* Configure the Systick interrupt time */
-  HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq() / 1000);
-
-  /* Configure the Systick */
-  HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
-
-  /* SysTick_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
 }
 
 #ifdef __cplusplus