jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-04 14:07:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix 32 bit overflow in SCPI commands

Browse source
This commit is contained in:
Jan Käberich 2021-12-13 16:05:45 +01:00
parent 8972af3f53
commit 399ef3fd5e
5 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
View file

@ -758,8 +758,8 @@ void SpectrumAnalyzer::SetupSCPI()
auto scpi_freq = new SCPINode("FREQuency");
SCPINode::add(scpi_freq);
scpi_freq->add(new SCPICommand("SPAN", [=](QStringList params) -> QString {
unsigned long newval;
if(!SCPI::paramToULong(params, 0, newval)) {
unsigned long long newval;
if(!SCPI::paramToULongLong(params, 0, newval)) {
return "ERROR";
} else {
SetSpan(newval);
@ -769,8 +769,8 @@ void SpectrumAnalyzer::SetupSCPI()
return QString::number(settings.f_stop - settings.f_start);
}));
scpi_freq->add(new SCPICommand("START", [=](QStringList params) -> QString {
unsigned long newval;
if(!SCPI::paramToULong(params, 0, newval)) {
unsigned long long newval;
if(!SCPI::paramToULongLong(params, 0, newval)) {
return "ERROR";
} else {
SetStartFreq(newval);
@ -780,8 +780,8 @@ void SpectrumAnalyzer::SetupSCPI()
return QString::number(settings.f_start);
}));
scpi_freq->add(new SCPICommand("CENTer", [=](QStringList params) -> QString {
unsigned long newval;
if(!SCPI::paramToULong(params, 0, newval)) {
unsigned long long newval;
if(!SCPI::paramToULongLong(params, 0, newval)) {
return "ERROR";
} else {
SetCenterFreq(newval);
@ -791,8 +791,8 @@ void SpectrumAnalyzer::SetupSCPI()
return QString::number((settings.f_start + settings.f_stop)/2);
}));
scpi_freq->add(new SCPICommand("STOP", [=](QStringList params) -> QString {
unsigned long newval;
if(!SCPI::paramToULong(params, 0, newval)) {
unsigned long long newval;
if(!SCPI::paramToULongLong(params, 0, newval)) {
return "ERROR";
} else {
SetStopFreq(newval);
@ -809,8 +809,8 @@ void SpectrumAnalyzer::SetupSCPI()
auto scpi_acq = new SCPINode("ACQuisition");
SCPINode::add(scpi_acq);
scpi_acq->add(new SCPICommand("RBW", [=](QStringList params) -> QString {
unsigned long newval;
if(!SCPI::paramToULong(params, 0, newval)) {
unsigned long long newval;
if(!SCPI::paramToULongLong(params, 0, newval)) {
return "ERROR";
} else {
SetRBW(newval);
@ -873,8 +873,8 @@ void SpectrumAnalyzer::SetupSCPI()
}
}));
scpi_acq->add(new SCPICommand("AVG", [=](QStringList params) -> QString {
unsigned long newval;
if(!SCPI::paramToULong(params, 0, newval)) {
unsigned long long newval;
if(!SCPI::paramToULongLong(params, 0, newval)) {
return "ERROR";
} else {
SetAveraging(newval);