deleted some junk that's now better implemented inside core (HAL timebase)
This commit is contained in:
+1
-3
@@ -71,9 +71,7 @@ include_directories(
|
|||||||
User/framework
|
User/framework
|
||||||
User/platform
|
User/platform
|
||||||
User/tasks
|
User/tasks
|
||||||
User/units/neopixel
|
User/units
|
||||||
User/units/pin
|
|
||||||
User/units/system
|
|
||||||
Inc
|
Inc
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -48,7 +48,7 @@
|
|||||||
/* Exported functions ------------------------------------------------------- */
|
/* Exported functions ------------------------------------------------------- */
|
||||||
|
|
||||||
void SysTick_Handler(void);
|
void SysTick_Handler(void);
|
||||||
void TIM1_BRK_UP_TRG_COM_IRQHandler(void);
|
//void TIM1_BRK_UP_TRG_COM_IRQHandler(void);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|||||||
+22
-22
@@ -185,28 +185,28 @@ void SystemClock_Config(void)
|
|||||||
/* USER CODE BEGIN 4 */
|
/* USER CODE BEGIN 4 */
|
||||||
|
|
||||||
/* USER CODE END 4 */
|
/* USER CODE END 4 */
|
||||||
|
//
|
||||||
/**
|
///**
|
||||||
* @brief Period elapsed callback in non blocking mode
|
// * @brief Period elapsed callback in non blocking mode
|
||||||
* @note This function is called when TIM1 interrupt took place, inside
|
// * @note This function is called when TIM1 interrupt took place, inside
|
||||||
* HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment
|
// * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment
|
||||||
* a global variable "uwTick" used as application time base.
|
// * a global variable "uwTick" used as application time base.
|
||||||
* @param htim : TIM handle
|
// * @param htim : TIM handle
|
||||||
* @retval None
|
// * @retval None
|
||||||
*/
|
// */
|
||||||
void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
|
//void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
|
||||||
{
|
//{
|
||||||
/* USER CODE BEGIN Callback 0 */
|
///* USER CODE BEGIN Callback 0 */
|
||||||
|
//
|
||||||
/* USER CODE END Callback 0 */
|
///* USER CODE END Callback 0 */
|
||||||
if (htim->Instance == TIM1) {
|
// if (htim->Instance == TIM1) {
|
||||||
HAL_IncTick();
|
// HAL_IncTick();
|
||||||
}
|
// }
|
||||||
/* USER CODE BEGIN Callback 1 */
|
///* USER CODE BEGIN Callback 1 */
|
||||||
|
//
|
||||||
/* USER CODE END Callback 1 */
|
///* USER CODE END Callback 1 */
|
||||||
}
|
//}
|
||||||
|
//
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,158 +0,0 @@
|
|||||||
/**
|
|
||||||
******************************************************************************
|
|
||||||
* @file stm32f0xx_hal_timebase_TIM.c
|
|
||||||
* @brief HAL time base based on the hardware TIM.
|
|
||||||
******************************************************************************
|
|
||||||
* This notice applies to any and all portions of this file
|
|
||||||
* that are not between comment pairs USER CODE BEGIN and
|
|
||||||
* USER CODE END. Other portions of this file, whether
|
|
||||||
* inserted by the user or by software development tools
|
|
||||||
* are owned by their respective copyright owners.
|
|
||||||
*
|
|
||||||
* Copyright (c) 2017 STMicroelectronics International N.V.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted, provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistribution of source code must retain the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
* 3. Neither the name of STMicroelectronics nor the names of other
|
|
||||||
* contributors to this software may be used to endorse or promote products
|
|
||||||
* derived from this software without specific written permission.
|
|
||||||
* 4. This software, including modifications and/or derivative works of this
|
|
||||||
* software, must execute solely and exclusively on microcontroller or
|
|
||||||
* microprocessor devices manufactured by or for STMicroelectronics.
|
|
||||||
* 5. Redistribution and use of this software other than as permitted under
|
|
||||||
* this license is void and will automatically terminate your rights under
|
|
||||||
* this license.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS"
|
|
||||||
* AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
|
|
||||||
* PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY
|
|
||||||
* RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT
|
|
||||||
* SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
|
|
||||||
* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
|
|
||||||
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
******************************************************************************
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Includes ------------------------------------------------------------------*/
|
|
||||||
#include "stm32f0xx_hal.h"
|
|
||||||
#include "stm32f0xx_hal_tim.h"
|
|
||||||
/** @addtogroup STM32F7xx_HAL_Examples
|
|
||||||
* @{
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** @addtogroup HAL_TimeBase
|
|
||||||
* @{
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Private typedef -----------------------------------------------------------*/
|
|
||||||
/* Private define ------------------------------------------------------------*/
|
|
||||||
/* Private macro -------------------------------------------------------------*/
|
|
||||||
/* Private variables ---------------------------------------------------------*/
|
|
||||||
TIM_HandleTypeDef htim1;
|
|
||||||
uint32_t uwIncrementState = 0;
|
|
||||||
/* Private function prototypes -----------------------------------------------*/
|
|
||||||
/* Private functions ---------------------------------------------------------*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief This function configures the TIM1 as a time base source.
|
|
||||||
* The time source is configured to have 1ms time base with a dedicated
|
|
||||||
* Tick interrupt priority.
|
|
||||||
* @note This function is called automatically at the beginning of program after
|
|
||||||
* reset by HAL_Init() or at any time when clock is configured, by HAL_RCC_ClockConfig().
|
|
||||||
* @param TickPriority: Tick interrupt priorty.
|
|
||||||
* @retval HAL status
|
|
||||||
*/
|
|
||||||
HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
|
|
||||||
{
|
|
||||||
RCC_ClkInitTypeDef clkconfig;
|
|
||||||
uint32_t uwTimclock = 0;
|
|
||||||
uint32_t uwPrescalerValue = 0;
|
|
||||||
uint32_t pFLatency;
|
|
||||||
|
|
||||||
/*Configure the TIM1 IRQ priority */
|
|
||||||
HAL_NVIC_SetPriority(TIM1_BRK_UP_TRG_COM_IRQn, TickPriority ,0);
|
|
||||||
|
|
||||||
/* Enable the TIM1 global Interrupt */
|
|
||||||
HAL_NVIC_EnableIRQ(TIM1_BRK_UP_TRG_COM_IRQn);
|
|
||||||
|
|
||||||
/* Enable TIM1 clock */
|
|
||||||
__HAL_RCC_TIM1_CLK_ENABLE();
|
|
||||||
|
|
||||||
/* Get clock configuration */
|
|
||||||
HAL_RCC_GetClockConfig(&clkconfig, &pFLatency);
|
|
||||||
|
|
||||||
/* Compute TIM1 clock */
|
|
||||||
uwTimclock = HAL_RCC_GetPCLK1Freq();
|
|
||||||
|
|
||||||
/* Compute the prescaler value to have TIM1 counter clock equal to 1MHz */
|
|
||||||
uwPrescalerValue = (uint32_t) ((uwTimclock / 1000000) - 1);
|
|
||||||
|
|
||||||
/* Initialize TIM1 */
|
|
||||||
htim1.Instance = TIM1;
|
|
||||||
|
|
||||||
/* Initialize TIMx peripheral as follow:
|
|
||||||
+ Period = [(TIM1CLK/1000) - 1]. to have a (1/1000) s time base.
|
|
||||||
+ Prescaler = (uwTimclock/1000000 - 1) to have a 1MHz counter clock.
|
|
||||||
+ ClockDivision = 0
|
|
||||||
+ Counter direction = Up
|
|
||||||
*/
|
|
||||||
htim1.Init.Period = (1000000 / 1000) - 1;
|
|
||||||
htim1.Init.Prescaler = uwPrescalerValue;
|
|
||||||
htim1.Init.ClockDivision = 0;
|
|
||||||
htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
|
|
||||||
if(HAL_TIM_Base_Init(&htim1) == HAL_OK)
|
|
||||||
{
|
|
||||||
/* Start the TIM time Base generation in interrupt mode */
|
|
||||||
return HAL_TIM_Base_Start_IT(&htim1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Return function status */
|
|
||||||
return HAL_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Suspend Tick increment.
|
|
||||||
* @note Disable the tick increment by disabling TIM1 update interrupt.
|
|
||||||
* @param None
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void HAL_SuspendTick(void)
|
|
||||||
{
|
|
||||||
/* Disable TIM1 update Interrupt */
|
|
||||||
__HAL_TIM_DISABLE_IT(&htim1, TIM_IT_UPDATE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Resume Tick increment.
|
|
||||||
* @note Enable the tick increment by Enabling TIM1 update interrupt.
|
|
||||||
* @param None
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void HAL_ResumeTick(void)
|
|
||||||
{
|
|
||||||
/* Enable TIM1 Update interrupt */
|
|
||||||
__HAL_TIM_ENABLE_IT(&htim1, TIM_IT_UPDATE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @}
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @}
|
|
||||||
*/
|
|
||||||
|
|
||||||
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
|
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
/**
|
|
||||||
******************************************************************************
|
|
||||||
* @file stm32f0xx_it.c
|
|
||||||
* @brief Interrupt Service Routines.
|
|
||||||
******************************************************************************
|
|
||||||
*
|
|
||||||
* COPYRIGHT(c) 2017 STMicroelectronics
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without modification,
|
|
||||||
* are permitted provided that the following conditions are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
* 3. Neither the name of STMicroelectronics nor the names of its contributors
|
|
||||||
* may be used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
||||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
||||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
||||||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
||||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
||||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
******************************************************************************
|
|
||||||
*/
|
|
||||||
/* Includes ------------------------------------------------------------------*/
|
|
||||||
#include "stm32f0xx_hal.h"
|
|
||||||
#include "stm32f0xx.h"
|
|
||||||
#include "stm32f0xx_it.h"
|
|
||||||
#include "cmsis_os.h"
|
|
||||||
|
|
||||||
/* USER CODE BEGIN 0 */
|
|
||||||
#include "gex_hooks.h"
|
|
||||||
/* USER CODE END 0 */
|
|
||||||
|
|
||||||
/* External variables --------------------------------------------------------*/
|
|
||||||
|
|
||||||
extern TIM_HandleTypeDef htim1;
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
/* Cortex-M0 Processor Interruption and Exception Handlers */
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief This function handles System tick timer.
|
|
||||||
*/
|
|
||||||
void SysTick_Handler(void)
|
|
||||||
{
|
|
||||||
/* USER CODE BEGIN SysTick_IRQn 0 */
|
|
||||||
|
|
||||||
GEX_MsTick();
|
|
||||||
/* USER CODE END SysTick_IRQn 0 */
|
|
||||||
osSystickHandler();
|
|
||||||
/* USER CODE BEGIN SysTick_IRQn 1 */
|
|
||||||
|
|
||||||
/* USER CODE END SysTick_IRQn 1 */
|
|
||||||
}
|
|
||||||
|
|
||||||
/******************************************************************************/
|
|
||||||
/* STM32F0xx Peripheral Interrupt Handlers */
|
|
||||||
/* Add here the Interrupt Handlers for the used peripherals. */
|
|
||||||
/* For the available peripheral interrupt handler names, */
|
|
||||||
/* please refer to the startup file (startup_stm32f0xx.s). */
|
|
||||||
/******************************************************************************/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief This function handles TIM1 break, update, trigger and commutation interrupts.
|
|
||||||
*/
|
|
||||||
void TIM1_BRK_UP_TRG_COM_IRQHandler(void)
|
|
||||||
{
|
|
||||||
/* USER CODE BEGIN TIM1_BRK_UP_TRG_COM_IRQn 0 */
|
|
||||||
|
|
||||||
/* USER CODE END TIM1_BRK_UP_TRG_COM_IRQn 0 */
|
|
||||||
HAL_TIM_IRQHandler(&htim1);
|
|
||||||
/* USER CODE BEGIN TIM1_BRK_UP_TRG_COM_IRQn 1 */
|
|
||||||
|
|
||||||
/* USER CODE END TIM1_BRK_UP_TRG_COM_IRQn 1 */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* USER CODE BEGIN 1 */
|
|
||||||
|
|
||||||
/* USER CODE END 1 */
|
|
||||||
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
|
|
||||||
+1
-1
Submodule User updated: 7df577f9b1...94e87c74d3
Reference in New Issue
Block a user