diff --git a/lib/extract.f90 b/lib/extract.f90 index a6514fe..b9fed93 100644 --- a/lib/extract.f90 +++ b/lib/extract.f90 @@ -209,7 +209,7 @@ subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip, & tmp(i)=correct(64-i) enddo correct(1:63)=tmp(1:63) - call interleave63(correct,63,1) + call interleave63(correct,1) call graycode65(correct,63,1) call unpackmsg(dat4,decoded,.false.,' ') !Unpack the user message ncount=0 diff --git a/lib/ft8/filt8.f90 b/lib/ft8/filt8.f90 index aeacf2a..6b39c04 100644 --- a/lib/ft8/filt8.f90 +++ b/lib/ft8/filt8.f90 @@ -9,7 +9,7 @@ subroutine filt8(f0,nslots,width,wave) equivalence (x,cx) x=wave - call four2a(x,NFFT,1,-1,0) !r2c + call four2a(cx,NFFT,1,-1,0) !r2c df=12000.0/NFFT fa=f0 - 0.5*6.25 fb=f0 + 7.5*6.25 + (nslots-1)*60.0 @@ -35,7 +35,7 @@ subroutine filt8(f0,nslots,width,wave) !### if(nslots.ne.99) return x=wave - call four2a(x,NFFT,1,-1,0) !r2c + call four2a(cx,NFFT,1,-1,0) !r2c do i=0,NH s1(i)=real(cx(i))**2 + aimag(cx(i))**2 enddo diff --git a/lib/ft8/foxfilt.f90 b/lib/ft8/foxfilt.f90 index 15312e2..5380dda 100644 --- a/lib/ft8/foxfilt.f90 +++ b/lib/ft8/foxfilt.f90 @@ -10,7 +10,7 @@ subroutine foxfilt(nslots,nfreq,width,wave) x(1:NWAVE)=wave x(NWAVE+1:)=0. - call four2a(x,NFFT,1,-1,0) !r2c + call four2a(cx,NFFT,1,-1,0) !r2c df=48000.0/NFFT fa=nfreq - 0.5*6.25 fb=nfreq + 7.5*6.25 + (nslots-1)*(width+OFFSET) diff --git a/lib/js8/ldpcsim174js8a.f90 b/lib/js8/ldpcsim174js8a.f90 index 299ca65..f13a514 100644 --- a/lib/js8/ldpcsim174js8a.f90 +++ b/lib/js8/ldpcsim174js8a.f90 @@ -94,7 +94,7 @@ allocate ( rxdata(N), llr(N) ) i1Msg8BitBytes(10:11)=0 checksum = crc12 (c_loc (i1Msg8BitBytes), 11) - checksum = xor(checksum, 42) ! TODO: jsherer - could change the crc here + checksum = xor(checksum, 42_2) ! TODO: jsherer - could change the crc here ! For reference, the next 3 lines show how to check the CRC i1Msg8BitBytes(10)=checksum/256 i1Msg8BitBytes(11)=iand(checksum,transfer(255,0_2)) diff --git a/lib/js8/ldpcsim174js8b.f90 b/lib/js8/ldpcsim174js8b.f90 index de047d3..c1d51e7 100644 --- a/lib/js8/ldpcsim174js8b.f90 +++ b/lib/js8/ldpcsim174js8b.f90 @@ -94,7 +94,7 @@ allocate ( rxdata(N), llr(N) ) i1Msg8BitBytes(10:11)=0 checksum = crc12 (c_loc (i1Msg8BitBytes), 11) - checksum = xor(checksum, 42) ! TODO: jsherer - could change the crc here + checksum = xor(checksum, 42_2) ! TODO: jsherer - could change the crc here ! For reference, the next 3 lines show how to check the CRC i1Msg8BitBytes(10)=checksum/256 i1Msg8BitBytes(11)=iand(checksum,transfer(255,0_2)) diff --git a/lib/js8/ldpcsim174js8c.f90 b/lib/js8/ldpcsim174js8c.f90 index d42070d..c43b69e 100644 --- a/lib/js8/ldpcsim174js8c.f90 +++ b/lib/js8/ldpcsim174js8c.f90 @@ -94,7 +94,7 @@ allocate ( rxdata(N), llr(N) ) i1Msg8BitBytes(10:11)=0 checksum = crc12 (c_loc (i1Msg8BitBytes), 11) - checksum = xor(checksum, 42) ! TODO: jsherer - could change the crc here + checksum = xor(checksum, 42_2) ! TODO: jsherer - could change the crc here ! For reference, the next 3 lines show how to check the CRC i1Msg8BitBytes(10)=checksum/256 i1Msg8BitBytes(11)=iand(checksum,transfer(255,0_2)) diff --git a/lib/js8/ldpcsim174js8e.f90 b/lib/js8/ldpcsim174js8e.f90 index 0b8244c..d336dd4 100644 --- a/lib/js8/ldpcsim174js8e.f90 +++ b/lib/js8/ldpcsim174js8e.f90 @@ -94,7 +94,7 @@ allocate ( rxdata(N), llr(N) ) i1Msg8BitBytes(10:11)=0 checksum = crc12 (c_loc (i1Msg8BitBytes), 11) - checksum = xor(checksum, 42) ! TODO: jsherer - could change the crc here + checksum = xor(checksum, 42_2) ! TODO: jsherer - could change the crc here ! For reference, the next 3 lines show how to check the CRC i1Msg8BitBytes(10)=checksum/256 i1Msg8BitBytes(11)=iand(checksum,transfer(255,0_2)) diff --git a/lib/js8/ldpcsim174js8i.f90 b/lib/js8/ldpcsim174js8i.f90 index aa77e47..149e08b 100644 --- a/lib/js8/ldpcsim174js8i.f90 +++ b/lib/js8/ldpcsim174js8i.f90 @@ -94,7 +94,7 @@ allocate ( rxdata(N), llr(N) ) i1Msg8BitBytes(10:11)=0 checksum = crc12 (c_loc (i1Msg8BitBytes), 11) - checksum = xor(checksum, 42) ! TODO: jsherer - could change the crc here + checksum = xor(checksum, 42_2) ! TODO: jsherer - could change the crc here ! For reference, the next 3 lines show how to check the CRC i1Msg8BitBytes(10)=checksum/256 i1Msg8BitBytes(11)=iand(checksum,transfer(255,0_2)) diff --git a/lib/js8/syncjs8.f90 b/lib/js8/syncjs8.f90 index e143af3..222a716 100644 --- a/lib/js8/syncjs8.f90 +++ b/lib/js8/syncjs8.f90 @@ -46,7 +46,7 @@ subroutine syncjs8(dd,nfa,nfb,syncmin,nfqso,s,candidate,ncand,sbase) ib=ia+NSPS-1 x(1:NSPS)=fac*dd(ia:ib) x(NSPS+1:)=0. - call four2a(x,NFFT1,1,-1,0) !r2c FFT + call four2a(cx,NFFT1,1,-1,0) !r2c FFT do i=1,NH1 s(i,j)=real(cx(i))**2 + aimag(cx(i))**2 enddo diff --git a/lib/lpf1.f90 b/lib/lpf1.f90 index f2bb237..a620e9a 100644 --- a/lib/lpf1.f90 +++ b/lib/lpf1.f90 @@ -11,7 +11,7 @@ subroutine lpf1(dd,jz,dat,jz2) fac=1.0/float(NFFT1) x(1:jz)=fac*dd(1:jz) x(jz+1:NFFT1)=0.0 - call four2a(x,NFFT1,1,-1,0) !Forwarxd FFT, r2c + call four2a(cx,NFFT1,1,-1,0) !Forwarxd FFT, r2c cx(NFFT2/2:)=0.0 ! df=11025.0/NFFT1 diff --git a/lib/refspectrum.f90 b/lib/refspectrum.f90 index bc5bede..fdd302a 100644 --- a/lib/refspectrum.f90 +++ b/lib/refspectrum.f90 @@ -40,7 +40,7 @@ subroutine refspectrum(id2,bclear,brefspec,buseref,fname) if(brefspec) then x(0:NH-1)=0.001*id2(1:NH) x(NH:NFFT-1)=0.0 - call four2a(x,NFFT,1,-1,0) !r2c FFT + call four2a(cx,NFFT,1,-1,0) !r2c FFT do i=1,NH s(i)=s(i) + real(cx(i))**2 + aimag(cx(i))**2 @@ -134,7 +134,7 @@ subroutine refspectrum(id2,bclear,brefspec,buseref,fname) ! Make the filter causal for overlap and add. cx(0)=0.0 cx(1:NH)=fil(1:NH)/NFFT - call four2a(x,NFFT,1,1,-1) + call four2a(cx,NFFT,1,1,-1) x=cshift(x,-400) x(800:NH)=0.0 call four2a(cx,NFFT,1,-1,0) @@ -146,7 +146,7 @@ subroutine refspectrum(id2,bclear,brefspec,buseref,fname) x(0:NH-1)=id2(1:NH) x(NH:NFFT-1)=0.0 x=x/NFFT - call four2a(x,NFFT,1,-1,0) + call four2a(cx,NFFT,1,-1,0) cx=cfil*cx call four2a(cx,NFFT,1,1,-1) x(0:NH-1)=x(0:NH-1)+xs diff --git a/lib/timf2.f90 b/lib/timf2.f90 index 07f5098..cd503f1 100644 --- a/lib/timf2.f90 +++ b/lib/timf2.f90 @@ -59,7 +59,7 @@ subroutine timf2(x0,k,nfft,nwindow,nb,peaklimit,x1, & x(0:nfft-1)=x0 if(nwindow.eq.2) x(0:nfft-1)=w(0:nfft-1)*x(0:nfft-1) - call four2a(x,nfft,1,-1,0) !First forward FFT, r2c + call four2a(cxw,nfft,1,-1,0) !First forward FFT, r2c cxt(0:nh)=cx(0:nh) ! Identify frequencies with strong signals. diff --git a/lib/wav11.f90 b/lib/wav11.f90 index 3bba0bf..219b788 100644 --- a/lib/wav11.f90 +++ b/lib/wav11.f90 @@ -14,7 +14,7 @@ subroutine wav11(d2,npts,dd) jz=min(NZ12,npts) x(1:jz)=d2(1:jz) x(jz+1:)=0.0 - call four2a(x,nfft1,1,-1,0) !Forward FFT, r2c + call four2a(cx,nfft1,1,-1,0) !Forward FFT, r2c df=12000.0/NFFT1 ia=5000.0/df cx(ia:)=0.0 diff --git a/lib/wav12.f90 b/lib/wav12.f90 index 31fe1d5..ff65543 100644 --- a/lib/wav12.f90 +++ b/lib/wav12.f90 @@ -34,7 +34,7 @@ subroutine wav12(d2,d1,npts,nbitsam2) x(1:jz)=d2(1:jz) x(jz+1:)=0.0 - call four2a(x,nfft1,1,-1,0) !Forwarxd FFT, r2c + call four2a(cx,nfft1,1,-1,0) !Forwarxd FFT, r2c cx(nfft1/2:)=0.0 call four2a(cx,nfft2,1,1,-1) !Inverse FFT, c2r