Skip to content

fix(HardwareTimer): use ARR+1 in getCaptureCompare percent/resolution #3019

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
+5 −2
Open

fix(HardwareTimer): use ARR+1 in getCaptureCompare percent/resolution #3019

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
7 changes: 5 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 @@ -1188,8 +1188,11 @@ uint32_t HardwareTimer::getCaptureCompare(uint32_t channel, TimerCompareFormat_
case HERTZ_COMPARE_FORMAT:
return_value = (uint32_t)(getTimerClkFreq() / (CCR_RegisterValue * Prescalerfactor));
break;
// As per Reference Manual PWM reach 100% with CCRx value strictly greater than ARR
// (So ARR+1 in our case). Use the same ARR+1 "full scale" as setCaptureCompare()
// so that get/set are consistent, and to avoid a divide by zero when ARR is 0.
case PERCENT_COMPARE_FORMAT:
return_value = (CCR_RegisterValue * 100) / LL_TIM_GetAutoReload(_timerObj.instance);
return_value = (CCR_RegisterValue * 100) / (LL_TIM_GetAutoReload(_timerObj.instance) + 1);
break;
case RESOLUTION_1B_COMPARE_FORMAT:
case RESOLUTION_2B_COMPARE_FORMAT:
Expand All @@ -1207,7 +1210,7 @@ uint32_t HardwareTimer::getCaptureCompare(uint32_t channel, TimerCompareFormat_
case RESOLUTION_14B_COMPARE_FORMAT:
case RESOLUTION_15B_COMPARE_FORMAT:
case RESOLUTION_16B_COMPARE_FORMAT:
return_value = (CCR_RegisterValue * ((1 << format) - 1)) / LL_TIM_GetAutoReload(_timerObj.instance);
return_value = (CCR_RegisterValue * ((1 << format) - 1)) / (LL_TIM_GetAutoReload(_timerObj.instance) + 1);
break;
case TICK_COMPARE_FORMAT:
default :
Expand Down
Loading