Skip to content

HardwareTimer: fix typo in comments and obvious ICPolarity wrong setting #1548

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
merged 2 commits into from
Nov 23, 2021
Merged

HardwareTimer: fix typo in comments and obvious ICPolarity wrong setting #1548

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ff37f0
HardwareTimer: fix typo
ABOSTM Nov 23, 2021
ca4b1ed
HardwareTimer: Fix incoherent ICPolarity initial setting
ABOSTM Nov 17, 2021
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
8 changes: 4 additions & 4 deletions cores/arduino/HardwareTimer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ void HardwareTimer::pauseChannel(uint32_t channel)
*/
void HardwareTimer::resume(void)
{
// Clear flag and ennable IT
// Clear flag and enable IT
if (callbacks[0]) {
__HAL_TIM_CLEAR_FLAG(&(_timerObj.handle), TIM_FLAG_UPDATE);
__HAL_TIM_ENABLE_IT(&(_timerObj.handle), TIM_IT_UPDATE);
Expand Down Expand Up @@ -652,7 +652,7 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin)
channelOC.OCNIdleState = TIM_OCNIDLESTATE_RESET;
#endif
#endif
channelIC.ICPolarity = TIMER_NOT_USED;
channelIC.ICPolarity = TIM_ICPOLARITY_RISING;
channelIC.ICSelection = TIM_ICSELECTION_DIRECTTI;
channelIC.ICPrescaler = TIM_ICPSC_DIV1;
channelIC.ICFilter = 0;
Expand Down Expand Up @@ -920,7 +920,7 @@ uint32_t HardwareTimer::getCaptureCompare(uint32_t channel, TimerCompareFormat_
* @param pin: Arduino pin number, ex D1, 1 or PA1
* @param frequency: PWM frequency expressed in hertz
* @param dutycycle: PWM dutycycle expressed in percentage
* @param PeriodCallback: timer period callback (timer rollover upon udate event)
* @param PeriodCallback: timer period callback (timer rollover upon update event)
* @param CompareCallback: timer compare callback
* @retval None
*/
Expand All @@ -935,7 +935,7 @@ void HardwareTimer::setPWM(uint32_t channel, uint32_t pin, uint32_t frequency, u
* @param pin: pin name, ex PB_0
* @param frequency: PWM frequency expressed in hertz
* @param dutycycle: PWM dutycycle expressed in percentage
* @param PeriodCallback: timer period callback (timer rollover upon udate event)
* @param PeriodCallback: timer period callback (timer rollover upon update event)
* @param CompareCallback: timer compare callback
* @retval None
*/
Expand Down