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

Timeout handling in FPGA communication (better recovery from missing reference)

Browse source
This commit is contained in:
Jan Käberich 2020-12-15 18:03:29 +01:00
parent f0c5962878
commit 00f0de43f2
9 changed files with 58 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Software/VNA_embedded/Application/Hardware.cpp
View file

@ -18,6 +18,7 @@ static bool extRefInUse = false;
HW::Mode activeMode;
static Protocol::ReferenceSettings ref;
static uint32_t lastISR;
using namespace HWHAL;
@ -53,6 +54,7 @@ static void ReadComplete(const FPGA::SamplingResult &result) {
static void FPGA_Interrupt(void*) {
FPGA::InitiateSampleRead(ReadComplete);
lastISR = HAL_GetTick();
}
void HW::Work() {
@ -174,6 +176,8 @@ bool HW::Init() {
LOG_INFO("Initialized");
FPGA::Enable(FPGA::Periphery::ReadyLED);
Ref::update();
return true;
}
@ -195,6 +199,7 @@ void HW::SetMode(Mode mode) {
if(mode != Mode::Idle) {
// do a full initialization when switching directly between modes
HW::Init();
lastISR = HAL_GetTick();
}
SetIdle();
activeMode = mode;
@ -269,6 +274,15 @@ HW::AmplitudeSettings HW::GetAmplitudeSettings(int16_t cdbm, uint64_t freq, bool
return ret;
}
bool HW::TimedOut() {
constexpr uint32_t timeout = 1000;
if(activeMode != Mode::Idle && HAL_GetTick() - lastISR > timeout) {
return true;
} else {
return false;
}
}
void HW::fillDeviceInfo(Protocol::DeviceInfo *info, bool updateEvenWhenBusy) {
// copy constant default values
memcpy(info, &HW::Info, sizeof(HW::Info));