w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-03 13:47:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

If no 'hiscall', don't try for a q3 decode.

Browse Source
This commit is contained in:
Joe Taylor 2021-04-30 08:31:45 -04:00
parent d8e9850583
commit c9b2a3d2cd
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/q65_decode.f90
View File

@ -133,6 +133,8 @@ contains
maxiters=100 maxiters=100
endif endif
! Generate codewords for full-AP list decoding ! Generate codewords for full-AP list decoding
if(ichar(hiscall(1:1)).eq.0) hiscall=' '
if(ichar(hisgrid(1:1)).eq.0) hisgrid=' '
call q65_set_list(mycall,hiscall,hisgrid,codewords,ncw) call q65_set_list(mycall,hiscall,hisgrid,codewords,ncw)
dgen=0 dgen=0
call q65_enc(dgen,codewords) !Initialize the Q65 codec call q65_enc(dgen,codewords) !Initialize the Q65 codec
@ -143,7 +145,6 @@ contains
! Call top-level routine in q65 module: establish sync and try for a q3 decode. ! Call top-level routine in q65 module: establish sync and try for a q3 decode.
call q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave, & call q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave, &
emedelay,xdt,f0,snr1,width,dat4,snr2,idec) emedelay,xdt,f0,snr1,width,dat4,snr2,idec)
! idec=-1 !### TEMPORARY ###
call timer('q65_dec0',1) call timer('q65_dec0',1)
if(idec.ge.0) then if(idec.ge.0) then
@ -299,7 +300,6 @@ contains
call timer('q65loops',0) call timer('q65loops',0)
call q65_loops(c00,npts/2,nsps/2,nsubmode,ndepth,jpk0, & call q65_loops(c00,npts/2,nsps/2,nsubmode,ndepth,jpk0, &
xdt,f0,iaptype,xdt1,f1,snr2,dat4,idec) xdt,f0,iaptype,xdt1,f1,snr2,dat4,idec)
! idec=-1 !### TEMPORARY ###
call timer('q65loops',1) call timer('q65loops',1)
if(idec.ge.0) then if(idec.ge.0) then
dtdec=xdt1 dtdec=xdt1

6
lib/qra/q65/q65.f90
View File

@ -693,12 +693,6 @@ subroutine q65_snr(dat4,dtdec,f0dec,mode_q65,nused,snr2)
if(nused.eq.3) snr2=snr2 - 2.9 if(nused.eq.3) snr2=snr2 - 2.9
if(nused.ge.4) snr2=snr2 - 3.5 if(nused.ge.4) snr2=snr2 - 3.5
! do i=ia,ib
! write(71,3071) i*df,spec(i),db(spec(i))
!3071 format(3f10.3)
! enddo
! flush(71)
return return
end subroutine q65_snr end subroutine q65_snr

3
map65/libm65/q65b.f90
View File

@ -27,9 +27,6 @@ subroutine q65b(nutc,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
read(9,'(a)') wsjtx_dir read(9,'(a)') wsjtx_dir
close(9) close(9)
mycall='K1JT'
hiscall='IV3NWV'
grid4='AA00'
if(mycall0(1:1).ne.' ') mycall=mycall0 if(mycall0(1:1).ne.' ') mycall=mycall0
if(hiscall0(1:1).ne.' ') hiscall=hiscall0 if(hiscall0(1:1).ne.' ') hiscall=hiscall0
if(hisgrid(1:4).ne.' ') grid4=hisgrid(1:4) if(hisgrid(1:4).ne.' ') grid4=hisgrid(1:4)