ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace HAL_GetTick

pull/7228/head
bcostm 2018-05-25 15:54:22 +02:00 committed by adbridge
parent b80471a005
commit f3ea877f3a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/TARGET_STM/hal_tick_16b.c
View File

@ -57,8 +57,6 @@ void timer_oc_irq_handler(void)
__HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC2); __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC2);
uint32_t val = __HAL_TIM_GET_COUNTER(&TimMasterHandle); uint32_t val = __HAL_TIM_GET_COUNTER(&TimMasterHandle);
if ((val - PreviousVal) >= HAL_TICK_DELAY) { if ((val - PreviousVal) >= HAL_TICK_DELAY) {
// Increment HAL variable
HAL_IncTick();
// Prepare next interrupt // Prepare next interrupt
__HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_2, val + HAL_TICK_DELAY); __HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_2, val + HAL_TICK_DELAY);
PreviousVal = val; PreviousVal = val;

4
targets/TARGET_STM/hal_tick_32b.c
View File

@ -22,8 +22,6 @@
extern TIM_HandleTypeDef TimMasterHandle; extern TIM_HandleTypeDef TimMasterHandle;
extern void HAL_IncTick(void);
volatile uint32_t PreviousVal = 0; volatile uint32_t PreviousVal = 0;
void us_ticker_irq_handler(void); void us_ticker_irq_handler(void);
@ -44,8 +42,6 @@ void timer_irq_handler(void)
__HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC2); __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC2);
uint32_t val = __HAL_TIM_GET_COUNTER(&TimMasterHandle); uint32_t val = __HAL_TIM_GET_COUNTER(&TimMasterHandle);
if ((val - PreviousVal) >= HAL_TICK_DELAY) { if ((val - PreviousVal) >= HAL_TICK_DELAY) {
// Increment HAL variable
HAL_IncTick();
// Prepare next interrupt // Prepare next interrupt
__HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_2, val + HAL_TICK_DELAY); __HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_2, val + HAL_TICK_DELAY);
PreviousVal = val; PreviousVal = val;

7
targets/TARGET_STM/stm_common.c Normal file
View File

@ -0,0 +1,7 @@
#include "hal/us_ticker_api.h"
// Overwrite default HAL function
uint32_t HAL_GetTick()
{
return ticker_read_us(get_us_ticker_data()) / 1000;
}