Force tx schedule update when pctx changes

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5534 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2015-06-05 00:41:12 +00:00
parent e25807b8d0
commit ba05cbf1f0
3 changed files with 3 additions and 5 deletions

View File

@ -160,9 +160,10 @@ int next_tx_state(int pctx)
int tx_20min_slot = (hour-tx_2hr_slot*2)*3 + minute/20;
int tx_2min_slot = (minute%20)/2;
if( tx_2hr_slot != tx_table_2hr_slot ) {
if( (tx_2hr_slot != tx_table_2hr_slot) || (tx_table_pctx != pctx) ) {
create_tx_schedule(pctx);
tx_table_2hr_slot = tx_2hr_slot;
tx_table_pctx = pctx;
}
cout << "Hour " << hour << " Minute " << minute << endl;

View File

@ -7,7 +7,7 @@
using namespace std;
char tx[6][10];
int tx_table_2hr_slot=-1;
int tx_table_2hr_slot=-1, tx_table_pctx=0;
int tx_band_sum(char bsum[10]);
int tx_add_to_band(int band);

View File

@ -4290,9 +4290,6 @@ void MainWindow::bandHopping()
<< "tune:" << hop_data.tune_required_
<< "tx:" << hop_data.tx_next_;
int blah = next_tx_state(m_pctx);
printf("next tx state %d\n",blah);
// if (m_auto &&hop_data.tx_next_) {
if ( m_auto && next_tx_state(m_pctx) ) {
m_nrx = 0;