kopia lustrzana https://gitlab.com/eliggett/wfview
Detect radio baudrate in server mode
rodzic
87c2912210
commit
b6cf0fcfc4
|
@ -1053,6 +1053,7 @@ void wfmain::setDefPrefs()
|
||||||
udpDefPrefs.username = QString("");
|
udpDefPrefs.username = QString("");
|
||||||
udpDefPrefs.password = QString("");
|
udpDefPrefs.password = QString("");
|
||||||
udpDefPrefs.clientName = QHostInfo::localHostName();
|
udpDefPrefs.clientName = QHostInfo::localHostName();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wfmain::loadSettings()
|
void wfmain::loadSettings()
|
||||||
|
@ -1129,11 +1130,15 @@ void wfmain::loadSettings()
|
||||||
}
|
}
|
||||||
|
|
||||||
prefs.serialPortBaud = (quint32) settings->value("SerialPortBaud", defPrefs.serialPortBaud).toInt();
|
prefs.serialPortBaud = (quint32) settings->value("SerialPortBaud", defPrefs.serialPortBaud).toInt();
|
||||||
|
|
||||||
ui->baudRateCombo->blockSignals(true);
|
ui->baudRateCombo->blockSignals(true);
|
||||||
ui->baudRateCombo->setCurrentIndex( ui->baudRateCombo->findData(prefs.serialPortBaud) );
|
ui->baudRateCombo->setCurrentIndex( ui->baudRateCombo->findData(prefs.serialPortBaud) );
|
||||||
ui->baudRateCombo->blockSignals(false);
|
ui->baudRateCombo->blockSignals(false);
|
||||||
|
|
||||||
|
if (prefs.serialPortBaud > 0)
|
||||||
|
{
|
||||||
|
serverConfig.baudRate = prefs.serialPortBaud;
|
||||||
|
}
|
||||||
|
|
||||||
prefs.virtualSerialPort = settings->value("VirtualSerialPort", defPrefs.virtualSerialPort).toString();
|
prefs.virtualSerialPort = settings->value("VirtualSerialPort", defPrefs.virtualSerialPort).toString();
|
||||||
int vspIndex = ui->vspCombo->findText(prefs.virtualSerialPort);
|
int vspIndex = ui->vspCombo->findText(prefs.virtualSerialPort);
|
||||||
if (vspIndex != -1) {
|
if (vspIndex != -1) {
|
||||||
|
@ -1282,7 +1287,6 @@ void wfmain::loadSettings()
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
settings->beginGroup("Server");
|
settings->beginGroup("Server");
|
||||||
|
|
||||||
serverConfig.enabled = settings->value("ServerEnabled", false).toBool();
|
serverConfig.enabled = settings->value("ServerEnabled", false).toBool();
|
||||||
serverConfig.controlPort = settings->value("ServerControlPort", 50001).toInt();
|
serverConfig.controlPort = settings->value("ServerControlPort", 50001).toInt();
|
||||||
serverConfig.civPort = settings->value("ServerCivPort", 50002).toInt();
|
serverConfig.civPort = settings->value("ServerCivPort", 50002).toInt();
|
||||||
|
@ -4578,6 +4582,7 @@ void wfmain::on_baudRateCombo_activated(int index)
|
||||||
if(ok)
|
if(ok)
|
||||||
{
|
{
|
||||||
prefs.serialPortBaud = baud;
|
prefs.serialPortBaud = baud;
|
||||||
|
serverConfig.baudRate = baud;
|
||||||
showStatusBarText(QString("Changed baud rate to %1 bps. Press Save Settings to retain.").arg(baud));
|
showStatusBarText(QString("Changed baud rate to %1 bps. Press Save Settings to retain.").arg(baud));
|
||||||
}
|
}
|
||||||
(void)index;
|
(void)index;
|
||||||
|
|
Ładowanie…
Reference in New Issue