Fixed placement of "out of range" data byte reading.

failbranch v1.60
Elliott Liggett 2023-02-04 09:57:12 -08:00
rodzic 11f8cb702f
commit bb632b8e2b
1 zmienionych plików z 10 dodań i 11 usunięć

Wyświetl plik

@ -4347,17 +4347,6 @@ void rigCommander::parseSpectrum()
return; return;
} }
if(payloadIn.length() >= 15)
{
bool outOfRange = (bool)payloadIn[16];
if(outOfRange != wasOutOfRange)
{
emit haveScopeOutOfRange(outOfRange);
wasOutOfRange = outOfRange;
return;
}
}
// unsigned char waveInfo = payloadIn[06]; // really just one byte? // unsigned char waveInfo = payloadIn[06]; // really just one byte?
//qInfo(logRig()) << "Spectrum Data received: " << sequence << "/" << sequenceMax << " mode: " << scopeMode << " waveInfo: " << waveInfo << " length: " << payloadIn.length(); //qInfo(logRig()) << "Spectrum Data received: " << sequence << "/" << sequenceMax << " mode: " << scopeMode << " waveInfo: " << waveInfo << " length: " << payloadIn.length();
@ -4385,6 +4374,16 @@ void rigCommander::parseSpectrum()
oldScopeMode = scopeMode; oldScopeMode = scopeMode;
} }
if(payloadIn.length() >= 15)
{
bool outOfRange = (bool)payloadIn[16];
if(outOfRange != wasOutOfRange)
{
emit haveScopeOutOfRange(outOfRange);
wasOutOfRange = outOfRange;
return;
}
}
// wave information // wave information
spectrumLine.clear(); spectrumLine.clear();