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

Decodes without "newdat" should not add s1 into s1a again.

Browse Source
This commit is contained in:
Joe Taylor 2021-01-23 10:58:28 -05:00
parent e7061abc7c
commit 1489513803
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/decoder.f90
View File

@ -205,11 +205,11 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
open(17,file=trim(temp_dir)//'/red.dat',status='unknown') open(17,file=trim(temp_dir)//'/red.dat',status='unknown')
open(14,file=trim(temp_dir)//'/avemsg.txt',status='unknown') open(14,file=trim(temp_dir)//'/avemsg.txt',status='unknown')
call timer('dec_q65 ',0) call timer('dec_q65 ',0)
call my_q65%decode(q65_decoded,id2,params%nutc,params%ntr, & call my_q65%decode(q65_decoded,id2,params%nutc,params%ntr, &
params%nsubmode,params%nfqso,params%ntol,params%ndepth, & params%nsubmode,params%nfqso,params%ntol,params%ndepth, &
params%nfa,params%nfb,logical(params%nclearave), & params%nfa,params%nfb,logical(params%nclearave), &
params%emedelay,mycall,hiscall,hisgrid,params%nQSOProgress, & logical(params%newdat),params%emedelay,mycall,hiscall,hisgrid, &
ncontest,logical(params%lapcqonly),navg0) params%nQSOProgress,ncontest,logical(params%lapcqonly),navg0)
call timer('dec_q65 ',1) call timer('dec_q65 ',1)
close(17) close(17)
go to 800 go to 800

9
lib/q65_decode.f90
View File

@ -26,9 +26,9 @@ module q65_decode
contains contains
subroutine decode(this,callback,iwave,nutc,ntrperiod,nsubmode,nfqso, & subroutine decode(this,callback,iwave,nutc,ntrperiod,nsubmode,nfqso, &
ntol,ndepth,nfa0,nfb0,lclearave,emedelay,mycall,hiscall,hisgrid, & ntol,ndepth,nfa0,nfb0,lclearave,lnewdat0,emedelay,mycall, &
nQSOprogress,ncontest,lapcqonly,navg0) hiscall,hisgrid,nQSOprogress,ncontest,lapcqonly,navg0)
! Top-level routine that organizes the decoding of Q65 signals ! Top-level routine that organizes the decoding of Q65 signals
! Input: iwave Raw data, i*2 ! Input: iwave Raw data, i*2
@ -63,13 +63,14 @@ contains
real, allocatable :: dd(:) !Raw data real, allocatable :: dd(:) !Raw data
integer dat4(13) !Decoded message as 12 6-bit integers integer dat4(13) !Decoded message as 12 6-bit integers
integer dgen(13) integer dgen(13)
logical lclearave,lapcqonly,unpk77_success logical lclearave,lnewdat0,lapcqonly,unpk77_success
complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s
complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s
! Start by setting some parameters and allocating storage for large arrays ! Start by setting some parameters and allocating storage for large arrays
nfa=nfa0 nfa=nfa0
nfb=nfb0 nfb=nfb0
lnewdat=lnewdat0
idec=-1 idec=-1
mode_q65=2**nsubmode mode_q65=2**nsubmode
npts=ntrperiod*12000 npts=ntrperiod*12000

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

@ -14,6 +14,7 @@ module q65
integer istep,nsmo,lag1,lag2,npasses,nused,iseq integer istep,nsmo,lag1,lag2,npasses,nused,iseq
integer i0,j0 integer i0,j0
integer navg(0:1) integer navg(0:1)
logical lnewdat
real,allocatable,save :: s1a(:,:,:) !Cumulative symbol spectra real,allocatable,save :: s1a(:,:,:) !Cumulative symbol spectra
real sync(85) !sync vector real sync(85) !sync vector
real df,dtstep,dtdec,f0dec real df,dtstep,dtdec,f0dec
@ -261,8 +262,10 @@ subroutine q65_symspec(iwave,nmax,iz,jz,s1)
call smo121(s1(1:iz,j),iz) call smo121(s1(1:iz,j),iz)
enddo enddo
enddo enddo
s1a(:,:,iseq)=s1a(:,:,iseq) + s1 if(lnewdat) then
navg(iseq)=navg(iseq) + 1 s1a(:,:,iseq)=s1a(:,:,iseq) + s1
navg(iseq)=navg(iseq) + 1
endif
return return
end subroutine q65_symspec end subroutine q65_symspec