w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-15 08:31:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up recent fixes for Hound frequency shifts

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8629 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2018-04-22 12:32:32 +00:00
parent e2181935ea
commit f4b6d51bcd
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mainwindow.cpp
View File

@ -2977,12 +2977,8 @@ void MainWindow::readFromStdout() //readFromStdout
if(w.at(2)==m_config.my_callsign() and ui->tx3->text().length()>0) { if(w.at(2)==m_config.my_callsign() and ui->tx3->text().length()>0) {
m_rptRcvd=w.at(4); m_rptRcvd=w.at(4);
m_rptSent=decodedtext.string().mid(7,3); m_rptSent=decodedtext.string().mid(7,3);
//### Select TX3, set random TxFreq in [300-900], and Force Auto ON. ###
ui->txrb3->setChecked(true);
m_nFoxFreq=decodedtext.string().mid(16,4).toInt(); m_nFoxFreq=decodedtext.string().mid(16,4).toInt();
m_nSentFoxRrpt=1; hound_reply ();
hound_QSY ();
if(!m_auto) auto_tx_mode(true);
} }
} else { } else {
QStringList w=decodedtext.string().mid(24).split(" ",QString::SkipEmptyParts); QStringList w=decodedtext.string().mid(24).split(" ",QString::SkipEmptyParts);
@ -2998,12 +2994,8 @@ void MainWindow::readFromStdout() //readFromStdout
(w.at(2).mid(0,1)=="+" or w.at(2).mid(0,1)=="-")) { (w.at(2).mid(0,1)=="+" or w.at(2).mid(0,1)=="-")) {
m_rptRcvd=w.at(2); m_rptRcvd=w.at(2);
m_rptSent=decodedtext.string().mid(7,3); m_rptSent=decodedtext.string().mid(7,3);
//### Select TX3, set random TxFreq in [300-900], and Force Auto ON. ###
ui->txrb3->setChecked(true);
m_nFoxFreq=decodedtext.string().mid(16,4).toInt(); m_nFoxFreq=decodedtext.string().mid(16,4).toInt();
m_nSentFoxRrpt=1; hound_reply ();
hound_QSY ();
if(!m_auto) auto_tx_mode(true);
} }
} }
} }
@ -3316,10 +3308,12 @@ void MainWindow::guiUpdate()
g_iptt = 1; g_iptt = 1;
setRig (); setRig ();
if(m_mode=="FT8") { if(m_mode=="FT8") {
if (m_config.bFox() and ui->TxFreqSpinBox->value() > 900) { if (m_config.bFox()) {
ui->TxFreqSpinBox->setValue(300); if (ui->TxFreqSpinBox->value() > 900) {
ui->TxFreqSpinBox->setValue(300);
}
} }
if (m_config.bHound ()) { else if (m_config.bHound ()) {
if(m_auto && !m_tune) { if(m_auto && !m_tune) {
if (ui->TxFreqSpinBox->value() < 999 && m_ntx != 3) { if (ui->TxFreqSpinBox->value() < 999 && m_ntx != 3) {
int nf = (qrand() % 2000) + 1000; // Hound randomized range: 1000-3000 Hz int nf = (qrand() % 2000) + 1000; // Hound randomized range: 1000-3000 Hz
@ -3327,7 +3321,8 @@ void MainWindow::guiUpdate()
} }
} }
if (m_nSentFoxRrpt == 2) { if (m_nSentFoxRrpt == 2) {
ui->TxFreqSpinBox->setValue(m_nFoxFreq+300); // move off the original Fox frequency on subsequent tries
ui->TxFreqSpinBox->setValue (m_nFoxFreq + 300);
} }
if (m_nSentFoxRrpt == 1) { if (m_nSentFoxRrpt == 1) {
++m_nSentFoxRrpt; ++m_nSentFoxRrpt;
@ -7279,12 +7274,14 @@ void MainWindow::write_transmit_entry (QString const& file_name)
// -------------------------- Code for FT8 DXpedition Mode --------------------------- // -------------------------- Code for FT8 DXpedition Mode ---------------------------
void MainWindow::hound_QSY () void MainWindow::hound_reply ()
{ {
if(m_auto && !m_tune) { if (!m_tune) {
if (m_ntx==3 && m_nSentFoxRrpt==1) { //### Select TX3, set random TxFreq in [300-900], and Force Auto ON. ###
ui->TxFreqSpinBox->setValue(m_nFoxFreq); ui->txrb3->setChecked (true);
} m_nSentFoxRrpt = 1;
if (!m_auto) auto_tx_mode(true);
ui->TxFreqSpinBox->setValue (m_nFoxFreq);
} }
} }

2
mainwindow.h
View File

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