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

More Q65 code cleanup. Make submodes higher than A work with List Decoding.

Browse Source
This commit is contained in:
Joe Taylor 2020-11-30 15:20:19 -05:00
parent 7cb87e315b
commit 65dda491d2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/q65_decode.f90
View File

@ -93,7 +93,7 @@ contains
dgen=0 dgen=0
call q65_enc(dgen,codewords) !Initialize Q65 call q65_enc(dgen,codewords) !Initialize Q65
call timer('sync_q65',0) call timer('sync_q65',0)
call q65_sync(nutc,iwave,ntrperiod*12000,mode65,codewords,ncw,nsps, & call q65_sync(iwave,ntrperiod*12000,mode65,codewords,ncw,nsps, &
nfqso,ntol,xdt,f0,snr1,dat4,snr2,id1) nfqso,ntol,xdt,f0,snr1,dat4,snr2,id1)
call timer('sync_q65',1) call timer('sync_q65',1)
if(id1.eq.1) then if(id1.eq.1) then

8
lib/q65_sync.f90
View File

@ -1,4 +1,4 @@
subroutine q65_sync(nutc,iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, & subroutine q65_sync(iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, &
xdt,f0,snr1,dat4,snr2,id1) xdt,f0,snr1,dat4,snr2,id1)
! Detect and align with the Q65 sync vector, returning time and frequency ! Detect and align with the Q65 sync vector, returning time and frequency
@ -126,7 +126,7 @@ subroutine q65_sync(nutc,iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, &
j=j0 + NSTEP*(k-1) + 1 + lag j=j0 + NSTEP*(k-1) + 1 + lag
if(j.ge.1 .and. j.le.jz) then if(j.ge.1 .and. j.le.jz) then
do i=-ia,ia do i=-ia,ia
ii=i0+itone(k)+i ii=i0+mode_q65*itone(k)+i
ccf(i,lag)=ccf(i,lag) + s1(ii,j) ccf(i,lag)=ccf(i,lag) + s1(ii,j)
enddo enddo
endif endif
@ -157,6 +157,10 @@ subroutine q65_sync(nutc,iwave,nmax,mode_q65,codewords,ncw,nsps,nfqso,ntol, &
enddo enddo
nsubmode=0 nsubmode=0
if(mode_q65.eq.2) nsubmode=1
if(mode_q65.eq.4) nsubmode=2
if(mode_q65.eq.8) nsubmode=3
if(mode_q65.eq.16) nsubmode=4
nFadingModel=1 nFadingModel=1
baud=12000.0/nsps baud=12000.0/nsps
do ibw=0,10 do ibw=0,10