jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-21 06:13:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Documentation of SCPI commands

Browse source
This commit is contained in:
Jan Käberich 2021-04-15 19:24:11 +02:00
parent 438b62e06e
commit aebe92111b
10 changed files with 687 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Software/PC_Application/Calibration/calibration.cpp
View file

@ -91,7 +91,7 @@ bool Calibration::constructErrorTerms(Calibration::Type type)
case Type::FullSOLT: construct12TermPoints(); break;
case Type::TransmissionNormalization: constructTransmissionNormalization(); break;
case Type::TRL: constructTRL(); break;
case Type::None: break;
default: break;
}
this->type = type;
return true;
@ -430,6 +430,17 @@ Calibration::InterpolationType Calibration::getInterpolation(Protocol::SweepSett
}
}
Calibration::Measurement Calibration::MeasurementFromString(QString s)
{
for(unsigned int i=0;i<(int)Measurement::Last;i++) {
auto m = (Measurement) i;
if(s.compare(MeasurementToString(m), Qt::CaseInsensitive)==0) {
return m;
}
}
return Measurement::Last;
}
QString Calibration::MeasurementToString(Calibration::Measurement m)
{
switch(m) {
@ -456,6 +467,17 @@ QString Calibration::MeasurementToString(Calibration::Measurement m)
}
}
Calibration::Type Calibration::TypeFromString(QString s)
{
for(unsigned int i=0;i<(int)Type::Last;i++) {
auto t = (Type) i;
if(s.compare(TypeToString(t), Qt::CaseInsensitive)==0) {
return t;
}
}
return Type::Last;
}
QString Calibration::TypeToString(Calibration::Type t)
{
switch(t) {
@ -551,6 +573,10 @@ Calibration::MeasurementInfo Calibration::getMeasurementInfo(Calibration::Measur
info.name = "Line";
info.prerequisites = "Port 1 connected to port 2 via line standard";
break;
default:
info.name = "Invalid";
info.prerequisites = "Invalid";
break;
}
info.points = measurements[m].datapoints.size();
if(info.points > 0) {
@ -620,6 +646,8 @@ std::vector<Trace *> Calibration::getMeasurementTraces()
case Measurement::Isolation:
usedPrefixes = {"S11", "S12", "S21", "S22"};
break;
default:
break;
}
for(auto prefix : usedPrefixes) {
auto t = new Trace(prefix + " " + info.name);

4
Software/PC_Application/Calibration/calibration.h
View file

@ -27,6 +27,7 @@ public:
Isolation,
Through,
Line,
Last,
};
void clearMeasurements();
void clearMeasurement(Measurement type);
@ -39,6 +40,7 @@ public:
TransmissionNormalization,
TRL,
None,
Last,
};
@ -59,7 +61,9 @@ public:
InterpolationType getInterpolation(Protocol::SweepSettings settings);
static Measurement MeasurementFromString(QString s);
static QString MeasurementToString(Measurement m);
static Type TypeFromString(QString s);
static QString TypeToString(Type t);
class MeasurementInfo {