From cd56c2a84014ae0f89190ea7f34f132ea4a49d26 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 28 Nov 2018 09:20:43 -0500 Subject: [PATCH 1/5] Improved wording and formatting of startup message. --- widgets/mainwindow.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 664208252..6124be448 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -943,17 +943,17 @@ void MainWindow::not_GA_warning_message () QDateTime timeout=QDateTime(QDate(2018,12,31)); MessageBox::critical_message (this, - "This version of WSJT-X is a beta-level Release Candidate.\n\n" - "In FT8 and MSK144 modes it uses ONLY the new 77-bit\n" - "message formats. It will not decode 75-bit or 72-bit\n" - "messages.\n\n" - "On December 10, 2018, 77-bit messages will become the\n" - "standard. Everyone should upgrade to WSJT-X 2.0 by\n" - "January 1, 2019.\n\n" - "On-the-air use carries an obligation to report problems\n" - "to the WSJT Development group and to upgrade to a GA\n" - "(General Availability) release when it becomes available.\n\n" - "This version cannot be used after December 31, 2018.\n\n"); + "This version of WSJT-X is a beta-level Release Candidate.\n\n" + "IMPORTANT: WSJT-X 2.0 cannot communicate with other\n" + "stations using the FT8 or MSK144 protocols in WSJT-X v1.9.1\n" + "or earlier.\n\n" + "On December 10, 2018, the new FT8 and MSK144 protocols\n" + "will become the standard. Everyone should upgrade to\n" + "WSJT-X 2.0 by January 1, 2019.\n\n" + "On-the-air use carries an obligation to report problems\n" + "to the WSJT Development group and to upgrade to a GA\n" + "(General Availability) release when it becomes available.\n\n" + "This version cannot be used after December 31, 2018.\n\n"); if(now.daysTo(timeout) < 0) Q_EMIT finished(); } From c8aee58fe083bca5fbf7fa28770b03a6315c0e41 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 30 Nov 2018 11:50:44 -0500 Subject: [PATCH 2/5] Trial code for assigning F1 - F5 to contesting use. --- widgets/mainwindow.cpp | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 6124be448..0af816095 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1829,6 +1829,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e) } int n; + bool bContest = m_config.my_callsign()=="K1JT" and SpecOp::RTTY==m_config.special_op_id(); switch(e->key()) { case Qt::Key_D: @@ -1842,21 +1843,51 @@ void MainWindow::keyPressEvent (QKeyEvent * e) } break; case Qt::Key_F1: + if(bContest) { + auto_tx_mode(true); + on_txb6_clicked(); + return; + } else { on_actionOnline_User_Guide_triggered(); return; + } case Qt::Key_F2: + if(bContest) { + auto_tx_mode(true); + on_txb2_clicked(); + return; + } else { on_actionSettings_triggered(); return; + } case Qt::Key_F3: + if(bContest) { + auto_tx_mode(true); + on_txb3_clicked(); + return; + } else { on_actionKeyboard_shortcuts_triggered(); return; + } case Qt::Key_F4: + if(bContest) { + auto_tx_mode(true); + on_txb4_clicked(); + return; + } else { clearDX (); ui->dxCallEntry->setFocus(); return; + } case Qt::Key_F5: + if(bContest) { + auto_tx_mode(true); + on_txb5_clicked(); + return; + } else { on_actionSpecial_mouse_commands_triggered(); return; + } case Qt::Key_F6: if(e->modifiers() & Qt::ShiftModifier) { on_actionDecode_remaining_files_in_directory_triggered(); From d857f7745cc0ff8f200228a6f0582d74ea92b6dc Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 30 Nov 2018 12:20:06 -0500 Subject: [PATCH 3/5] Revert "Trial code for assigning F1 - F5 to contesting use." This reverts commit c8aee58fe083bca5fbf7fa28770b03a6315c0e41. --- widgets/mainwindow.cpp | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index fec7487fe..af8fca7d5 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1843,7 +1843,6 @@ void MainWindow::keyPressEvent (QKeyEvent * e) } int n; - bool bContest = m_config.my_callsign()=="K1JT" and SpecOp::RTTY==m_config.special_op_id(); switch(e->key()) { case Qt::Key_D: @@ -1857,51 +1856,21 @@ void MainWindow::keyPressEvent (QKeyEvent * e) } break; case Qt::Key_F1: - if(bContest) { - auto_tx_mode(true); - on_txb6_clicked(); - return; - } else { on_actionOnline_User_Guide_triggered(); return; - } case Qt::Key_F2: - if(bContest) { - auto_tx_mode(true); - on_txb2_clicked(); - return; - } else { on_actionSettings_triggered(); return; - } case Qt::Key_F3: - if(bContest) { - auto_tx_mode(true); - on_txb3_clicked(); - return; - } else { on_actionKeyboard_shortcuts_triggered(); return; - } case Qt::Key_F4: - if(bContest) { - auto_tx_mode(true); - on_txb4_clicked(); - return; - } else { clearDX (); ui->dxCallEntry->setFocus(); return; - } case Qt::Key_F5: - if(bContest) { - auto_tx_mode(true); - on_txb5_clicked(); - return; - } else { on_actionSpecial_mouse_commands_triggered(); return; - } case Qt::Key_F6: if(e->modifiers() & Qt::ShiftModifier) { on_actionDecode_remaining_files_in_directory_triggered(); From df37d9b1f7b5d2ae5ea9b6ad7df28a6d77af79d5 Mon Sep 17 00:00:00 2001 From: Steve Franke Date: Fri, 30 Nov 2018 13:46:54 -0600 Subject: [PATCH 4/5] Remove cqhund stuff and some other unused code. --- lib/ft8/ft8b.f90 | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/lib/ft8/ft8b.f90 b/lib/ft8/ft8b.f90 index 68d148c65..83a6a9cbf 100644 --- a/lib/ft8/ft8b.f90 +++ b/lib/ft8/ft8b.f90 @@ -17,13 +17,11 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & real s8(0:7,NN) real s2(0:511),s2l(0:511) real bmeta(174),bmetb(174),bmetc(174) - real bmetal(174),bmetbl(174),bmetcl(174) real llra(174),llrb(174),llrc(174),llrd(174) !Soft symbols - real llral(174),llrbl(174),llrcl(174) !Soft symbols real dd0(15*12000) integer*1 message77(77),apmask(174),cw(174) integer apsym(58) - integer mcq(29),mcqru(29),mcqfd(29),mcqtest(29),mcqhund(29) + integer mcq(29),mcqru(29),mcqfd(29),mcqtest(29) integer mrrr(19),m73(19),mrr73(19) integer itone(NN) integer icos7(0:6),ip(1) @@ -43,7 +41,6 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & data mcqru/0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,1,1,1,0,0,1,1,0,0/ data mcqfd/0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,1,0,0,0,1,0/ data mcqtest/0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,1,0,1,0,1,1,1,1,1,1,0,0,1,0/ - data mcqhund/0,0,0,0,0,0,0,0,0,0,1,0,1,0,1,0,1,0,0,0,0,1,0,0,1,1,1,0,0/ data mrrr/0,1,1,1,1,1,1,0,1,0,0,1,0,0,1,0,0,0,1/ data m73/0,1,1,1,1,1,1,0,1,0,0,1,0,1,0,0,0,0,1/ data mrr73/0,1,1,1,1,1,1,0,0,1,1,1,0,1,0,1,0,0,1/ @@ -57,7 +54,6 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & mcqfd=2*mcqfd-1 mcqru=2*mcqru-1 mcqtest=2*mcqtest-1 - mcqhund=2*mcqhund-1 mrrr=2*mrrr-1 m73=2*m73-1 mrr73=2*mrr73-1 @@ -205,37 +201,26 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & do ib=0,ibmax bm=maxval(s2(0:nt-1),one(0:nt-1,ibmax-ib)) - & maxval(s2(0:nt-1),.not.one(0:nt-1,ibmax-ib)) -! bml=maxval(s2l(0:nt-1),one(0:nt-1,ibmax-ib)) - & -! maxval(s2l(0:nt-1),.not.one(0:nt-1,ibmax-ib)) if(i32+ib .gt.174) cycle if(nsym.eq.1) then bmeta(i32+ib)=bm -! bmetal(i32+ib)=bml elseif(nsym.eq.2) then bmetb(i32+ib)=bm -! bmetbl(i32+ib)=bml elseif(nsym.eq.3) then bmetc(i32+ib)=bm -! bmetcl(i32+ib)=bml endif enddo enddo enddo enddo call normalizebmet(bmeta,174) -! call normalizebmet(bmetal,174) call normalizebmet(bmetb,174) -! call normalizebmet(bmetbl,174) call normalizebmet(bmetc,174) -! call normalizebmet(bmetcl,174) scalefac=2.83 llra=scalefac*bmeta -! llral=scalefac*bmetal llrb=scalefac*bmetb -! llrbl=scalefac*bmetbl llrc=scalefac*bmetc -! llrcl=scalefac*bmetcl apmag=maxval(abs(llra))*1.01 @@ -300,7 +285,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & if(ncontest.eq.2) llrd(1:29)=apmag*mcqtest(1:29) if(ncontest.eq.3) llrd(1:29)=apmag*mcqfd(1:29) if(ncontest.eq.4) llrd(1:29)=apmag*mcqru(1:29) - if(ncontest.eq.6) llrd(1:29)=apmag*mcqhund(1:29) + if(ncontest.eq.6) llrd(1:29)=apmag*mcq(1:29) apmask(75:77)=1 llrd(75:76)=apmag*(-1) llrd(77)=apmag*(+1) From d08ee43fc61c2bb8a919a4ad2c9a64f26e09b6fc Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 30 Nov 2018 15:52:11 -0500 Subject: [PATCH 5/5] Set m_mode_Tx="JT9" when mode is switched to JT9. --- widgets/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index af8fca7d5..97e025931 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -5638,7 +5638,7 @@ void MainWindow::on_actionJT9_triggered() m_bFastMode=m_bFast9; WSPR_config(false); switch_mode (Modes::JT9); - if(m_modeTx!="JT9") on_pbTxMode_clicked(); + m_modeTx="JT9"; m_nsps=6912; m_FFTSize = m_nsps / 2; Q_EMIT FFTSize (m_FFTSize);