Move call to tx scheduler per Bill's instructions.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5539 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2015-06-05 15:36:29 +00:00
parent 7f5b86fd36
commit f12de9e9e6
2 changed files with 5 additions and 2 deletions

View File

@ -22,6 +22,7 @@ extern "C"
, int * ntxnext, int my_grid_len);
#endif
};
extern int next_tx_state(int pctx);
namespace
{
@ -265,6 +266,9 @@ auto WSPRBandHopping::next_hop () -> Hop
, &m_->gray_line_duration_, &m_->tx_percent_, &period_index, &band_index
, &tx_next, my_grid.size ());
// consult scheduler to determine if next period should be a tx interval
tx_next = next_tx_state(m_->tx_percent_);
if (100 == m_->tx_percent_)
{
tx_next = 1;

View File

@ -4296,8 +4296,7 @@ void MainWindow::bandHopping()
<< "tune:" << hop_data.tune_required_
<< "tx:" << hop_data.tx_next_;
// if (m_auto &&hop_data.tx_next_) {
if ( m_auto && next_tx_state(m_pctx) ) {
if (m_auto &&hop_data.tx_next_) {
m_nrx = 0;
} else {
m_nrx = 1;