Skip to content

fix(HardwareTimer): guard HERTZ_FORMAT get* against register==0 #3020

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
94xhn wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −2
Open

fix(HardwareTimer): guard HERTZ_FORMAT get* against register==0 #3020

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
12 changes: 10 additions & 2 deletions libraries/SrcWrapper/src/HardwareTimer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,10 @@ uint32_t HardwareTimer::getCount(TimerFormat_t format)
return_value = (uint32_t)((CNT_RegisterValue * Prescalerfactor * 1000000.0) / getTimerClkFreq());
break;
case HERTZ_FORMAT:
return_value = (uint32_t)(getTimerClkFreq() / (CNT_RegisterValue * Prescalerfactor));
// CNT_RegisterValue is 0 right at/after every timer reset or overflow,
// which is a normal, reachable state (not a caller error): avoid a
// divide by zero and report 0 (no meaningful frequency available).
return_value = (CNT_RegisterValue == 0) ? 0 : (uint32_t)(getTimerClkFreq() / (CNT_RegisterValue * Prescalerfactor));
break;
case TICK_FORMAT:
default :
Expand Down Expand Up @@ -1186,7 +1189,12 @@ uint32_t HardwareTimer::getCaptureCompare(uint32_t channel, TimerCompareFormat_
return_value = (uint32_t)((CCR_RegisterValue * Prescalerfactor * 1000000.0) / getTimerClkFreq());
break;
case HERTZ_COMPARE_FORMAT:
return_value = (uint32_t)(getTimerClkFreq() / (CCR_RegisterValue * Prescalerfactor));
// CCR_RegisterValue is 0 on reset (before the first setCaptureCompare()
// call) and, in Input Capture mode, whenever the last captured edge
// landed exactly at CNT == 0 or before any edge has been captured yet.
// That is a normal, reachable state (not a caller error): avoid a
// divide by zero and report 0 (no meaningful frequency available).
return_value = (CCR_RegisterValue == 0) ? 0 : (uint32_t)(getTimerClkFreq() / (CCR_RegisterValue * Prescalerfactor));
break;
case PERCENT_COMPARE_FORMAT:
return_value = (CCR_RegisterValue * 100) / LL_TIM_GetAutoReload(_timerObj.instance);
Expand Down
Loading