Skip to content

HardwareTimer liberation #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Moddingear wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

HardwareTimer liberation #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3da846b
Add functions missing in timerutils for when HardwareTimer library is…
Moddingear Jun 13, 2026
daa5aba
timerutils: improve enableTimerClock and constexpr getTimerClkSrc
Moddingear Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 125 additions & 0 deletions src/drivers/hardware_specific/stm32/stm32_timerutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,131 @@

#if defined(_STM32_DEF_) || defined(TARGET_STM32H7) // if stm32duino or portenta

#if defined(HAL_TIM_MODULE_ONLY)

//Functions copied over and modified from HardwareTimer to allow disabling HardwareTimer

void enableTimerClock(TIM_HandleTypeDef *htim)
{
switch ((uintptr_t)htim->Instance)
{
#if defined(TIM1_BASE)
case TIM1_BASE:
__HAL_RCC_TIM1_CLK_ENABLE();
return;
#endif
#if defined(TIM2_BASE)
case TIM2_BASE:
__HAL_RCC_TIM2_CLK_ENABLE();
return;
#endif
#if defined(TIM3_BASE)
case TIM3_BASE:
__HAL_RCC_TIM3_CLK_ENABLE();
return;
#endif
#if defined(TIM4_BASE)
case TIM4_BASE:
__HAL_RCC_TIM4_CLK_ENABLE();
return;
#endif
#if defined(TIM5_BASE)
case TIM5_BASE:
__HAL_RCC_TIM5_CLK_ENABLE();
return;
#endif
#if defined(TIM6_BASE)
case TIM6_BASE:
__HAL_RCC_TIM6_CLK_ENABLE();
return;
#endif
#if defined(TIM7_BASE)
case TIM7_BASE:
__HAL_RCC_TIM7_CLK_ENABLE();
return;
#endif
#if defined(TIM8_BASE)
case TIM8_BASE:
__HAL_RCC_TIM8_CLK_ENABLE();
return;
#endif
#if defined(TIM9_BASE)
case TIM9_BASE:
__HAL_RCC_TIM9_CLK_ENABLE();
return;
#endif
#if defined(TIM10_BASE)
case TIM10_BASE:
__HAL_RCC_TIM10_CLK_ENABLE();
return;
#endif
#if defined(TIM11_BASE)
case TIM11_BASE:
__HAL_RCC_TIM11_CLK_ENABLE();
return;
#endif
#if defined(TIM12_BASE)
case TIM12_BASE:
__HAL_RCC_TIM12_CLK_ENABLE();
return;
#endif
#if defined(TIM13_BASE)
case TIM13_BASE:
__HAL_RCC_TIM13_CLK_ENABLE();
return;
#endif
#if defined(TIM14_BASE)
case TIM14_BASE:
__HAL_RCC_TIM14_CLK_ENABLE();
return;
#endif
#if defined(TIM15_BASE)
case TIM15_BASE:
__HAL_RCC_TIM15_CLK_ENABLE();
return;
#endif
#if defined(TIM16_BASE)
case TIM16_BASE:
__HAL_RCC_TIM16_CLK_ENABLE();
return;
#endif
#if defined(TIM17_BASE)
case TIM17_BASE:
__HAL_RCC_TIM17_CLK_ENABLE();
return;
#endif
#if defined(TIM18_BASE)
case TIM18_BASE:
__HAL_RCC_TIM18_CLK_ENABLE();
return;
#endif
#if defined(TIM19_BASE)
case TIM19_BASE:
__HAL_RCC_TIM19_CLK_ENABLE();
return;
#endif
#if defined(TIM20_BASE)
case TIM20_BASE:
__HAL_RCC_TIM20_CLK_ENABLE();
return;
#endif
#if defined(TIM21_BASE)
case TIM21_BASE:
__HAL_RCC_TIM21_CLK_ENABLE();
return;
#endif
#if defined(TIM22_BASE)
case TIM22_BASE:
__HAL_RCC_TIM22_CLK_ENABLE();
return;
#endif

default:
break;
}
}

#endif

void stm32_pauseTimer(TIM_HandleTypeDef* handle){
/* Disable timer unconditionally. Required to guarantee timer is stopped,
Expand Down
97 changes: 97 additions & 0 deletions src/drivers/hardware_specific/stm32/stm32_timerutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,103 @@

#if defined(_STM32_DEF_) || defined(TARGET_STM32H7)

#include "stm32_def.h"

#if defined(HAL_TIM_MODULE_ONLY)
void enableTimerClock(TIM_HandleTypeDef *htim);

constexpr uint8_t getTimerClkSrc(TIM_TypeDef *tim)
{
uint8_t clkSrc = 0;

if (tim != (TIM_TypeDef *)NC)
#if defined(STM32C0xx) || defined(STM32F0xx) || defined(STM32G0xx)
/* TIMx source CLK is PCKL1 */
clkSrc = 1;
#else
{
/* Get source clock depending on TIM instance */
switch ((uintptr_t)tim) {
#if defined(TIM2_BASE)
case TIM2_BASE:
#endif
#if defined(TIM3_BASE)
case TIM3_BASE:
#endif
#if defined(TIM4_BASE)
case TIM4_BASE:
#endif
#if defined(TIM5_BASE)
case TIM5_BASE:
#endif
#if defined(TIM6_BASE)
case TIM6_BASE:
#endif
#if defined(TIM7_BASE)
case TIM7_BASE:
#endif
#if defined(TIM12_BASE)
case TIM12_BASE:
#endif
#if defined(TIM13_BASE)
case TIM13_BASE:
#endif
#if defined(TIM14_BASE)
case TIM14_BASE:
#endif
#if defined(TIM18_BASE)
case TIM18_BASE:
#endif
clkSrc = 1;
break;
#if defined(TIM1_BASE)
case TIM1_BASE:
#endif
#if defined(TIM8_BASE)
case TIM8_BASE:
#endif
#if defined(TIM9_BASE)
case TIM9_BASE:
#endif
#if defined(TIM10_BASE)
case TIM10_BASE:
#endif
#if defined(TIM11_BASE)
case TIM11_BASE:
#endif
#if defined(TIM15_BASE)
case TIM15_BASE:
#endif
#if defined(TIM16_BASE)
case TIM16_BASE:
#endif
#if defined(TIM17_BASE)
case TIM17_BASE:
#endif
#if defined(TIM19_BASE)
case TIM19_BASE:
#endif
#if defined(TIM20_BASE)
case TIM20_BASE:
#endif
#if defined(TIM21_BASE)
case TIM21_BASE:
#endif
#if defined(TIM22_BASE)
case TIM22_BASE:
#endif
clkSrc = 2;
break;
default:
_Error_Handler("TIM: Unknown timer instance", (int)tim);
break;
}
}
#endif
return clkSrc;
}
#endif

void stm32_pauseTimer(TIM_HandleTypeDef* handle);
void stm32_resumeTimer(TIM_HandleTypeDef* handle);
void stm32_refreshTimer(TIM_HandleTypeDef* handle);
Expand Down
Loading