From 24584684115639d315cf1d860733e73837267a76 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Fri, 20 Sep 2024 10:43:18 +0200 Subject: [PATCH 1/4] Make sure Rx frequency is really set to 750 +- 50 Hz when switching to SuperHound mode. --- widgets/mainwindow.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index fd09f52e2..d409f6562 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -7434,13 +7434,6 @@ void MainWindow::on_actionFT8_triggered() QTimer::singleShot (50, [=] { if(m_specOp!=SpecOp::FOX) ui->TxFreqSpinBox->setValue(m_settings->value("TxFreq_old",1500).toInt()); if(m_specOp==SpecOp::FOX && !m_config.superFox()) ui->TxFreqSpinBox->setValue(m_TxFreqFox); - if(SpecOp::HOUND == m_specOp && m_config.superFox()) clearDX(); - if(SpecOp::HOUND == m_specOp && m_config.superFox() && - (ui->RxFreqSpinBox->value() < 700 or ui->RxFreqSpinBox->value() > 800)) { - ui->RxFreqSpinBox->setValue(750); - } else { - ui->RxFreqSpinBox->setValue(m_settings->value("RxFreq_old",1500).toInt()); - } on_sbSubmode_valueChanged(ui->sbSubmode->value()); }); m_mode="FT8"; @@ -7526,12 +7519,16 @@ void MainWindow::on_actionFT8_triggered() m_wideGraph->setRxFreq(ui->RxFreqSpinBox->value()); m_wideGraph->setTol(ui->sbFtol->value()); m_wideGraph->setSuperHound(true); + clearDX(); + if(ui->RxFreqSpinBox->value() < 700 or ui->RxFreqSpinBox->value() > 800) + ui->RxFreqSpinBox->setValue(750); } else { // 01234567890123456789012345678901234567 displayWidgets(nWidgets("11101000010011000001000000000011000000")); ui->labDXped->setText(tr ("Hound")); ui->cbRxAll->setEnabled(true); m_wideGraph->setSuperHound(false); + ui->RxFreqSpinBox->setValue(m_settings->value("RxFreq_old",1500).toInt()); } ui->txrb1->setChecked(true); ui->txrb2->setEnabled(false); From 4f9d0da8c6698e522483922a132bcca94b0699e8 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Fri, 20 Sep 2024 14:30:24 +0200 Subject: [PATCH 2/4] Don't reset to band/mode default frequency unless really needed when in FT8 mode. Very useful for (Super) Fox or Hound operation. --- widgets/mainwindow.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index d409f6562..9f6ec2c6a 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -2082,6 +2082,7 @@ void MainWindow::showStatusMessage(const QString& statusMsg) void MainWindow::on_actionSettings_triggered() //Setup Dialog { + if (m_mode=="FT8") keep_frequency = true; // things that might change that we need know about auto callsign = m_config.my_callsign (); auto my_grid = m_config.my_grid (); @@ -2122,7 +2123,7 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog , m_tx_audio_buffer_frames); } - displayDialFrequency (); + if (!keep_frequency or ui->bandComboBox->currentText()=="oob") displayDialFrequency (); bool vhf {m_config.enable_VHF_features()}; m_wideGraph->setVHF(vhf); if (!vhf) ui->sbSubmode->setValue (0); @@ -2172,8 +2173,10 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog ui->labDXped->setStyleSheet("QLabel {background-color: red; color: white;}"); set_mode(m_mode); configActiveStations(); + keep_frequency = false; + } else { + keep_frequency = false; } - if(m_mode=="FT8") on_actionFT8_triggered(); //in case we need to reset some things for Fox/Hound } void MainWindow::on_monitorButton_clicked (bool checked) From 8e0df8c0eacca481922aae88ee841913cf3d375a Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Fri, 20 Sep 2024 14:50:03 +0200 Subject: [PATCH 3/4] Explicitly allow the Fox to transmit after the Tx frequency has been set at least 3 kHz from the main FT8 sub-bands. --- widgets/mainwindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 9f6ec2c6a..e44246654 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -4904,7 +4904,7 @@ void MainWindow::guiUpdate() QVector ft8Freq = {1840000,3573000,7074000,10136000,14074000,18100000,21074000,24915000,28074000,50313000,70154000}; for(int i=0; i 2999) m_bTxTime=true; // allow Tx again } } } From ed19a92e2a358d65fa79688373917e444d1fbeda Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Fri, 20 Sep 2024 15:33:42 +0200 Subject: [PATCH 4/4] Revert "Explicitly allow the Fox to transmit after the Tx frequency has been set at least 3 kHz from the main FT8 sub-bands." This reverts commit 8e0df8c0eacca481922aae88ee841913cf3d375a. --- widgets/mainwindow.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index e44246654..9f6ec2c6a 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -4904,7 +4904,7 @@ void MainWindow::guiUpdate() QVector ft8Freq = {1840000,3573000,7074000,10136000,14074000,18100000,21074000,24915000,28074000,50313000,70154000}; for(int i=0; i 2999) m_bTxTime=true; // allow Tx again } } }