diff --git a/lib/ft8/foxgen.f90 b/lib/ft8/foxgen.f90 index 7167c69fc..652270d7e 100644 --- a/lib/ft8/foxgen.f90 +++ b/lib/ft8/foxgen.f90 @@ -22,7 +22,6 @@ subroutine foxgen() character*6 mygrid character*87 cbits character*88 cb88 - logical bcontest integer itone(NN) integer icos7(0:6) integer*1 msgbits(KK),codeword(3*ND),msgbits2 @@ -36,7 +35,6 @@ subroutine foxgen() equivalence (x,cx),(y,cy) data icos7/2,5,6,0,4,1,3/ !Costas 7x7 tone pattern - bcontest=.false. fstep=60.d0 dfreq=6.25d0 dt=1.d0/48000.d0 @@ -58,7 +56,7 @@ subroutine foxgen() msg=cmsg(n)(1:i1)//cmsg(n)(i2+1:i3-2)//' ' read(cmsg(n)(i4+2:i4+4),*) irpt endif - call genft8(msg,mygrid,bcontest,0,1,1,msgsent,msgbits,itone) + call genft8(msg,mygrid,0,1,1,msgsent,msgbits,itone) ! print*,'Foxgen:',n,cmsg(n),msgsent if(i3b.eq.1) then diff --git a/lib/ft8/ft8apset.f90 b/lib/ft8/ft8apset.f90 index d84845fd4..ce62d2fad 100644 --- a/lib/ft8/ft8apset.f90 +++ b/lib/ft8/ft8apset.f90 @@ -1,11 +1,10 @@ -subroutine ft8apset(mycall12,mygrid6,hiscall12,hisgrid6,bcontest,apsym) +subroutine ft8apset(mycall12,mygrid6,hiscall12,hisgrid6,apsym) parameter(NAPM=4,KK=87) character*12 mycall12,hiscall12 character*37 msg,msgsent character*6 mycall,hiscall character*6 mygrid6,hisgrid6 character*4 hisgrid - logical bcontest integer apsym(KK) integer*1 msgbits(KK) integer itone(KK) @@ -19,7 +18,7 @@ subroutine ft8apset(mycall12,mygrid6,hiscall12,hisgrid6,bcontest,apsym) i3=0 ! ### TEMPORARY ??? ### n3=0 !TEMPORARY isync=1 - call genft8(msg,mygrid6,bcontest,i3,n3,isync,msgsent,msgbits,itone) + call genft8(msg,mygrid6,i3,n3,isync,msgsent,msgbits,itone) apsym=2*msgbits-1 return end subroutine ft8apset diff --git a/lib/ft8/ft8b_1.f90 b/lib/ft8/ft8b_1.f90 index c2afbdbe9..089b66a3f 100644 --- a/lib/ft8/ft8b_1.f90 +++ b/lib/ft8/ft8b_1.f90 @@ -1,5 +1,5 @@ subroutine ft8b_1(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & - napwid,lsubtract,nagain,iaptype,mycall12,mygrid6,hiscall12,bcontest, & + napwid,lsubtract,nagain,iaptype,mycall12,mygrid6,hiscall12, & sync0,f1,xdt,xbase,apsym,nharderrors,dmin,nbadcrc,ipass,iera,msg37,xsnr) use crc @@ -11,7 +11,6 @@ subroutine ft8b_1(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & character*12 mycall12,hiscall12 character*6 mycall6,mygrid6,hiscall6,c1,c2 character*87 cbits - logical bcontest real a(5) real s1(0:7,ND),s2(0:7,NN),s1sort(8*ND) real ps(0:7),psl(0:7) @@ -386,7 +385,7 @@ subroutine ft8b_1(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & isync=1 msg37=' ' msg37(1:22)=message - call genft8(msg37,mygrid6,bcontest,i3,n3,isync,msgsent37,msgbits,itone) + call genft8(msg37,mygrid6,i3,n3,isync,msgsent37,msgbits,itone) if(lsubtract) call subtractft8(dd0,itone,f1,xdt2) xsig=0.0 xnoi=0.0 diff --git a/lib/ft8/ft8b_2.f90 b/lib/ft8/ft8b_2.f90 index 8ebfb6f95..4229b5029 100644 --- a/lib/ft8/ft8b_2.f90 +++ b/lib/ft8/ft8b_2.f90 @@ -1,5 +1,5 @@ -subroutine ft8b_2(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & - napwid,lsubtract,nagain,iaptype,mycall12,mygrid6,hiscall12,bcontest, & +subroutine ft8b_2(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & + napwid,lsubtract,nagain,iaptype,mycall12,mygrid6,hiscall12, & sync0,f1,xdt,xbase,apsym,nharderrors,dmin,nbadcrc,ipass,iera,msg37,xsnr) use crc @@ -12,7 +12,6 @@ subroutine ft8b_2(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & character*77 c77 character*6 mycall6,mygrid6,hiscall6,c1,c2 character*87 cbits - logical bcontest real a(5) real s8(0:7,NN) real s2(0:511),s2l(0:511) @@ -328,7 +327,7 @@ subroutine ft8b_2(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & call pack77(msg37,i3p,n3p,c77) ! Should we test for consistency between i3,n3 from codeword and i3,n3 from unpack77? !write(*,*) i3,n3,i3p,n3p,msg37 - call genft8_174_91(msg37,mygrid6,bcontest,i3,n3,msgsent37,msgbits,itone) + call genft8_174_91(msg37,mygrid6,i3,n3,msgsent37,msgbits,itone) if(lsubtract) call subtractft8(dd0,itone,f1,xdt) xsig=0.0 xnoi=0.0 diff --git a/lib/ft8/ft8sim.f90 b/lib/ft8/ft8sim.f90 index e88891a49..22d53cb0f 100644 --- a/lib/ft8/ft8sim.f90 +++ b/lib/ft8/ft8sim.f90 @@ -10,7 +10,6 @@ program ft8sim character arg*12,fname*17 character msg40*40,msg*22,msgsent*22,msg0*22 character*6 mygrid6 - logical bcontest complex c0(0:NMAX-1) complex c(0:NMAX-1) real wave(NMAX) @@ -54,7 +53,6 @@ program ft8sim f0=1500 endif - bcontest=nfiles.lt.0 nfiles=abs(nfiles) twopi=8.0*atan(1.0) fs=12000.0 !Sample rate (Hz) @@ -73,9 +71,9 @@ program ft8sim i3bit=0 msg=msg40(1:22) if(itype.eq.1) then - call genft8(msg,mygrid6,bcontest,i3bit,msgsent,msgbits,itone) + call genft8(msg,mygrid6,i3bit,msgsent,msgbits,itone) elseif(itype.eq.2) then - call genft8_174_91(msg,mygrid6,bcontest,i3bit,msgsent,msgbits,itone) + call genft8_174_91(msg,mygrid6,i3bit,msgsent,msgbits,itone) endif write(*,1000) f0,xdt,txt,snrdb,bw,msgsent 1000 format('f0:',f9.3,' DT:',f6.2,' TxT:',f6.1,' SNR:',f6.1, & @@ -114,9 +112,9 @@ program ft8sim f0=f0+100 endif if(itype.eq.1) then - call genft8(msg,mygrid6,bcontest,i3bit,msgsent,msgbits,itone) + call genft8(msg,mygrid6,i3bit,msgsent,msgbits,itone) elseif(itype.eq.2) then - call genft8_174_91(msg,mygrid6,bcontest,i3bit,msgsent,msgbits,itone) + call genft8_174_91(msg,mygrid6,i3bit,msgsent,msgbits,itone) endif endif if(nsig.eq.25) then @@ -137,9 +135,9 @@ program ft8sim f0=600.0 + mod(isig-1,5)*60.0 endif if(itype.eq.1) then - call genft8(msg,mygrid6,bcontest,i3bit,msgsent,msgbits,itone) + call genft8(msg,mygrid6,i3bit,msgsent,msgbits,itone) elseif(itype.eq.2) then - call genft8_174_91(msg,mygrid6,bcontest,i3bit,msgsent,msgbits,itone) + call genft8_174_91(msg,mygrid6,i3bit,msgsent,msgbits,itone) endif endif ! k=nint((xdt+0.5+0.01*gran())/dt) diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index 81d1ef15b..5192fbde3 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -47,7 +47,7 @@ contains real candidate(4,200) real dd(15*12000) logical, intent(in) :: lft8apon,lapcqonly,ldecode77,nagain - logical newdat,lsubtract,ldupe,bcontest + logical newdat,lsubtract,ldupe character*12 mycall12, hiscall12 character*6 mygrid6,hisgrid6 integer*2 iwave(15*12000) @@ -57,15 +57,14 @@ contains integer allsnrs(100) save s,dd - bcontest=iand(nexp_decode,128).ne.0 this%callback => callback write(datetime,1001) nutc !### TEMPORARY ### 1001 format("000000_",i6.6) - call ft8apset(mycall12,mygrid6,hiscall12,hisgrid6,bcontest,apsym1) + call ft8apset(mycall12,mygrid6,hiscall12,hisgrid6,apsym1) ! For now, turn off apset until we get basic functionality going... AP will ! need to be re-thinked for itype=2 messages. -! call ft8apset_174_91(mycall12,mygrid6,hiscall12,hisgrid6,bcontest,apsym2) +! call ft8apset_174_91(mycall12,mygrid6,hiscall12,hisgrid6,apsym2) apsym2=0 dd=iwave ndecodes=0 @@ -112,12 +111,12 @@ contains if(isync.eq.1) then call ft8b_1(dd,newdat,nQSOProgress,nfqso,nftx,ndepth,lft8apon, & lapcqonly,napwid,lsubtract,nagain,iaptype,mycall12,mygrid6, & - hiscall12,bcontest,sync,f1,xdt,xbase,apsym1,nharderrors,dmin, & + hiscall12,sync,f1,xdt,xbase,apsym1,nharderrors,dmin, & nbadcrc,iappass,iera,msg37,xsnr) else call ft8b_2(dd,newdat,nQSOProgress,nfqso,nftx,ndepth,lft8apon, & lapcqonly,napwid,lsubtract,nagain,iaptype,mycall12,mygrid6, & - hiscall12,bcontest,sync,f1,xdt,xbase,apsym2,nharderrors,dmin, & + hiscall12,sync,f1,xdt,xbase,apsym2,nharderrors,dmin, & nbadcrc,iappass,iera,msg37,xsnr) endif ! message=msg37(1:22) !### @@ -128,10 +127,6 @@ contains if(nbadcrc.eq.0) then ! call jtmsg(message,iflag) ! This probably needs to be re-visited for the new message type -! if(bcontest) then -! call fix_contest_msg(mygrid6,message) -! msg37(1:22)=message -! endif ! if(iand(iflag,31).ne.0) message(22:22)='?' ldupe=.false. do id=1,ndecodes