w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-23 18:02:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reconcile sync8.f90 between superfoxtx branch and sfox5b.

Browse Source
This commit is contained in:
Joe Taylor 2024-09-16 10:36:03 -04:00
parent 9a8e43c1d5
commit 073e644f12
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ft8/ft8d.f90
View File

@ -42,7 +42,7 @@ program ft8d
j2=index(infile,'.wav') j2=index(infile,'.wav')
read(infile(j2-6:j2-1),*) nutc read(infile(j2-6:j2-1),*) nutc
datetime=infile(j2-13:j2-1) datetime=infile(j2-13:j2-1)
call sync8(iwave,nfa,nfb,nfqso,s,candidate,ncand) call sync8(iwave,NMAX,nfa,nfb,nfqso,s,candidate,ncand)
syncmin=2.0 syncmin=2.0
dd=iwave dd=iwave
do icand=1,ncand do icand=1,ncand

6
lib/ft8/sync8.f90
View File

@ -1,4 +1,4 @@
subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,candidate,ncand,sbase) subroutine sync8(dd,npts,nfa,nfb,syncmin,nfqso,maxcand,candidate,ncand,sbase)
include 'ft8_params.f90' include 'ft8_params.f90'
parameter (MAXPRECAND=1000) parameter (MAXPRECAND=1000)
@ -9,13 +9,13 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,candidate,ncand,sbase)
real s(NH1,NHSYM) real s(NH1,NHSYM)
real savg(NH1) real savg(NH1)
real sbase(NH1) real sbase(NH1)
real x(NFFT1) real x(NFFT1+2)
real sync2d(NH1,-JZ:JZ) real sync2d(NH1,-JZ:JZ)
real red(NH1) real red(NH1)
real red2(NH1) real red2(NH1)
real candidate0(3,MAXPRECAND) real candidate0(3,MAXPRECAND)
real candidate(3,maxcand) real candidate(3,maxcand)
real dd(NMAX) real dd(npts)
integer jpeak(NH1) integer jpeak(NH1)
integer jpeak2(NH1) integer jpeak2(NH1)
integer indx(NH1) integer indx(NH1)

8
lib/ft8_decode.f90
View File

@ -44,18 +44,18 @@ contains
class(ft8_decoder), intent(inout) :: this class(ft8_decoder), intent(inout) :: this
procedure(ft8_decode_callback) :: callback procedure(ft8_decode_callback) :: callback
parameter (MAXCAND=600,MAX_EARLY=200) parameter (MAXCAND=600,MAX_EARLY=200,NPTS=15*12000)
real*8 tsec,tseq real*8 tsec,tseq
real sbase(NH1) real sbase(NH1)
real candidate(3,MAXCAND) real candidate(3,MAXCAND)
real dd(15*12000),dd1(15*12000) real dd(NPTS),dd1(NPTS)
logical, intent(in) :: lft8apon,lapcqonly,nagain logical, intent(in) :: lft8apon,lapcqonly,nagain
logical newdat,lsubtract,ldupe,lrefinedt logical newdat,lsubtract,ldupe,lrefinedt
logical*1 ldiskdat logical*1 ldiskdat
logical lsubtracted(MAX_EARLY) logical lsubtracted(MAX_EARLY)
character*12 mycall12,hiscall12,call_1,call_2 character*12 mycall12,hiscall12,call_1,call_2
character*4 grid4 character*4 grid4
integer*2 iwave(15*12000) integer*2 iwave(NPTS)
integer apsym2(58),aph10(10) integer apsym2(58),aph10(10)
character datetime*13,msg37*37 character datetime*13,msg37*37
character*37 allmessages(MAX_EARLY) character*37 allmessages(MAX_EARLY)
@ -192,7 +192,7 @@ contains
endif endif
call timer('sync8 ',0) call timer('sync8 ',0)
maxc=MAXCAND maxc=MAXCAND
call sync8(dd,ifa,ifb,syncmin,nfqso,maxc,candidate,ncand,sbase) call sync8(dd,NPTS,ifa,ifb,syncmin,nfqso,maxc,candidate,ncand,sbase)
call timer('sync8 ',1) call timer('sync8 ',1)
do icand=1,ncand do icand=1,ncand
sync=candidate(3,icand) sync=candidate(3,icand)