w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-24 10:22:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various updates to UDP Message Protocol handling for FST4W

Browse Source 
Corresponding updates to the message_aggregator reference application.
This commit is contained in:
Bill Somerville 2020-10-13 16:46:38 +01:00
parent 1995d762bb
commit 518207da3b
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UDPExamples/ClientWidget.cpp
View File

@ -184,10 +184,10 @@ ClientWidget::ClientWidget (QAbstractItemModel * decodes_model, QAbstractItemMod
message_line_edit_->setValidator (&message_validator); message_line_edit_->setValidator (&message_validator);
grid_line_edit_->setValidator (&locator_validator); grid_line_edit_->setValidator (&locator_validator);
dx_grid_line_edit_->setValidator (&locator_validator); dx_grid_line_edit_->setValidator (&locator_validator);
tr_period_spin_box_->setRange (5, 30); tr_period_spin_box_->setRange (5, 1800);
tr_period_spin_box_->setSuffix (" s"); tr_period_spin_box_->setSuffix (" s");
rx_df_spin_box_->setRange (200, 5000); rx_df_spin_box_->setRange (200, 5000);
frequency_tolerance_spin_box_->setRange (10, 1000); frequency_tolerance_spin_box_->setRange (1, 1000);
frequency_tolerance_spin_box_->setPrefix ("\u00b1"); frequency_tolerance_spin_box_->setPrefix ("\u00b1");
frequency_tolerance_spin_box_->setSuffix (" Hz"); frequency_tolerance_spin_box_->setSuffix (" Hz");

54
widgets/mainwindow.cpp
View File

@ -8296,12 +8296,22 @@ void MainWindow::statusUpdate () const
if (!ui || m_block_udp_status_updates) return; if (!ui || m_block_udp_status_updates) return;
auto submode = current_submode (); auto submode = current_submode ();
auto ftol = ui->sbFtol->value (); auto ftol = ui->sbFtol->value ();
if (!(ui->sbFtol->isVisible () && ui->sbFtol->isEnabled ())) if ("FST4W" == m_mode)
{
ftol = ui->sbFST4W_FTol->value ();
}
else if (!(ui->sbFtol->isVisible () && ui->sbFtol->isEnabled ()))
{ {
ftol = quint32_max; ftol = quint32_max;
} }
auto tr_period = ui->sbTR->value (); auto tr_period = ui->sbTR->value ();
if (!(ui->sbTR->isVisible () && ui->sbTR->isEnabled ())) auto rx_frequency = ui->RxFreqSpinBox->value ();
if ("FST4W" == m_mode)
{
tr_period = ui->sbTR_FST4W->value ();
rx_frequency = ui->sbFST4W_RxFreq->value ();
}
else if (!(ui->sbTR->isVisible () && ui->sbTR->isEnabled ()))
{ {
tr_period = quint32_max; tr_period = quint32_max;
} }
@ -8309,7 +8319,7 @@ void MainWindow::statusUpdate () const
QString::number (ui->rptSpinBox->value ()), QString::number (ui->rptSpinBox->value ()),
m_modeTx, ui->autoButton->isChecked (), m_modeTx, ui->autoButton->isChecked (),
m_transmitting, m_decoderBusy, m_transmitting, m_decoderBusy,
ui->RxFreqSpinBox->value (), ui->TxFreqSpinBox->value (), rx_frequency, ui->TxFreqSpinBox->value (),
m_config.my_callsign (), m_config.my_grid (), m_config.my_callsign (), m_config.my_grid (),
m_hisGrid, m_tx_watchdog, m_hisGrid, m_tx_watchdog,
submode != QChar::Null ? QString {submode} : QString {}, m_bFastMode, submode != QChar::Null ? QString {submode} : QString {}, m_bFastMode,
@ -9215,9 +9225,19 @@ void MainWindow::remote_configure (QString const& mode, quint32 frequency_tolera
{ {
set_mode (mode); set_mode (mode);
} }
if (frequency_tolerance != quint32_max && ui->sbFtol->isVisible ()) auto is_FST4W = "FST4W" == m_mode;
if (frequency_tolerance != quint32_max && (ui->sbFtol->isVisible () || is_FST4W))
{ {
ui->sbFtol->setValue (frequency_tolerance); m_block_udp_status_updates = true;
if (is_FST4W)
{
ui->sbFST4W_FTol->setValue (frequency_tolerance);
}
else
{
ui->sbFtol->setValue (frequency_tolerance);
}
m_block_udp_status_updates = false;
} }
if (submode.size () && ui->sbSubmode->isVisible ()) if (submode.size () && ui->sbSubmode->isVisible ())
{ {
@ -9229,14 +9249,30 @@ void MainWindow::remote_configure (QString const& mode, quint32 frequency_tolera
} }
if (tr_period != quint32_max && ui->sbTR->isVisible ()) if (tr_period != quint32_max && ui->sbTR->isVisible ())
{ {
ui->sbTR->setValue (tr_period); if (is_FST4W)
ui->sbTR->interpretText (); {
ui->sbTR_FST4W->setValue (tr_period);
ui->sbTR_FST4W->interpretText ();
}
else
{
ui->sbTR->setValue (tr_period);
ui->sbTR->interpretText ();
}
} }
if (rx_df != quint32_max && ui->RxFreqSpinBox->isVisible ()) if (rx_df != quint32_max && ui->RxFreqSpinBox->isVisible ())
{ {
m_block_udp_status_updates = true; m_block_udp_status_updates = true;
ui->RxFreqSpinBox->setValue (rx_df); if (is_FST4W)
ui->RxFreqSpinBox->interpretText (); {
ui->sbFST4W_RxFreq->setValue (rx_df);
ui->sbFST4W_RxFreq->interpretText ();
}
else
{
ui->RxFreqSpinBox->setValue (rx_df);
ui->RxFreqSpinBox->interpretText ();
}
m_block_udp_status_updates = false; m_block_udp_status_updates = false;
} }
if (dx_call.size () && ui->dxCallEntry->isVisible ()) if (dx_call.size () && ui->dxCallEntry->isVisible ())