caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

relocate standby condition

Browse Source
This commit is contained in:
Andre Dunford 2022-12-18 16:54:47 -08:00
parent 61594d53fb
commit fc8eee58e7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Software/VNA_embedded/Application/App.cpp
View File

@ -324,7 +324,7 @@ inline void App_Process() {
} }
} }
} }
if(!VNA::GetStandbyMode() && HW::TimedOut()) { if(HW::TimedOut()) {
HW::SetMode(HW::Mode::Idle); HW::SetMode(HW::Mode::Idle);
// insert the last received packet (restarts the timed out operation) // insert the last received packet (restarts the timed out operation)
Communication::BlockNextAck(); Communication::BlockNextAck();

2
Software/VNA_embedded/Application/Hardware.cpp
View File

@ -303,7 +303,7 @@ bool HW::TimedOut() {
auto bufISR = lastISR; auto bufISR = lastISR;
uint64_t now = Delay::get_us(); uint64_t now = Delay::get_us();
uint64_t timeSinceLast = now - bufISR; uint64_t timeSinceLast = now - bufISR;
if(activeMode != Mode::Idle && activeMode != Mode::Generator && timeSinceLast > timeout) { if(activeMode != Mode::Idle && activeMode != Mode::Generator && !VNA::GetStandbyMode() && timeSinceLast > timeout) {
LOG_WARN("Timed out, last ISR was at %lu%06lu, now %lu%06lu" LOG_WARN("Timed out, last ISR was at %lu%06lu, now %lu%06lu"
, (uint32_t) (bufISR / 1000000), (uint32_t)(bufISR%1000000) , (uint32_t) (bufISR / 1000000), (uint32_t)(bufISR%1000000)
, (uint32_t) (now / 1000000), (uint32_t)(now%1000000)); , (uint32_t) (now / 1000000), (uint32_t)(now%1000000));