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

commit missed changes to VNA.cpp

Browse Source
This commit is contained in:
Andre Dunford 2022-12-20 11:42:11 -08:00
parent 916d6e3e38
commit cc8256b4cc
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Software/VNA_embedded/Application/VNA.cpp
View File

@ -27,6 +27,7 @@ static uint32_t last_LO2;
static double logMultiplier, logFrequency; static double logMultiplier, logFrequency;
static Protocol::VNADatapoint<32> data; static Protocol::VNADatapoint<32> data;
static bool active = false; static bool active = false;
static bool waitingInStandby = false;
static Si5351C::DriveStrength fixedPowerLowband; static Si5351C::DriveStrength fixedPowerLowband;
static bool adcShifted; static bool adcShifted;
static uint32_t actualBandwidth; static uint32_t actualBandwidth;
@ -260,7 +261,10 @@ bool VNA::Setup(Protocol::SweepSettings s) {
FPGA::EnableInterrupt(FPGA::Interrupt::SweepHalted); FPGA::EnableInterrupt(FPGA::Interrupt::SweepHalted);
// Start the sweep if not configured for standby // Start the sweep if not configured for standby
firstPoint = true; firstPoint = true;
if(!settings.standby){ if (settings.standby) {
waitingInStandby = true;
}
else {
FPGA::StartSweep(); FPGA::StartSweep();
} }
return true; return true;
@ -268,9 +272,10 @@ bool VNA::Setup(Protocol::SweepSettings s) {
void VNA::InitiateSweep() { void VNA::InitiateSweep() {
// Invoked by a host via InitiateSweep packet // Invoked by a host via InitiateSweep packet
if(settings.standby){ if(waitingInStandby){
// make sure that SweepSettings have been configured for standby operation // make sure that SweepSettings have been configured for standby operation
FPGA::StartSweep(); FPGA::StartSweep();
waitingInStandby = false;
} }
} }
@ -278,6 +283,14 @@ bool VNA::GetStandbyMode() {
return settings.standby; return settings.standby;
} }
bool VNA::IsWaitingInStandby() {
return waitingInStandby;
}
void VNA::SetWaitingInStandby(bool waiting) {
waitingInStandby = waiting;
}
static void PassOnData() { static void PassOnData() {
Protocol::PacketInfo info; Protocol::PacketInfo info;
info.type = Protocol::PacketType::VNADatapoint; info.type = Protocol::PacketType::VNADatapoint;
@ -345,7 +358,10 @@ void VNA::Work() {
} }
// do not reset unlevel flag here, as it is calculated only once at the setup of the sweep // do not reset unlevel flag here, as it is calculated only once at the setup of the sweep
// Start next sweep if not configured for standby // Start next sweep if not configured for standby
if (!settings.standby){ if (settings.standby) {
waitingInStandby = true;
}
else {
FPGA::StartSweep(); FPGA::StartSweep();
} }