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

Tentative reversal of recent change to set hound Tx frequency very late 

Changing the Hound  Tx audio offset just before starting  the Tx audio
stream is way too  late to have the Tx message  printed in the decodes
window with the correct frequency shown. If we intend to change the Tx
offset very  late like this  we are going to  be in trouble  with rigs
that  cannot do  CAT  while  transmitting since  PTT  will already  be
asserted.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8627 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2018-04-21 19:10:16 +00:00
parent 8f8dfdb120
commit dd8f28b309
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mainwindow.cpp
View File

@ -2981,6 +2981,7 @@ void MainWindow::readFromStdout() //readFromStdout
ui->txrb3->setChecked(true);
m_nFoxFreq=decodedtext.string().mid(16,4).toInt();
m_nSentFoxRrpt=1;
hound_QSY ();
if(!m_auto) auto_tx_mode(true);
}
} else {
@ -3001,6 +3002,7 @@ void MainWindow::readFromStdout() //readFromStdout
ui->txrb3->setChecked(true);
m_nFoxFreq=decodedtext.string().mid(16,4).toInt();
m_nSentFoxRrpt=1;
hound_QSY ();
if(!m_auto) auto_tx_mode(true);
}
}
@ -6167,17 +6169,6 @@ void MainWindow::transmit (double snr)
if(m_config.x2ToneSpacing()) toneSpacing=2*12000.0/1920.0;
if(m_config.x4ToneSpacing()) toneSpacing=4*12000.0/1920.0;
if(m_config.bFox() and !m_tune) toneSpacing=-1;
if(m_config.bHound() and !m_tune) {
if(m_ntx==1) m_nSentFoxRrpt=1;
if(m_ntx==3) {
if(m_nSentFoxRrpt==1) {
ui->TxFreqSpinBox->setValue(m_nFoxFreq);
} else {
ui->TxFreqSpinBox->setValue(m_nFoxFreq+300);
}
m_nSentFoxRrpt++;
}
}
Q_EMIT sendMessage (NUM_FT8_SYMBOLS,
1920.0, ui->TxFreqSpinBox->value () - m_XIT,
toneSpacing, m_soundOutput, m_config.audio_output_channel (),
@ -7276,6 +7267,21 @@ void MainWindow::write_transmit_entry (QString const& file_name)
// -------------------------- Code for FT8 DXpedition Mode ---------------------------
void MainWindow::hound_QSY ()
{
if(m_config.bHound() and !m_tune) {
if(m_ntx==1) m_nSentFoxRrpt=1;
if(m_ntx==3) {
if(m_nSentFoxRrpt==1) {
ui->TxFreqSpinBox->setValue(m_nFoxFreq);
} else {
ui->TxFreqSpinBox->setValue(m_nFoxFreq+300);
}
m_nSentFoxRrpt++;
}
}
}
void MainWindow::on_sbNlist_valueChanged(int n)
{
m_Nlist=n;

1
mainwindow.h
View File

@ -683,6 +683,7 @@ private:
, Frequency frequency
, QString const& his_call
, QString const& his_grid) const;
void hound_QSY ();
QString sortHoundCalls(QString t, int isort, int max_dB);
void rm_tb4(QString houndCall);
void read_wav_file (QString const& fname);