Exclude Rx only bands from WSPR band hopping random selections

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5564 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-06-09 16:56:49 +00:00
parent 9d1a534aa0
commit fd5c76e9b3
2 changed files with 5 additions and 2 deletions

View File

@ -348,10 +348,12 @@ auto WSPRBandHopping::next_hop () -> Hop
// target_bands.removeOne (band); // target_bands.removeOne (band);
// } // }
// remove bands that are not enabled for hopping
for (auto i = 0; i < m_->bands_[period_index].size (); ++i) for (auto i = 0; i < m_->bands_[period_index].size (); ++i)
{ {
if (!m_->bands_[period_index].testBit (i)) // remove bands that are not enabled for hopping in this phase
if (!m_->bands_[period_index].testBit (i)
// remove Rx only bands if we are wanting to transmit
|| (tx_next && m_->bands_[5].testBit (i)))
{ {
target_bands.removeOne (bands->data (bands->index (i, 0)).toString ()); target_bands.removeOne (bands->data (bands->index (i, 0)).toString ());
} }

View File

@ -108,6 +108,7 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
m_detector (RX_SAMPLE_RATE, NTMAX, 6912 / 2, downSampleFactor), m_detector (RX_SAMPLE_RATE, NTMAX, 6912 / 2, downSampleFactor),
m_modulator (TX_SAMPLE_RATE, NTMAX), m_modulator (TX_SAMPLE_RATE, NTMAX),
m_audioThread {new QThread}, m_audioThread {new QThread},
m_XIT {0},
m_pctx {0}, m_pctx {0},
m_diskData {false}, m_diskData {false},
m_sentFirst73 {false}, m_sentFirst73 {false},