jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-05 22:45:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix further sweep timeout issues

Browse source
This commit is contained in:
Jan Käberich 2022-06-26 18:47:34 +02:00
parent 4541dcb71b
commit 947a6b9d83
9 changed files with 53 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Software/VNA_embedded/Application/Drivers/delay.cpp
View file

@ -9,10 +9,10 @@ void Delay::Init() {
// enable update interrupt
TIM1->DIER |= TIM_DIER_UIE;
HAL_NVIC_SetPriority(TIM1_UP_TIM16_IRQn, 6, 0);
HAL_NVIC_SetPriority(TIM1_UP_TIM16_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(TIM1_UP_TIM16_IRQn);
TIM1->CR1 |= TIM_CR1_CEN;
TIM1->CR1 |= TIM_CR1_CEN | TIM_CR1_UIFREMAP;
}
uint64_t Delay::get_us() {
@ -22,7 +22,7 @@ uint64_t Delay::get_us() {
uint64_t ret;
if(buf & 0x80000000) {
// UIF bit set, timer overflow not handled yet
ret = t_us + UINT16_MAX + timer_value;
ret = t_us + UINT16_MAX + 1 + timer_value;
} else {
ret = t_us + timer_value;
}
@ -46,7 +46,7 @@ void TIM1_UP_TIM16_IRQHandler() {
// clear bit
TIM1->SR &= ~TIM_SR_UIF;
// update count
t_us += UINT16_MAX;
t_us += UINT16_MAX + 1;
}
}