diff --git a/models/Modes.cpp b/models/Modes.cpp index 838585b2a..1b1febfa8 100644 --- a/models/Modes.cpp +++ b/models/Modes.cpp @@ -24,7 +24,9 @@ namespace "QRA64", "FreqCal", "FT8", - "FT4" + "FT4", + "FST280", + "FST280W" }; std::size_t constexpr mode_names_size = sizeof (mode_names) / sizeof (mode_names[0]); } diff --git a/models/Modes.hpp b/models/Modes.hpp index fea55e4d4..c98b1c6fb 100644 --- a/models/Modes.hpp +++ b/models/Modes.hpp @@ -50,6 +50,8 @@ public: FreqCal, FT8, FT4, + FST280, + FST280W, MODES_END_SENTINAL_AND_COUNT // this must be last }; Q_ENUM (Mode) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 03144f51d..778ca321a 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -423,6 +423,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, ui->dxGridEntry->setValidator (new MaidenheadLocatorValidator {this}); ui->dxCallEntry->setValidator (new CallsignValidator {this}); ui->sbTR->values ({5, 10, 15, 30, 60, 120, 300}); + ui->sbTR_FST280W->values ({120, 300}); ui->decodedTextBrowser->set_configuration (&m_config, true); ui->decodedTextBrowser2->set_configuration (&m_config); @@ -5828,6 +5829,9 @@ void MainWindow::on_actionFST280_triggered() displayWidgets(nWidgets("111011000000111100010000000000000")); bool bVHF=m_config.enable_VHF_features(); setup_status_bar (bVHF); + m_TRperiod = ui->sbTR->value (); + ui->sbTR->setMinimum(15); + ui->sbTR->setMaximum(300); ui->sbSubmode->setMaximum(3); statusChanged(); } @@ -5839,9 +5843,14 @@ void MainWindow::on_actionFST280W_triggered() WSPR_config(true); ui->actionFST280W->setChecked(true); // 012345678901234567890123456789012 - displayWidgets(nWidgets("000000000000000001010000000000000")); + displayWidgets(nWidgets("000001000000000001010000000000000")); bool bVHF=m_config.enable_VHF_features(); setup_status_bar (bVHF); + m_TRperiod = ui->sbTR->value (); + ui->band_hopping_group_box->setVisible(false); + ui->sbTR->setMinimum(120); + ui->sbTR->setMaximum(300); + ui->sbSubmode->setMaximum(3); statusChanged(); } @@ -6464,6 +6473,7 @@ void MainWindow::WSPR_config(bool b) ui->label_7->setVisible(!b and ui->cbMenus->isChecked()); ui->logQSOButton->setVisible(!b); ui->DecodeButton->setEnabled(!b); + ui->band_hopping_group_box->setVisible(true); if(b and (m_mode!="Echo")) { QString t="UTC dB DT Freq Drift Call Grid dBm "; if(m_config.miles()) t += " mi"; diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index 88233bb8e..ccce59e4c 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -1039,7 +1039,7 @@ QPushButton[state="ok"] { - 0 + 1 @@ -1608,7 +1608,7 @@ When not checked you can view the calibration results. QTabWidget::Triangular - 0 + 1 @@ -2590,6 +2590,25 @@ list. The list can be maintained in Settings (F2). + + + + Qt::AlignCenter + + + s + + + T/R + + + 120 + + + 300 + + +