w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-24 10:22:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

dd "MyCall DxCall DxGrid" to list. Set PLOG_MIN=-240. No list decoding if DxCall is not defined.

Browse Source
This commit is contained in:
Joe Taylor 2020-12-04 15:29:46 -05:00
parent 7500adce8b
commit 3dd34e13ba
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/q65_sync.f90
View File

@ -16,6 +16,7 @@ subroutine q65_sync(nutc,iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, &
use packjt77 use packjt77
parameter (NSTEP=8) !Step size nsps/NSTEP parameter (NSTEP=8) !Step size nsps/NSTEP
parameter (LN=2176*63) !LN=LL*NN; LL=64*(mode_q65+2), NN=63 parameter (LN=2176*63) !LN=LL*NN; LL=64*(mode_q65+2), NN=63
parameter (PLOG_MIN=-240.0) !List decoding threshold
integer*2 iwave(0:nmax-1) !Raw data integer*2 iwave(0:nmax-1) !Raw data
integer isync(22) !Indices of sync symbols integer isync(22) !Indices of sync symbols
integer itone(85) integer itone(85)
@ -171,7 +172,7 @@ subroutine q65_sync(nutc,iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, &
b90=1.72**ibw b90=1.72**ibw
call q65_intrinsics_ff(s3,nsubmode,b90/baud,nFadingModel,s3prob) call q65_intrinsics_ff(s3,nsubmode,b90/baud,nFadingModel,s3prob)
call q65_dec_fullaplist(s3,s3prob,codewords,ncw,esnodb,dat4,plog,irc) call q65_dec_fullaplist(s3,s3prob,codewords,ncw,esnodb,dat4,plog,irc)
if(irc.ge.0 .and. plog.ge.-255.0) then if(irc.ge.0 .and. plog.ge.PLOG_MIN) then
snr2=esnodb - db(2500.0/baud) snr2=esnodb - db(2500.0/baud)
id1=1 id1=1
write(c77,1000) dat4(1:12),dat4(13)/2 write(c77,1000) dat4(1:12),dat4(13)/2

8
lib/qra/q65/q65_set_list.f90
View File

@ -8,10 +8,14 @@ subroutine q65_set_list(mycall,hiscall,hisgrid,codewords,ncw)
integer isync(22) integer isync(22)
data isync/1,9,12,13,15,22,23,26,27,33,35,38,46,50,55,60,62,66,69,74,76,85/ data isync/1,9,12,13,15,22,23,26,27,33,35,38,46,50,55,60,62,66,69,74,76,85/
ncw=0
if(hiscall(1:1).eq. ' ') return
ncw=58
msg0=trim(mycall)//' '//trim(hiscall) msg0=trim(mycall)//' '//trim(hiscall)
j0=len(trim(msg0))+2 j0=len(trim(msg0))+2
isnr0=-35 isnr0=-35
do i=1,57 do i=1,ncw
msg=msg0 msg=msg0
if(i.eq.2) msg(j0:j0+2)='RRR' if(i.eq.2) msg(j0:j0+2)='RRR'
if(i.eq.3) msg(j0:j0+3)='RR73' if(i.eq.3) msg(j0:j0+3)='RR73'
@ -22,6 +26,7 @@ subroutine q65_set_list(mycall,hiscall,hisgrid,codewords,ncw)
if(iand(i,1).eq.0) write(msg(j0:j0+3),'("R",i3.2)') isnr if(iand(i,1).eq.0) write(msg(j0:j0+3),'("R",i3.2)') isnr
endif endif
if(i.eq.57) msg='CQ '//trim(hiscall)//' '//hisgrid(1:4) if(i.eq.57) msg='CQ '//trim(hiscall)//' '//hisgrid(1:4)
if(i.eq.58) msg(j0:j0+3)=hisgrid(1:4)
call genq65(msg,0,msgsent,itone,i3,n3) call genq65(msg,0,msgsent,itone,i3,n3)
i0=1 i0=1
j=0 j=0
@ -33,7 +38,6 @@ subroutine q65_set_list(mycall,hiscall,hisgrid,codewords,ncw)
j=j+1 j=j+1
codewords(j,i)=itone(k) - 1 codewords(j,i)=itone(k) - 1
enddo enddo
ncw=57
! write(*,3001) i,isnr,codewords(1:13,i),trim(msg) ! write(*,3001) i,isnr,codewords(1:13,i),trim(msg)
!3001 format(i2,2x,i3.2,2x,13i3,2x,a) !3001 format(i2,2x,i3.2,2x,13i3,2x,a)
enddo enddo