w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remember Tx and Rx audio frequencies when coming back from any mode which sets AF to 1500 Hz (MSK144, FST4W, Echo, WSPR, FreqCal).

This commit is contained in:
Uwe Risse 2022-07-08 11:56:02 +02:00
parent f84ba8a0d0
commit da282209f1
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
widgets/mainwindow.cpp
View File

@ -6480,7 +6480,11 @@ void MainWindow::displayWidgets(qint64 n)
void MainWindow::on_actionFST4_triggered()
{
QTimer::singleShot (50, [=] {on_sbSubmode_valueChanged(ui->sbSubmode->value());});
QTimer::singleShot (50, [=] {
ui->TxFreqSpinBox->setValue(m_settings->value("TxFreq_old",1500).toInt());
ui->RxFreqSpinBox->setValue(m_settings->value("RxFreq_old",1500).toInt());
on_sbSubmode_valueChanged(ui->sbSubmode->value());
});
m_mode="FST4";
ui->actionFST4->setChecked(true);
m_bFast9=false;
@ -6553,7 +6557,11 @@ void MainWindow::on_actionFST4W_triggered()
void MainWindow::on_actionFT4_triggered()
{
QTimer::singleShot (50, [=] {on_sbSubmode_valueChanged(ui->sbSubmode->value());});
QTimer::singleShot (50, [=] {
ui->TxFreqSpinBox->setValue(m_settings->value("TxFreq_old",1500).toInt());
ui->RxFreqSpinBox->setValue(m_settings->value("RxFreq_old",1500).toInt());
on_sbSubmode_valueChanged(ui->sbSubmode->value());
});
m_mode="FT4";
m_TRperiod=7.5;
bool bVHF=m_config.enable_VHF_features();
@ -6597,7 +6605,11 @@ void MainWindow::on_actionFT4_triggered()
void MainWindow::on_actionFT8_triggered()
{
QTimer::singleShot (50, [=] {on_sbSubmode_valueChanged(ui->sbSubmode->value());});
QTimer::singleShot (50, [=] {
ui->TxFreqSpinBox->setValue(m_settings->value("TxFreq_old",1500).toInt());
ui->RxFreqSpinBox->setValue(m_settings->value("RxFreq_old",1500).toInt());
on_sbSubmode_valueChanged(ui->sbSubmode->value());
});
m_mode="FT8";
bool bVHF=m_config.enable_VHF_features();
m_bFast9=false;
@ -6711,6 +6723,10 @@ void MainWindow::on_actionFT8_triggered()
void MainWindow::on_actionJT4_triggered()
{
QTimer::singleShot (50, [=] {
ui->TxFreqSpinBox->setValue(m_settings->value("TxFreq_old",1500).toInt());
ui->RxFreqSpinBox->setValue(m_settings->value("RxFreq_old",1500).toInt());
});
m_mode="JT4";
bool bVHF=m_config.enable_VHF_features();
WSPR_config(false);
@ -6816,6 +6832,10 @@ void MainWindow::on_actionJT9_triggered()
void MainWindow::on_actionJT65_triggered()
{
QTimer::singleShot (50, [=] {
ui->TxFreqSpinBox->setValue(m_settings->value("TxFreq_old",1500).toInt());
ui->RxFreqSpinBox->setValue(m_settings->value("RxFreq_old",1500).toInt());
});
on_actionJT9_triggered();
m_mode="JT65";
bool bVHF=m_config.enable_VHF_features();
@ -6869,6 +6889,10 @@ void MainWindow::on_actionJT65_triggered()
void MainWindow::on_actionQ65_triggered()
{
QTimer::singleShot (50, [=] {
ui->TxFreqSpinBox->setValue(m_settings->value("TxFreq_old",1500).toInt());
ui->RxFreqSpinBox->setValue(m_settings->value("RxFreq_old",1500).toInt());
});
m_mode="Q65";
ui->actionQ65->setChecked(true);
switch_mode(Modes::Q65);
@ -7180,7 +7204,9 @@ void MainWindow::on_TxFreqSpinBox_valueChanged(int n)
ui->TxFreqSpinBox->setStyleSheet("");
}
}
if (m_mode != "MSK144" && m_mode != "FST4W" && m_mode != "WSPR" && m_mode != "Echo" && m_mode != "FreqCal") {
QTimer::singleShot (200, [=] {m_settings->setValue("TxFreq_old",ui->TxFreqSpinBox->value());});
}
statusUpdate ();
}
@ -7190,6 +7216,9 @@ void MainWindow::on_RxFreqSpinBox_valueChanged(int n)
if (m_mode == "FreqCal") {
setRig ();
}
if (m_mode != "MSK144" && m_mode != "FST4W" && m_mode != "WSPR" && m_mode != "Echo" && m_mode != "FreqCal") {
QTimer::singleShot (200, [=] {m_settings->setValue("RxFreq_old",ui->RxFreqSpinBox->value());});
}
statusUpdate ();
}