w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-31 04:50:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-2.0.0-rc6' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc6

Browse Source
This commit is contained in:
Bill Somerville 2018-11-30 21:51:30 +00:00
commit 6bb1e6ac22
2 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/ft8/ft8b.f90
View File

@ -17,13 +17,11 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
real s8(0:7,NN) real s8(0:7,NN)
real s2(0:511),s2l(0:511) real s2(0:511),s2l(0:511)
real bmeta(174),bmetb(174),bmetc(174) 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 llra(174),llrb(174),llrc(174),llrd(174) !Soft symbols
real llral(174),llrbl(174),llrcl(174) !Soft symbols
real dd0(15*12000) real dd0(15*12000)
integer*1 message77(77),apmask(174),cw(174) integer*1 message77(77),apmask(174),cw(174)
integer apsym(58) 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 mrrr(19),m73(19),mrr73(19)
integer itone(NN) integer itone(NN)
integer icos7(0:6),ip(1) 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 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 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 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 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 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/ 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 mcqfd=2*mcqfd-1
mcqru=2*mcqru-1 mcqru=2*mcqru-1
mcqtest=2*mcqtest-1 mcqtest=2*mcqtest-1
mcqhund=2*mcqhund-1
mrrr=2*mrrr-1 mrrr=2*mrrr-1
m73=2*m73-1 m73=2*m73-1
mrr73=2*mrr73-1 mrr73=2*mrr73-1
@ -205,37 +201,26 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
do ib=0,ibmax do ib=0,ibmax
bm=maxval(s2(0:nt-1),one(0:nt-1,ibmax-ib)) - & bm=maxval(s2(0:nt-1),one(0:nt-1,ibmax-ib)) - &
maxval(s2(0:nt-1),.not.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(i32+ib .gt.174) cycle
if(nsym.eq.1) then if(nsym.eq.1) then
bmeta(i32+ib)=bm bmeta(i32+ib)=bm
! bmetal(i32+ib)=bml
elseif(nsym.eq.2) then elseif(nsym.eq.2) then
bmetb(i32+ib)=bm bmetb(i32+ib)=bm
! bmetbl(i32+ib)=bml
elseif(nsym.eq.3) then elseif(nsym.eq.3) then
bmetc(i32+ib)=bm bmetc(i32+ib)=bm
! bmetcl(i32+ib)=bml
endif endif
enddo enddo
enddo enddo
enddo enddo
enddo enddo
call normalizebmet(bmeta,174) call normalizebmet(bmeta,174)
! call normalizebmet(bmetal,174)
call normalizebmet(bmetb,174) call normalizebmet(bmetb,174)
! call normalizebmet(bmetbl,174)
call normalizebmet(bmetc,174) call normalizebmet(bmetc,174)
! call normalizebmet(bmetcl,174)
scalefac=2.83 scalefac=2.83
llra=scalefac*bmeta llra=scalefac*bmeta
! llral=scalefac*bmetal
llrb=scalefac*bmetb llrb=scalefac*bmetb
! llrbl=scalefac*bmetbl
llrc=scalefac*bmetc llrc=scalefac*bmetc
! llrcl=scalefac*bmetcl
apmag=maxval(abs(llra))*1.01 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.2) llrd(1:29)=apmag*mcqtest(1:29)
if(ncontest.eq.3) llrd(1:29)=apmag*mcqfd(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.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 apmask(75:77)=1
llrd(75:76)=apmag*(-1) llrd(75:76)=apmag*(-1)
llrd(77)=apmag*(+1) llrd(77)=apmag*(+1)

24
widgets/mainwindow.cpp
View File

@ -955,17 +955,17 @@ void MainWindow::not_GA_warning_message ()
QDateTime timeout=QDateTime(QDate(2018,12,31)); QDateTime timeout=QDateTime(QDate(2018,12,31));
MessageBox::critical_message (this, MessageBox::critical_message (this,
"This version of WSJT-X is a beta-level Release Candidate.\n\n" "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" "IMPORTANT: WSJT-X 2.0 cannot communicate with other\n"
"message formats. It will not decode 75-bit or 72-bit\n" "stations using the FT8 or MSK144 protocols in WSJT-X v1.9.1\n"
"messages.\n\n" "or earlier.\n\n"
"On December 10, 2018, 77-bit messages will become the\n" "On December 10, 2018, the new FT8 and MSK144 protocols\n"
"standard. Everyone should upgrade to WSJT-X 2.0 by\n" "will become the standard. Everyone should upgrade to\n"
"January 1, 2019.\n\n" "WSJT-X 2.0 by January 1, 2019.\n\n"
"On-the-air use carries an obligation to report problems\n" "On-the-air use carries an obligation to report problems\n"
"to the WSJT Development group and to upgrade to a GA\n" "to the WSJT Development group and to upgrade to a GA\n"
"(General Availability) release when it becomes available.\n\n" "(General Availability) release when it becomes available.\n\n"
"This version cannot be used after December 31, 2018.\n\n"); "This version cannot be used after December 31, 2018.\n\n");
if(now.daysTo(timeout) < 0) Q_EMIT finished(); if(now.daysTo(timeout) < 0) Q_EMIT finished();
} }
@ -5638,7 +5638,7 @@ void MainWindow::on_actionJT9_triggered()
m_bFastMode=m_bFast9; m_bFastMode=m_bFast9;
WSPR_config(false); WSPR_config(false);
switch_mode (Modes::JT9); switch_mode (Modes::JT9);
if(m_modeTx!="JT9") on_pbTxMode_clicked(); m_modeTx="JT9";
m_nsps=6912; m_nsps=6912;
m_FFTSize = m_nsps / 2; m_FFTSize = m_nsps / 2;
Q_EMIT FFTSize (m_FFTSize); Q_EMIT FFTSize (m_FFTSize);