kopia lustrzana https://gitlab.com/eliggett/wfview
Fix invalid scope data in combine mode
rodzic
40f49c56e7
commit
3d2c16201b
|
@ -126,7 +126,7 @@ void commHandler::sendDataOut(const QByteArray &writeData)
|
||||||
printHex(pttreturncmd, false, true);
|
printHex(pttreturncmd, false, true);
|
||||||
emit haveDataFromPort(pttreturncmd);
|
emit haveDataFromPort(pttreturncmd);
|
||||||
|
|
||||||
|
|
||||||
mutex.unlock();
|
mutex.unlock();
|
||||||
return;
|
return;
|
||||||
} else if(writeData.endsWith(QByteArrayLiteral("\x1C\x00\x01\xFD")))
|
} else if(writeData.endsWith(QByteArrayLiteral("\x1C\x00\x01\xFD")))
|
||||||
|
@ -210,7 +210,6 @@ void commHandler::receiveDataIn()
|
||||||
//printHex(inPortData, false, true);
|
//printHex(inPortData, false, true);
|
||||||
while (pos > -1 && fdPos > -1) {
|
while (pos > -1 && fdPos > -1) {
|
||||||
combined++;
|
combined++;
|
||||||
spectrumDivisionNumber = 0;
|
|
||||||
spectrumDivisionNumber = inPortData[pos + 3] & 0x0f;
|
spectrumDivisionNumber = inPortData[pos + 3] & 0x0f;
|
||||||
spectrumDivisionNumber += ((inPortData[pos + 3] & 0xf0) >> 4) * 10;
|
spectrumDivisionNumber += ((inPortData[pos + 3] & 0xf0) >> 4) * 10;
|
||||||
|
|
||||||
|
@ -226,8 +225,8 @@ void commHandler::receiveDataIn()
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (spectrumDivisionNumber > lastSpectrum && spectrumDivisionNumber <= spectrumDivisionMax) {
|
else if (spectrumDivisionNumber > lastSpectrum && spectrumDivisionNumber <= spectrumDivisionMax) {
|
||||||
spectrumData.insert(spectrumData.length(), inPortData.mid(pos + 4, fdPos-5));
|
spectrumData.insert(spectrumData.length(), inPortData.mid(pos + 5, fdPos-5));
|
||||||
//qDebug() << "Added spectrum seq:" << spectrumDivisionNumber << "len" << fdPos-5;
|
//qInfo() << "Added spectrum seq:" << spectrumDivisionNumber << "len" << fdPos-5<< "Spec" << spectrumData.length();
|
||||||
//printHex(inPortData.mid((pos+4),fdPos - (pos+5)), false, true);
|
//printHex(inPortData.mid((pos+4),fdPos - (pos+5)), false, true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
13
wfmain.ui
13
wfmain.ui
|
@ -2245,7 +2245,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QStackedWidget" name="settingsStack">
|
<widget class="QStackedWidget" name="settingsStack">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>4</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="radioAccess">
|
<widget class="QWidget" name="radioAccess">
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_21">
|
<layout class="QVBoxLayout" name="verticalLayout_21">
|
||||||
|
@ -4978,6 +4978,13 @@
|
||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="label_52">
|
||||||
|
<property name="text">
|
||||||
|
<string>Only change this if you are absolutely sure you need it (connecting to N1MM+ or similar)</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_28">
|
<spacer name="horizontalSpacer_28">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
@ -5530,8 +5537,8 @@
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
<buttongroups>
|
<buttongroups>
|
||||||
<buttongroup name="pollingButtonGroup"/>
|
|
||||||
<buttongroup name="buttonGroup"/>
|
|
||||||
<buttongroup name="underlayButtonGroup"/>
|
<buttongroup name="underlayButtonGroup"/>
|
||||||
|
<buttongroup name="buttonGroup"/>
|
||||||
|
<buttongroup name="pollingButtonGroup"/>
|
||||||
</buttongroups>
|
</buttongroups>
|
||||||
</ui>
|
</ui>
|
||||||
|
|
Ładowanie…
Reference in New Issue