w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-24 21:28:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a problem with turning DS on/off in JT65.

Browse Source
This commit is contained in:
Joe Taylor 2020-04-08 21:47:10 -04:00
parent 756cb3b9b1
commit 11e1f78647
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/decode65a.f90
View File

@ -93,6 +93,7 @@ subroutine decode65a(dd,npts,newdat,nqd,f0,nflip,mode65,ntrials, &
call timer('dec65b ',0) call timer('dec65b ',0)
qualbest=0. qualbest=0.
nftbest=0
qual0=-1.e30 qual0=-1.e30
minsmo=0 minsmo=0
maxsmo=0 maxsmo=0
@ -126,7 +127,6 @@ subroutine decode65a(dd,npts,newdat,nqd,f0,nflip,mode65,ntrials, &
call decode65b(s2,nflip,nadd,mode65,ntrials,naggressive,ndepth, & call decode65b(s2,nflip,nadd,mode65,ntrials,naggressive,ndepth, &
mycall,hiscall,hisgrid,nQSOProgress,ljt65apon,nqd,nft,qual, & mycall,hiscall,hisgrid,nQSOProgress,ljt65apon,nqd,nft,qual, &
nhist,decoded) nhist,decoded)
if(nft.eq.1) then if(nft.eq.1) then
nsmo=ismo nsmo=ismo
param(9)=nsmo param(9)=nsmo
@ -138,13 +138,14 @@ subroutine decode65a(dd,npts,newdat,nqd,f0,nflip,mode65,ntrials, &
qualbest=qual qualbest=qual
nnbest=nn nnbest=nn
nsmobest=ismo nsmobest=ismo
nftbest=nft
endif endif
endif endif
if(qual.lt.qual0) exit if(qual.lt.qual0) exit
qual0=qual qual0=qual
enddo enddo
if(nft.eq.2) then if(nftbest.eq.2) then
decoded=decoded_best decoded=decoded_best
qual=qualbest qual=qualbest
nsmo=nsmobest nsmo=nsmobest

2
lib/decode65b.f90
View File

@ -21,7 +21,7 @@ subroutine decode65b(s2,nflip,nadd,mode65,ntrials,naggressive,ndepth, &
call extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip,mycall, & call extract(s3,nadd,mode65,ntrials,naggressive,ndepth,nflip,mycall, &
hiscall,hisgrid,nQSOProgress,ljt65apon,ncount, & hiscall,hisgrid,nQSOProgress,ljt65apon,ncount, &
nhist,decoded,ltext,nft,qual) nhist,decoded,ltext,nft,qual)
! Suppress "birdie messages" and other garbage decodes: ! Suppress "birdie messages" and other garbage decodes:
if(decoded(1:7).eq.'000AAA ') ncount=-1 if(decoded(1:7).eq.'000AAA ') ncount=-1

2
lib/jt65_decode.f90
View File

@ -386,7 +386,6 @@ contains
! Silence compiler warnings ! Silence compiler warnings
if(nagain .and. ndeepave.eq.-99 .and. neme.eq.-99) stop if(nagain .and. ndeepave.eq.-99 .and. neme.eq.-99) stop
first=.false. first=.false.
! print*,'Clear avg',nutc
endif endif
do i=1,64 do i=1,64
@ -402,7 +401,6 @@ contains
nflipsave(nsave)=nflip nflipsave(nsave)=nflip
s1save(-255:256,1:126,nsave)=s1 s1save(-255:256,1:126,nsave)=s1
s3save(1:64,1:63,nsave)=s3a s3save(1:64,1:63,nsave)=s3a
! print*,'nsave:',nsave
10 syncsum=0. 10 syncsum=0.
dtsum=0. dtsum=0.