Skip to content

Commit 6adb7cd

Browse files
committed
feat(core): third step of ArduinoCore-API migration – SrcWrapper/HardwareTimer
Signed-off-by: Aymane Bahssain <aymane.bahssain@st.com>
1 parent eab8cd5 commit 6adb7cd

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

libraries/SrcWrapper/inc/HardwareTimer.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
/* Includes ------------------------------------------------------------------*/
3131
#include "timer.h"
3232
#include "stm32yyxx_ll_tim.h"
33+
#include "Arduino.h"
3334

3435
#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
3536

@@ -138,13 +139,13 @@ class HardwareTimer {
138139
uint32_t getOverflow(TimerFormat_t format = TICK_FORMAT); // return overflow depending on format provided
139140

140141
void setPWM(uint32_t channel, PinName pin, uint32_t frequency, uint32_t dutycycle, callback_function_t PeriodCallback = nullptr, callback_function_t CompareCallback = nullptr); // Set all in one command freq in HZ, Duty in percentage. Including both interrupt.
141-
void setPWM(uint32_t channel, uint32_t pin, uint32_t frequency, uint32_t dutycycle, callback_function_t PeriodCallback = nullptr, callback_function_t CompareCallback = nullptr);
142+
void setPWM(uint32_t channel, pin_size_t pin, uint32_t frequency, uint32_t dutycycle, callback_function_t PeriodCallback = nullptr, callback_function_t CompareCallback = nullptr);
142143

143144
void setCount(uint32_t val, TimerFormat_t format = TICK_FORMAT); // set timer counter to value 'val' depending on format provided
144145
uint32_t getCount(TimerFormat_t format = TICK_FORMAT); // return current counter value of timer depending on format provided
145146

146147
void setMode(uint32_t channel, TimerModes_t mode, PinName pin = NC, ChannelInputFilter_t filter = FILTER_NONE); // Configure timer channel with specified mode on specified pin if available
147-
void setMode(uint32_t channel, TimerModes_t mode, uint32_t pin, ChannelInputFilter_t filter = FILTER_NONE);
148+
void setMode(uint32_t channel, TimerModes_t mode, pin_size_t pin, ChannelInputFilter_t filter = FILTER_NONE);
148149

149150
TimerModes_t getMode(uint32_t channel); // Retrieve configured mode
150151

libraries/SrcWrapper/src/HardwareTimer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ void HardwareTimer::setCount(uint32_t counter, TimerFormat_t format)
628628
* @param pin: Arduino pin number, ex: D1, 1 or PA1
629629
* @retval None
630630
*/
631-
void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, uint32_t pin, ChannelInputFilter_t filter)
631+
void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, pin_size_t pin, ChannelInputFilter_t filter)
632632
{
633633
setMode(channel, mode, digitalPinToPinName(pin), filter);
634634
}
@@ -916,7 +916,7 @@ uint32_t HardwareTimer::getCaptureCompare(uint32_t channel, TimerCompareFormat_
916916
* @param CompareCallback: timer compare callback
917917
* @retval None
918918
*/
919-
void HardwareTimer::setPWM(uint32_t channel, uint32_t pin, uint32_t frequency, uint32_t dutycycle, callback_function_t PeriodCallback, callback_function_t CompareCallback)
919+
void HardwareTimer::setPWM(uint32_t channel, pin_size_t pin, uint32_t frequency, uint32_t dutycycle, callback_function_t PeriodCallback, callback_function_t CompareCallback)
920920
{
921921
setPWM(channel, digitalPinToPinName(pin), frequency, dutycycle, PeriodCallback, CompareCallback);
922922
}

0 commit comments

Comments
 (0)