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

19
Software/VNA_embedded/Application/App.cpp
View file

@ -25,6 +25,7 @@
#include "Log.h"
static Protocol::PacketInfo recv_packet;
static Protocol::PacketInfo last_measure_packet; // contains the command that started the last measured (replay in case of timeout)
static TaskHandle_t handle;
#if HW_REVISION >= 'B'
@ -108,11 +109,13 @@ void App_Start() {
switch(recv_packet.type) {
case Protocol::PacketType::SweepSettings:
LOG_INFO("New settings received");
last_measure_packet = recv_packet;
sweepActive = VNA::Setup(recv_packet.settings);
Communication::SendWithoutPayload(Protocol::PacketType::Ack);
break;
case Protocol::PacketType::ManualControl:
sweepActive = false;
last_measure_packet = recv_packet;
Manual::Setup(recv_packet.manual);
Communication::SendWithoutPayload(Protocol::PacketType::Ack);
break;
@ -125,13 +128,15 @@ void App_Start() {
Communication::SendWithoutPayload(Protocol::PacketType::Ack);
break;
case Protocol::PacketType::Generator:
sweepActive = false;
sweepActive = true;
last_measure_packet = recv_packet;
LOG_INFO("Updating generator setting");
Generator::Setup(recv_packet.generator);
Communication::SendWithoutPayload(Protocol::PacketType::Ack);
break;
case Protocol::PacketType::SpectrumAnalyzerSettings:
sweepActive = false;
sweepActive = true;
last_measure_packet = recv_packet;
LOG_INFO("Updating spectrum analyzer settings");
SA::Setup(recv_packet.spectrumSettings);
Communication::SendWithoutPayload(Protocol::PacketType::Ack);
@ -142,6 +147,11 @@ void App_Start() {
HW::fillDeviceInfo(&p.info);
Communication::Send(p);
break;
case Protocol::PacketType::SetIdle:
HW::SetMode(HW::Mode::Idle);
sweepActive = false;
Communication::SendWithoutPayload(Protocol::PacketType::Ack);
break;
#ifdef HAS_FLASH
case Protocol::PacketType::ClearFlash:
HW::SetMode(HW::Mode::Idle);
@ -197,5 +207,10 @@ void App_Start() {
}
}
}
if(HW::TimedOut()) {
HW::SetMode(HW::Mode::Idle);
// insert the last received packet (restarts the timed out operation)
USBPacketReceived(last_measure_packet);
}
}
}