From fd5c76e9b31fb96f2e2fc252146cc937843704aa Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Tue, 9 Jun 2015 16:56:49 +0000 Subject: [PATCH] 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 --- WSPRBandHopping.cpp | 6 ++++-- mainwindow.cpp | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WSPRBandHopping.cpp b/WSPRBandHopping.cpp index f8309921a..4eaf02ca0 100644 --- a/WSPRBandHopping.cpp +++ b/WSPRBandHopping.cpp @@ -348,10 +348,12 @@ auto WSPRBandHopping::next_hop () -> Hop // target_bands.removeOne (band); // } - // remove bands that are not enabled for hopping 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 ()); } diff --git a/mainwindow.cpp b/mainwindow.cpp index 91e8de2a6..43226af28 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -108,6 +108,7 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme m_detector (RX_SAMPLE_RATE, NTMAX, 6912 / 2, downSampleFactor), m_modulator (TX_SAMPLE_RATE, NTMAX), m_audioThread {new QThread}, + m_XIT {0}, m_pctx {0}, m_diskData {false}, m_sentFirst73 {false},