Merge branch 'develop' into feat-map65-integration

This commit is contained in:
Bill Somerville 2021-04-22 14:24:50 +01:00
commit 0e56df58da
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 2 additions and 2 deletions

View File

@ -473,7 +473,6 @@ auto WSPRBandHopping::next_hop (bool tx_enabled) -> Hop
, frequencies_index >= 0 // new band , frequencies_index >= 0 // new band
&& tx_enabled // transmit is allowed && tx_enabled // transmit is allowed
&& !tx_next // not going to Tx anyway
&& m_->bands_[4].testBit (band_index) // tune up required && m_->bands_[4].testBit (band_index) // tune up required
&& !m_->bands_[5].testBit (band_index) // not an Rx only band && !m_->bands_[5].testBit (band_index) // not an Rx only band

View File

@ -24,7 +24,8 @@ class QWidget;
// //
// Along with selecting bands a flag indicating that a short tune up // Along with selecting bands a flag indicating that a short tune up
// signal is required for specified bands before they are used for // signal is required for specified bands before they are used for
// receive. // transmit or receive, unless they are flagged as Rx Only (intended
// to protect Rx active aerials and non-licensed bands).
// //
// Provides a Qt property that holds the Tx percentage which is used // Provides a Qt property that holds the Tx percentage which is used
// to generate a semi-randomized schedule of period to transmit. This // to generate a semi-randomized schedule of period to transmit. This