kopia lustrzana https://gitlab.com/eliggett/wfview
Merge branch 'server-fixes'
commit
ac3894f897
2
main.cpp
2
main.cpp
|
@ -155,7 +155,7 @@ int main(int argc, char *argv[])
|
||||||
signal(SIGTERM, cleanup);
|
signal(SIGTERM, cleanup);
|
||||||
signal(SIGKILL, cleanup);
|
signal(SIGKILL, cleanup);
|
||||||
#endif
|
#endif
|
||||||
w = new servermain(logFilename, settingsFile);
|
w = new servermain(settingsFile, logFilename);
|
||||||
#else
|
#else
|
||||||
a.setWheelScrollLines(1); // one line per wheel click
|
a.setWheelScrollLines(1); // one line per wheel click
|
||||||
wfmain w(settingsFile, logFilename, debugMode);
|
wfmain w(settingsFile, logFilename, debugMode);
|
||||||
|
|
|
@ -87,7 +87,7 @@ void servermain::openRig()
|
||||||
{
|
{
|
||||||
//qInfo(logSystem()) << "Got rig";
|
//qInfo(logSystem()) << "Got rig";
|
||||||
QMetaObject::invokeMethod(radio->rig, [=]() {
|
QMetaObject::invokeMethod(radio->rig, [=]() {
|
||||||
radio->rig->commSetup(radio->civAddr, radio->serialPort, radio->baudRate, QString("none"),prefs.tcpPort,radio->waterfallFormat);
|
radio->rig->commSetup(radio->civAddr, radio->serialPort, radio->baudRate, QString("none"),0 ,radio->waterfallFormat);
|
||||||
}, Qt::QueuedConnection);
|
}, Qt::QueuedConnection);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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") {
|
||||||
{
|
tempPrefs->rigName = serialPortInfo.serialNumber();
|
||||||
if (serialPortInfo.serialNumber().startsWith("IC-")) {
|
tempPrefs->serialPort = serialPortInfo.portName();
|
||||||
tempPrefs->rigName = serialPortInfo.serialNumber();
|
|
||||||
tempPort = 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