w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-06-17 13:53:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix: correct the misuse of variable 'ncand' in both q65 module and a common block.

Browse Source
This commit is contained in:
Joe Taylor 2024-03-12 08:47:23 -04:00
parent c5a266b5e0
commit 2b9d65408d
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmap/libqmap/decode0.f90
View File

@ -11,7 +11,7 @@ subroutine decode0(dd,ss,savg)
character mycall*12,hiscall*12,mygrid*6,hisgrid*6,datetime*20 character mycall*12,hiscall*12,mygrid*6,hisgrid*6,datetime*20
character mycall0*12,hiscall0*12,hisgrid0*6 character mycall0*12,hiscall0*12,hisgrid0*6
character*64 result character*64 result
common/decodes/ndecodes,ncand,nQDecoderDone,nWDecoderBusy, & common/decodes/ndecodes,ncand2,nQDecoderDone,nWDecoderBusy, &
nWTransmitting,kHzRequested,result(50) nWTransmitting,kHzRequested,result(50)
common/npar/fcenter,nutc,fselected,mousedf,mousefqso,nagain, & common/npar/fcenter,nutc,fselected,mousedf,mousefqso,nagain, &
ndepth,ndiskdat,ntx60,newdat,nfa,nfb,nfcal,nfshift, & ndepth,ndiskdat,ntx60,newdat,nfa,nfb,nfcal,nfshift, &

4
qmap/libqmap/getcand2.f90
View File

@ -1,5 +1,5 @@
subroutine getcand2(ss,savg0,nts_q65,nagain,nhsym,ntx30a,ntx30b, & subroutine getcand2(ss,savg0,nts_q65,nagain,nhsym,ntx30a,ntx30b, &
ntol,f0_selected,bAlso30,cand,ncand) ntol,f0_selected,bAlso30,cand,ncand2)
! Get candidates for Q65 decodes, based on presence of sync tone. ! Get candidates for Q65 decodes, based on presence of sync tone.
@ -110,7 +110,7 @@ subroutine getcand2(ss,savg0,nts_q65,nagain,nhsym,ntx30a,ntx30b, &
endif endif
enddo enddo
ncand=j !Total number of candidates found ncand2=j !Total number of candidates found
return return
end subroutine getcand2 end subroutine getcand2

2
qmap/libqmap/q65b.f90
View File

@ -31,7 +31,7 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, &
character*17 fname character*17 fname
character*64 result,ctmp character*64 result,ctmp
character*20 datetime,datetime1 character*20 datetime,datetime1
common/decodes/ndecodes,ncand,nQDecoderDone,nWDecoderBusy, & common/decodes/ndecodes,ncand2,nQDecoderDone,nWDecoderBusy, &
nWTransmitting,kHzRequested,result(50) nWTransmitting,kHzRequested,result(50)
common/cacb/ca common/cacb/ca
data ifile/0/ data ifile/0/

4
qmap/libqmap/q65c.f90
View File

@ -21,7 +21,7 @@ subroutine q65c
character*6 mygrid,hisgrid character*6 mygrid,hisgrid
character*20 datetime character*20 datetime
character*64 result character*64 result
common/decodes/ndecodes,ncand,nQDecoderDone,nWDecoderBusy, & common/decodes/ndecodes,ncand2,nQDecoderDone,nWDecoderBusy, &
nWTransmitting,kHzRequested,result(50) nWTransmitting,kHzRequested,result(50)
common/datcom2/dd(2,5760000),ss(400,NFFT),savg(NFFT),nparams0 common/datcom2/dd(2,5760000),ss(400,NFFT),savg(NFFT),nparams0
common/savecom/revision,fname common/savecom/revision,fname
@ -90,7 +90,7 @@ subroutine q65c
endif endif
endif endif
999 return return
end subroutine q65c end subroutine q65c
subroutine all_done subroutine all_done

8
qmap/libqmap/qmapa.f90
View File

@ -35,7 +35,7 @@ subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
type(good_decode) found(MAX_CANDIDATES) type(good_decode) found(MAX_CANDIDATES)
character*64 result character*64 result
character*20 datetime character*20 datetime
common/decodes/ndecodes,ncand,nQDecoderDone,nWDecoderBusy, & common/decodes/ndecodes,ncand2,nQDecoderDone,nWDecoderBusy, &
nWTransmitting,kHzRequested,result(50) nWTransmitting,kHzRequested,result(50)
save save
@ -52,7 +52,7 @@ subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
call timer('get_cand',0) call timer('get_cand',0)
! Get a list of decoding candidates ! Get a list of decoding candidates
call getcand2(ss,savg,nts_q65,nagain,nhsym,ntx30a,ntx30b,ntol, & call getcand2(ss,savg,nts_q65,nagain,nhsym,ntx30a,ntx30b,ntol, &
f0_selected,bAlso30,cand,ncand) f0_selected,bAlso30,cand,ncand2)
call timer('get_cand',1) call timer('get_cand',1)
endif endif
@ -69,11 +69,11 @@ subroutine qmapa(dd,ss,savg,newdat,nutc,fcenter,ntol,nfa,nfb, &
call timer('fftbig ',1) call timer('fftbig ',1)
if(nagain.ge.2) then if(nagain.ge.2) then
ncand=1 ncand2=1
fqso=fselected fqso=fselected
endif endif
do icand=1,ncand !Attempt to decode each candidate do icand=1,ncand2 !Attempt to decode each candidate
tsec=sec_midn() - tsec0 tsec=sec_midn() - tsec0
if(ndiskdat.eq.0) then if(ndiskdat.eq.0) then
! No more realtime decode attempts if it's nearly too late, already ! No more realtime decode attempts if it's nearly too late, already