mirror of https://github.com/pavel-demin/ft8d.git
remove lhasgrid
This commit is contained in:
parent
61ae08bf0c
commit
e5a9ffb91e
|
@ -1,4 +1,4 @@
|
||||||
subroutine extractmessage174(decoded,lhasgrid,msgcall,msggrid,ncrcflag)
|
subroutine extractmessage174(decoded,msgcall,msggrid,ncrcflag)
|
||||||
use iso_c_binding, only: c_loc,c_size_t
|
use iso_c_binding, only: c_loc,c_size_t
|
||||||
use crc
|
use crc
|
||||||
use packjt
|
use packjt
|
||||||
|
@ -8,7 +8,6 @@ subroutine extractmessage174(decoded,lhasgrid,msgcall,msggrid,ncrcflag)
|
||||||
integer*1 decoded(87)
|
integer*1 decoded(87)
|
||||||
integer*1, target:: i1Dec8BitBytes(11)
|
integer*1, target:: i1Dec8BitBytes(11)
|
||||||
integer*4 i4Dec6BitWords(12)
|
integer*4 i4Dec6BitWords(12)
|
||||||
logical lhasgrid
|
|
||||||
|
|
||||||
! Write decoded bits into cbits: 75-bit message plus 12-bit CRC
|
! Write decoded bits into cbits: 75-bit message plus 12-bit CRC
|
||||||
write(cbits,1000) decoded
|
write(cbits,1000) decoded
|
||||||
|
@ -31,7 +30,7 @@ subroutine extractmessage174(decoded,lhasgrid,msgcall,msggrid,ncrcflag)
|
||||||
enddo
|
enddo
|
||||||
i4Dec6BitWords(ibyte)=itmp
|
i4Dec6BitWords(ibyte)=itmp
|
||||||
enddo
|
enddo
|
||||||
call unpackmsg(i4Dec6BitWords,lhasgrid,msgcall,msggrid)
|
call unpackmsg(i4Dec6BitWords,msgcall,msggrid)
|
||||||
ncrcflag=1
|
ncrcflag=1
|
||||||
else
|
else
|
||||||
msgcall=' '
|
msgcall=' '
|
||||||
|
|
6
ft8b.f90
6
ft8b.f90
|
@ -1,6 +1,6 @@
|
||||||
subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
|
subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
|
||||||
napwid,nagain,iaptype,f1,xdt,xbase,apsym,nharderrors,dmin, &
|
napwid,nagain,iaptype,f1,xdt,xbase,apsym,nharderrors,dmin, &
|
||||||
nbadcrc,ipass,lhasgrid,msgcall,msggrid,xsnr)
|
nbadcrc,ipass,msgcall,msggrid,xsnr)
|
||||||
|
|
||||||
use crc
|
use crc
|
||||||
include 'ft8_params.f90'
|
include 'ft8_params.f90'
|
||||||
|
@ -23,7 +23,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
|
||||||
complex cd0(3200)
|
complex cd0(3200)
|
||||||
complex ctwk(32)
|
complex ctwk(32)
|
||||||
complex csymb(32)
|
complex csymb(32)
|
||||||
logical first,newdat,lapon,lapcqonly,nagain,lhasgrid
|
logical first,newdat,lapon,lapcqonly,nagain
|
||||||
equivalence (s1,s1sort)
|
equivalence (s1,s1sort)
|
||||||
data icos7/2,5,6,0,4,1,3/
|
data icos7/2,5,6,0,4,1,3/
|
||||||
data mcq/1,1,1,1,1,0,1,0,0,0,0,0,1,0,0,0,0,0,1,1,0,0,0,1,1,0,0,1/
|
data mcq/1,1,1,1,1,0,1,0,0,0,0,0,1,0,0,0,0,0,1,1,0,0,0,1,1,0,0,1/
|
||||||
|
@ -360,7 +360,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
|
||||||
cycle
|
cycle
|
||||||
endif
|
endif
|
||||||
if(nbadcrc.eq.0) then
|
if(nbadcrc.eq.0) then
|
||||||
call extractmessage174(decoded,lhasgrid,msgcall,msggrid,ncrcflag)
|
call extractmessage174(decoded,msgcall,msggrid,ncrcflag)
|
||||||
xsig=0.0
|
xsig=0.0
|
||||||
xnoi=0.0
|
xnoi=0.0
|
||||||
do i=1,79
|
do i=1,79
|
||||||
|
|
10
ft8d.f90
10
ft8d.f90
|
@ -10,7 +10,7 @@ program ft8d
|
||||||
real candidate(3,200)
|
real candidate(3,200)
|
||||||
real*8 dialfreq
|
real*8 dialfreq
|
||||||
complex dd(NMAX,4)
|
complex dd(NMAX,4)
|
||||||
logical newdat,lhasgrid
|
logical newdat
|
||||||
integer apsym(KK)
|
integer apsym(KK)
|
||||||
|
|
||||||
nargs=iargc()
|
nargs=iargc()
|
||||||
|
@ -52,15 +52,15 @@ program ft8d
|
||||||
call ft8b(dd(1:NMAX,ipart),newdat,nQSOProgress,nfqso+2000, &
|
call ft8b(dd(1:NMAX,ipart),newdat,nQSOProgress,nfqso+2000, &
|
||||||
nftx,ndepth,lft8apon,lapcqonly,napwid,nagain,iaptype, &
|
nftx,ndepth,lft8apon,lapcqonly,napwid,nagain,iaptype, &
|
||||||
f1,xdt,xbase,apsym,nharderrors,dmin,nbadcrc,iappass, &
|
f1,xdt,xbase,apsym,nharderrors,dmin,nbadcrc,iappass, &
|
||||||
lhasgrid,msgcall,msggrid,xsnr)
|
msgcall,msggrid,xsnr)
|
||||||
message=msg37(1:22)
|
message=msg37(1:22)
|
||||||
nsnr=nint(xsnr)
|
nsnr=nint(xsnr)
|
||||||
xdt=xdt-0.5
|
xdt=xdt-0.5
|
||||||
hd=nharderrors+dmin
|
hd=nharderrors+dmin
|
||||||
if(nbadcrc.eq.0 .and. lhasgrid) then
|
if(nbadcrc.eq.0) then
|
||||||
write(*,1004) nutc+15*(ipart-1),min(sync,999.0),nint(xsnr), &
|
write(*,1004) nutc+15*(ipart-1),min(sync,999.0),nint(xsnr), &
|
||||||
xdt,nint(f1-2000+dialfreq),msggrid,msgcall
|
xdt,nint(f1-2000+dialfreq),msgcall,msggrid
|
||||||
1004 format(i6.6,f6.1,i4,f6.2,i9,1x,a4,1x,a12)
|
1004 format(i6.6,f6.1,i4,f6.2,i9,1x,a12,1x,a4)
|
||||||
endif
|
endif
|
||||||
enddo
|
enddo
|
||||||
enddo ! ipart loop
|
enddo ! ipart loop
|
||||||
|
|
|
@ -170,13 +170,12 @@ module packjt
|
||||||
return
|
return
|
||||||
end subroutine unpackcall
|
end subroutine unpackcall
|
||||||
|
|
||||||
subroutine unpackmsg(dat,lhasgrid,msgcall,msggrid)
|
subroutine unpackmsg(dat,msgcall,msggrid)
|
||||||
|
|
||||||
parameter (NBASE=37*36*10*27*27*27)
|
parameter (NBASE=37*36*10*27*27*27)
|
||||||
parameter (NGBASE=180*180)
|
parameter (NGBASE=180*180)
|
||||||
integer dat(:)
|
integer dat(:)
|
||||||
character msgcall*12,msggrid*4,grid6*6,junk2*4
|
character msgcall*12,msggrid*4,grid6*6,junk2*4
|
||||||
logical lhasgrid
|
|
||||||
|
|
||||||
nc1=ishft(dat(1),22) + ishft(dat(2),16) + ishft(dat(3),10)+ &
|
nc1=ishft(dat(1),22) + ishft(dat(2),16) + ishft(dat(3),10)+ &
|
||||||
ishft(dat(4),4) + iand(ishft(dat(5),-2),15)
|
ishft(dat(4),4) + iand(ishft(dat(5),-2),15)
|
||||||
|
@ -187,15 +186,13 @@ module packjt
|
||||||
|
|
||||||
ng=ishft(iand(dat(10),15),12) + ishft(dat(11),6) + dat(12)
|
ng=ishft(iand(dat(10),15),12) + ishft(dat(11),6) + dat(12)
|
||||||
|
|
||||||
lhasgrid=.false.
|
call unpackcall(nc2,msgcall,junk1,junk2)
|
||||||
msggrid=' '
|
msggrid=' '
|
||||||
if(ng.lt.32400 .and. ng.ne.533) then
|
if(ng.lt.32400 .and. ng.ne.533) then
|
||||||
call unpackcall(nc2,msgcall,junk1,junk2)
|
|
||||||
dlat=mod(ng,180)-90
|
dlat=mod(ng,180)-90
|
||||||
dlong=(ng/180)*2 - 180 + 2
|
dlong=(ng/180)*2 - 180 + 2
|
||||||
call deg2grid(dlong,dlat,grid6)
|
call deg2grid(dlong,dlat,grid6)
|
||||||
msggrid=grid6(:4)
|
msggrid=grid6(:4)
|
||||||
lhasgrid=msggrid(1:2).ne.'KA' .and. msggrid(1:2).ne.'KA'
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue