mirror of https://github.com/saitohirga/WSJT-X.git
Reactivate Q65 message averaging, and fix the reporting of those decodes.
This commit is contained in:
parent
145ddb8821
commit
56a3201d14
|
@ -138,11 +138,10 @@ contains
|
||||||
if(irc.ge.0) then
|
if(irc.ge.0) then
|
||||||
!###
|
!###
|
||||||
navg=irc/100
|
navg=irc/100
|
||||||
irc=ipass
|
irc=100*navg + ipass
|
||||||
!###
|
!###
|
||||||
write(c77,1000) dat4
|
write(c77,1000) dat4
|
||||||
1000 format(12b6.6,b5.5)
|
1000 format(12b6.6,b5.5)
|
||||||
|
|
||||||
call unpack77(c77,0,decoded,unpk77_success) !Unpack to get msgsent
|
call unpack77(c77,0,decoded,unpk77_success) !Unpack to get msgsent
|
||||||
nsnr=nint(snr2)
|
nsnr=nint(snr2)
|
||||||
call this%callback(nutc,sync,nsnr,xdt,f0,decoded, &
|
call this%callback(nutc,sync,nsnr,xdt,f0,decoded, &
|
||||||
|
|
|
@ -47,7 +47,7 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
|
||||||
call twkfreq(c00,c0,npts2,6000.0,a)
|
call twkfreq(c00,c0,npts2,6000.0,a)
|
||||||
do idt=1,idtmax
|
do idt=1,idtmax
|
||||||
ndt=idt/2
|
ndt=idt/2
|
||||||
if(iavg.eq.0) then
|
if(ipass.eq.0 .and. iavg.eq.0) then
|
||||||
if(mod(idt,2).eq.0) ndt=-ndt
|
if(mod(idt,2).eq.0) ndt=-ndt
|
||||||
jpk=jpk0 + nsps*ndt/16 !tsym/16
|
jpk=jpk0 + nsps*ndt/16 !tsym/16
|
||||||
if(jpk.lt.0) jpk=0
|
if(jpk.lt.0) jpk=0
|
||||||
|
@ -57,7 +57,8 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
|
||||||
call pctile(s3,LL*NN,40,base)
|
call pctile(s3,LL*NN,40,base)
|
||||||
s3=s3/base
|
s3=s3/base
|
||||||
where(s3(1:LL*NN)>s3lim) s3(1:LL*NN)=s3lim
|
where(s3(1:LL*NN)>s3lim) s3(1:LL*NN)=s3lim
|
||||||
else
|
endif
|
||||||
|
if(iavg.eq.1) then
|
||||||
s3(1:LL*NN)=s3avg(1:LL*NN)
|
s3(1:LL*NN)=s3avg(1:LL*NN)
|
||||||
endif
|
endif
|
||||||
do ibw=ibwmin,ibwmax
|
do ibw=ibwmin,ibwmax
|
||||||
|
@ -83,7 +84,7 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
|
||||||
enddo ! ibw (b90 loop)
|
enddo ! ibw (b90 loop)
|
||||||
enddo ! idt (DT loop)
|
enddo ! idt (DT loop)
|
||||||
enddo ! idf (f0 loop)
|
enddo ! idf (f0 loop)
|
||||||
if(iavg.eq.0) then
|
if(ipass.eq.0 .and. iavg.eq.0) then
|
||||||
a=0.
|
a=0.
|
||||||
a(1)=-f0
|
a(1)=-f0
|
||||||
call twkfreq(c00,c0,npts2,6000.0,a)
|
call twkfreq(c00,c0,npts2,6000.0,a)
|
||||||
|
|
|
@ -31,7 +31,8 @@ program sumsim
|
||||||
close(10)
|
close(10)
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
fac=1.0/sqrt(float(nargs))
|
! fac=1.0/sqrt(float(nargs))
|
||||||
|
fac=1.0/nargs
|
||||||
iwave(1:npts)=nint(fac*wave(1:npts))
|
iwave(1:npts)=nint(fac*wave(1:npts))
|
||||||
|
|
||||||
open(12,file='000000_0000.wav',access='stream',status='unknown')
|
open(12,file='000000_0000.wav',access='stream',status='unknown')
|
||||||
|
|
Loading…
Reference in New Issue