kopia lustrzana https://gitlab.com/eliggett/wfview
Fix serial port detection.
rodzic
e56294406a
commit
3bf095020c
|
@ -500,23 +500,16 @@ void servermain::loadSettings()
|
||||||
tempPrefs->rxAudioSetup.type = prefs.audioSystem;
|
tempPrefs->rxAudioSetup.type = prefs.audioSystem;
|
||||||
tempPrefs->txAudioSetup.type = prefs.audioSystem;
|
tempPrefs->txAudioSetup.type = prefs.audioSystem;
|
||||||
|
|
||||||
QString tempPort = "auto";
|
if (tempPrefs->serialPort == "auto") {
|
||||||
if (tempPrefs->rigName=="<NONE>")
|
|
||||||
{
|
|
||||||
foreach(const QSerialPortInfo & serialPortInfo, QSerialPortInfo::availablePorts())
|
foreach(const QSerialPortInfo & serialPortInfo, QSerialPortInfo::availablePorts())
|
||||||
{
|
{
|
||||||
qDebug(logSystem()) << "Serial Port found: " << serialPortInfo.portName() << "Manufacturer:" << serialPortInfo.manufacturer() << "Product ID" << serialPortInfo.description() << "S/N" << serialPortInfo.serialNumber();
|
qDebug(logSystem()) << "Serial Port found: " << serialPortInfo.portName() << "Manufacturer:" << serialPortInfo.manufacturer() << "Product ID" << serialPortInfo.description() << "S/N" << serialPortInfo.serialNumber();
|
||||||
if ((serialPortInfo.portName() == tempPrefs->serialPort || tempPrefs->serialPort == "auto") && !serialPortInfo.serialNumber().isEmpty())
|
if (serialPortInfo.serialNumber().startsWith("IC-") && tempPrefs->serialPort == "auto") {
|
||||||
{
|
|
||||||
if (serialPortInfo.serialNumber().startsWith("IC-")) {
|
|
||||||
tempPrefs->rigName = serialPortInfo.serialNumber();
|
tempPrefs->rigName = serialPortInfo.serialNumber();
|
||||||
tempPort = serialPortInfo.portName();
|
tempPrefs->serialPort = serialPortInfo.portName();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
tempPrefs->serialPort = tempPort;
|
|
||||||
|
|
||||||
QString guid = settings->value("GUID", "").toString();
|
QString guid = settings->value("GUID", "").toString();
|
||||||
if (guid.isEmpty()) {
|
if (guid.isEmpty()) {
|
||||||
guid = QUuid::createUuid().toString();
|
guid = QUuid::createUuid().toString();
|
||||||
|
|
Ładowanie…
Reference in New Issue