Skip to content

fix(hardwaretimer): timer channel N HALv2 support #3022

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

Merged
fpistm merged 1 commit into from
Jul 15, 2026
+53 −19
Merged

fix(hardwaretimer): timer channel N HALv2 support #3022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion libraries/SrcWrapper/inc/HardwareTimer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class HardwareTimer {
// The following function(s) are available for more advanced timer options
#if defined(USE_HALV2_DRIVER)
hal_tim_handle_t *getHandle(); // return the handle address for HAL related configuration
hal_tim_channel_t getChannel(uint32_t channel);
hal_tim_channel_t getChannel(uint32_t channel, bool complementary = false);
#else
TIM_HandleTypeDef *getHandle(); // return the handle address for HAL related configuration
uint32_t getChannel(uint32_t channel);
Expand Down
41 changes: 29 additions & 12 deletions libraries/SrcWrapper/src/HardwareTimer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,22 +291,38 @@ void HardwareTimer::resume(void)
* @retval HAL channel. Error handler called if arduino channel is invalid
*/
#if defined(USE_HALV2_DRIVER)
hal_tim_channel_t HardwareTimer::getChannel(uint32_t channel)
hal_tim_channel_t HardwareTimer::getChannel(uint32_t channel, bool complementary)
{
hal_tim_channel_t timChannel = HAL_TIM_CHANNEL_1;

switch (channel) {
case 1:
timChannel = HAL_TIM_CHANNEL_1;
if (complementary) {
timChannel = HAL_TIM_CHANNEL_1N;
} else {
timChannel = HAL_TIM_CHANNEL_1;
}
break;
case 2:
timChannel = HAL_TIM_CHANNEL_2;
if (complementary) {
timChannel = HAL_TIM_CHANNEL_2N;
} else {
timChannel = HAL_TIM_CHANNEL_2;
}
break;
case 3:
timChannel = HAL_TIM_CHANNEL_3;
if (complementary) {
timChannel = HAL_TIM_CHANNEL_3N;
} else {
timChannel = HAL_TIM_CHANNEL_3;
}
break;
case 4:
timChannel = HAL_TIM_CHANNEL_4;
if (complementary) {
timChannel = HAL_TIM_CHANNEL_4N;
} else {
timChannel = HAL_TIM_CHANNEL_4;
}
break;
default:
Error_Handler();
Expand Down Expand Up @@ -507,6 +523,7 @@ void HardwareTimer::resumeChannel(uint32_t channel)
{
#if defined(USE_HALV2_DRIVER)
hal_tim_channel_t timChannel = getChannel(channel);
hal_tim_channel_t timChannelN = getChannel(channel, true);
#else
uint32_t timChannel = getChannel(channel);
#endif
Expand All @@ -523,7 +540,7 @@ void HardwareTimer::resumeChannel(uint32_t channel)
#if defined(TIM_CCER_CC1NE)
if (__ChannelsUsed[channel - 1] & COMPLEMENTARY_CHAN_MASK) {
#if defined(USE_HALV2_DRIVER)
HAL_TIM_OC_StartChannel(&_timerObj.handle, timChannel);
HAL_TIM_OC_StartChannel(&_timerObj.handle, timChannelN);
HAL_TIM_Start(&_timerObj.handle);
#else
HAL_TIMEx_PWMN_Start(&(_timerObj.handle), timChannel);
Expand All @@ -548,7 +565,7 @@ void HardwareTimer::resumeChannel(uint32_t channel)
#if defined(TIM_CCER_CC1NE)
if (__ChannelsUsed[channel - 1] & COMPLEMENTARY_CHAN_MASK) {
#if defined(USE_HALV2_DRIVER)
HAL_TIM_OC_StartChannel(&_timerObj.handle, timChannel);
HAL_TIM_OC_StartChannel(&_timerObj.handle, timChannelN);
HAL_TIM_Start(&_timerObj.handle);
#else
HAL_TIMEx_OCN_Start(&(_timerObj.handle), timChannel);
Expand Down Expand Up @@ -789,9 +806,9 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, pin_size_t pin,
void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin, ChannelInputFilter_t filter)
{
uint32_t timAssociatedInputChannel;

bool inverted = (pin != NC) ? STM_PIN_INVERTED(pinmap_function(pin, PinMap_TIM)) : false;
#if defined(USE_HALV2_DRIVER)
hal_tim_channel_t timChannel = getChannel(channel);
hal_tim_channel_t timChannel = (inverted) ? getChannel(channel, true) : getChannel(channel, false);
hal_tim_oc_compare_unit_t oc_compare_unit = hal_tim_oc_channel_to_compare_unit(timChannel);
hal_tim_oc_compare_unit_config_t oc_cu_config;
hal_tim_oc_channel_config_t oc_channel_config;
Expand Down Expand Up @@ -886,7 +903,7 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin, Ch
break;
case TIMER_INPUT_FREQ_DUTY_MEASUREMENT:
// Check if regular channel
if (STM_PIN_INVERTED(pinmap_function(pin, PinMap_TIM))) {
if (inverted) {
Error_Handler();
}
// Configure 1st channel
Expand Down Expand Up @@ -995,7 +1012,7 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin, Ch
break;
case TIMER_INPUT_FREQ_DUTY_MEASUREMENT:
// Check if regular channel
if (STM_PIN_INVERTED(pinmap_function(pin, PinMap_TIM))) {
if (inverted) {
Error_Handler();
}
// Configure 1st channel
Expand Down Expand Up @@ -1034,7 +1051,7 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin, Ch
Error_Handler();
}

__ChannelsUsed[channel - 1] |= (STM_PIN_INVERTED(pinmap_function(pin, PinMap_TIM))) ? COMPLEMENTARY_CHAN_MASK : REGULAR_CHAN_MASK;
__ChannelsUsed[channel - 1] |= (inverted) ? COMPLEMENTARY_CHAN_MASK : REGULAR_CHAN_MASK;
}
}
}
Expand Down
29 changes: 23 additions & 6 deletions libraries/SrcWrapper/src/stm32/timer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ timerObj_t *get_timer_obj(TIM_HandleTypeDef *htim)
return (obj);
}

#if defined(USE_HALV2_DRIVER)
#else
#if !defined(USE_HALV2_DRIVER)
/**
* @brief TIMER Initialization - clock init and nvic init
* @param htim_base: TIM handle
Expand Down Expand Up @@ -830,18 +829,36 @@ hal_tim_channel_t getTimerChannel(PinName pin)
{
uint32_t function = pinmap_function(pin, PinMap_TIM);
hal_tim_channel_t channel = -1;
bool inverted = STM_PIN_INVERTED(function);

switch (STM_PIN_CHANNEL(function)) {
case 1:
channel = HAL_TIM_CHANNEL_1;
if (inverted) {
channel = HAL_TIM_CHANNEL_1N;
} else {
channel = HAL_TIM_CHANNEL_1;
}
break;
case 2:
channel = HAL_TIM_CHANNEL_2;
if (inverted) {
channel = HAL_TIM_CHANNEL_2N;
} else {
channel = HAL_TIM_CHANNEL_2;
}
break;
case 3:
channel = HAL_TIM_CHANNEL_3;
if (inverted) {
channel = HAL_TIM_CHANNEL_3N;
} else {
channel = HAL_TIM_CHANNEL_3;
}
break;
case 4:
channel = HAL_TIM_CHANNEL_4;
if (inverted) {
channel = HAL_TIM_CHANNEL_4N;
} else {
channel = HAL_TIM_CHANNEL_4;
}
break;
default:
_Error_Handler("TIM: Unknown timer channel", (int)(STM_PIN_CHANNEL(function)));
Expand Down
Loading