w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-11 02:09:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into hound-list-changes

Browse Source
This commit is contained in:
Brian Moran
2022-11-15 11:33:44 -08:00
parent 2b08cd9e4b e7dde090bf
commit 2ba4496baf
8 changed files with 343 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widgets/mainwindow.cpp
+15 -2
View File
@@ -209,6 +209,8 @@ QVector<QColor> g_ColorTbl;
using SpecOp = Configuration::SpecialOperatingActivity;
bool m_displayBand = false;
bool no_a7_decodes = false;
bool keep_frequency = false;
namespace
{
@@ -3700,6 +3702,10 @@ void MainWindow::readFromStdout() //readFromStdout
continue;
}
}
// Don't allow a7 decodes during the first period because they can be leftovers from the previous band
if (!(no_a7_decodes && line_read.contains("a7"))) {
if (m_mode!="FT8" and m_mode!="FT4" and !m_mode.startsWith ("FST4") and m_mode!="Q65") {
//Pad 22-char msg to at least 37 chars
line_read = line_read.left(44) + " " + line_read.mid(44);
@@ -3766,6 +3772,7 @@ void MainWindow::readFromStdout() //readFromStdout
}
m_tBlankLine = line_read.left(ntime);
}
}
if ("FST4W" == m_mode)
{
uploadWSPRSpots (true, line_read);
@@ -4139,7 +4146,7 @@ void MainWindow::pskPost (DecodedText const& decodedtext)
}
int snr = decodedtext.snr();
Frequency frequency = m_freqNominalPeriod + audioFrequency; // prevent spotting wrong band
if(grid.contains (grid_regexp)) {
if(grid.contains (grid_regexp) || decodedtext.string().contains(" CQ ")) {
// qDebug() << "To PSKreporter:" << deCall << grid << frequency << msgmode << snr;
if (!m_psk_Reporter.addRemoteStation (deCall, grid, frequency, msgmode, snr))
{
@@ -6764,7 +6771,7 @@ void MainWindow::on_actionFT8_triggered()
ui->txb5->setEnabled(false);
ui->txb6->setEnabled(false);
} else {
switch_mode (Modes::FT8);
if (!(keep_frequency)) switch_mode (Modes::FT8);
}
if(m_specOp != SpecOp::HOUND) {
@@ -7487,6 +7494,10 @@ void MainWindow::on_bandComboBox_activated (int index)
void MainWindow::band_changed (Frequency f)
{
// Don't allow a7 decodes during the first period because they can be leftovers from the previous band
no_a7_decodes = true;
QTimer::singleShot ((int(1000.0*m_TRperiod)), [=] {no_a7_decodes = false;});
// Set the attenuation value if options are checked
if (m_config.pwrBandTxMemory() && !m_tune) {
auto const&curBand = ui->bandComboBox->currentText();
@@ -10113,6 +10124,8 @@ void MainWindow::on_houndButton_clicked (bool checked)
} else {
ui->houndButton->setStyleSheet("");
m_config.setSpecial_None();
keep_frequency = true;
QTimer::singleShot (250, [=] {keep_frequency = false;});
}
m_specOp=m_config.special_op_id();
on_actionFT8_triggered();