Skip to content

Commit be7e127

Browse files
add fix stm32duino#2071 modification also to getter
1 parent 8099328 commit be7e127

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Diff for: cores/arduino/HardwareTimer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class HardwareTimer {
113113
uint32_t getPrescaleFactor();
114114

115115
void setOverflow(uint64_t val, TimerFormat_t format = TICK_FORMAT); // set AutoReload register depending on format provided
116-
uint32_t getOverflow(TimerFormat_t format = TICK_FORMAT); // return overflow depending on format provided
116+
uint64_t getOverflow(TimerFormat_t format = TICK_FORMAT); // return overflow depending on format provided
117117

118118
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.
119119
void setPWM(uint32_t channel, uint32_t pin, uint32_t frequency, uint32_t dutycycle, callback_function_t PeriodCallback = nullptr, callback_function_t CompareCallback = nullptr);

Diff for: libraries/SrcWrapper/src/HardwareTimer.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -483,18 +483,18 @@ void HardwareTimer::setPrescaleFactor(uint32_t prescaler)
483483
* MICROSEC_FORMAT: return number of microsecondes for overflow
484484
* HERTZ_FORMAT: return frequency in hertz for overflow
485485
*/
486-
uint32_t HardwareTimer::getOverflow(TimerFormat_t format)
486+
uint64_t HardwareTimer::getOverflow(TimerFormat_t format)
487487
{
488488
// Hardware register correspond to period count-1. Example ARR register value 9 means period of 10 timer cycle
489489
uint32_t ARR_RegisterValue = LL_TIM_GetAutoReload(_timerObj.handle.Instance);
490490
uint32_t Prescalerfactor = LL_TIM_GetPrescaler(_timerObj.handle.Instance) + 1;
491-
uint32_t return_value;
491+
uint64_t return_value;
492492
switch (format) {
493493
case MICROSEC_FORMAT:
494-
return_value = (uint32_t)(((ARR_RegisterValue + 1) * Prescalerfactor * 1000000.0) / getTimerClkFreq());
494+
return_value = (uint64_t)(((ARR_RegisterValue + 1) * Prescalerfactor * 1000000.0) / getTimerClkFreq());
495495
break;
496496
case HERTZ_FORMAT:
497-
return_value = (uint32_t)(getTimerClkFreq() / ((ARR_RegisterValue + 1) * Prescalerfactor));
497+
return_value = (uint64_t)(getTimerClkFreq() / ((ARR_RegisterValue + 1) * Prescalerfactor));
498498
break;
499499
case TICK_FORMAT:
500500
default :

0 commit comments

Comments
 (0)