diff --git a/q65w/libq65/decode0.f90 b/q65w/libq65/decode0.f90 index 205924c86..542b8ca6d 100644 --- a/q65w/libq65/decode0.f90 +++ b/q65w/libq65/decode0.f90 @@ -49,9 +49,9 @@ subroutine decode0(dd,ss,savg) call timer('q65wa ',0) call q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & mousedf,mousefqso,nagain,ndecdone,nfshift,max_drift, & - nfcal,nsum,nxant,mycall,mygrid, & + nfcal,nsum,nxant,mycall, & hiscall,hisgrid,nhsym,nfsample, & - ndiskdat,nxpol,nmode,ndop00) + ndiskdat,nmode,ndop00) call timer('q65wa ',1) flush(6) diff --git a/q65w/libq65/q65wa.f90 b/q65w/libq65/q65wa.f90 index 2fa51089c..6b2dbdbe4 100644 --- a/q65w/libq65/q65wa.f90 +++ b/q65w/libq65/q65wa.f90 @@ -1,8 +1,8 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & mousedf,mousefqso,nagain,ndecdone,nfshift,max_drift, & - nfcal,nsum,nxant,mycall,mygrid, & + nfcal,nsum,nxant,mycall, & hiscall,hisgrid,nhsym,nfsample, & - ndiskdat,nxpol,nmode,ndop00) + ndiskdat,nmode,ndop00) ! Processes timf2 data from Linrad to find and decode JT65 and Q65 signals. @@ -11,13 +11,13 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & parameter (MAXMSG=1000) !Size of decoded message list parameter (NSMAX=60*96000) - complex cx(NSMAX/64), cy(NSMAX/64) !Data at 1378.125 samples/s + complex cx(NSMAX/64) !Data at 1378.125 samples/s real dd(4,NSMAX) real*4 ss(322,NFFT),savg(NFFT) real*8 fcenter character*3 shmsg0(4) - character mycall*12,hiscall*12,mygrid*6,hisgrid*6,cm*1 - logical xpol,bq65 + character mycall*12,hiscall*12,hisgrid*6,cm*1 + logical bq65 logical candec(MAX_CANDIDATES) logical ldecoded character blank*22 @@ -47,7 +47,6 @@ subroutine q65wa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, & mode_q65=nmode/10 nts_jt65=mode65 !JT65 tone separation factor nts_q65=2**(mode_q65-1) !Q65 tone separation factor - xpol=(nxpol.ne.0) ! No second decode for JT65? if(nhsym.eq.nhsym2 .and. nagain.eq.0 .and.ndiskdat.eq.0) mode65=0 diff --git a/q65w/libq65/txpol.f90 b/q65w/libq65/txpol.f90 deleted file mode 100644 index 042d3e549..000000000 --- a/q65w/libq65/txpol.f90 +++ /dev/null @@ -1,33 +0,0 @@ -subroutine txpol(xpol,decoded,mygrid,npol,nxant,ntxpol,cp) - -! If Tx station's grid is in decoded message, compute optimum TxPol - character*22 decoded - character*6 mygrid,grid - character*1 cp - logical xpol - - ntxpol=0 - i1=index(decoded,' ') - i2=index(decoded(i1+1:),' ') + i1 - grid=' ' - if(i2.ge.8 .and. i2.le.18) grid=decoded(i2+1:i2+4)//'mm' - ntxpol=0 - cp=' ' - if(xpol .and.grid(1:4).ne.'RR73') then - if(grid(1:1).ge.'A' .and. grid(1:1).le.'R' .and. & - grid(2:2).ge.'A' .and. grid(2:2).le.'R' .and. & - grid(3:3).ge.'0' .and. grid(3:3).le.'9' .and. & - grid(4:4).ge.'0' .and. grid(4:4).le.'9') then - ntxpol=mod(npol-nint(2.0*dpol(mygrid,grid))+720,180) - if(nxant.eq.0) then - cp='H' - if(ntxpol.gt.45 .and. ntxpol.le.135) cp='V' - else - cp='/' - if(ntxpol.ge.90 .and. ntxpol.lt.180) cp='\' - endif - endif - endif - - return -end subroutine txpol