w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-23 18:02:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enforce Q65 ClrAvg action when requested. Tweak somne logic.

Browse Source
This commit is contained in:
Joe Taylor 2020-12-30 16:12:02 -05:00
parent e07ba410c2
commit bcbca02c08
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/q65_decode.f90
View File

@ -62,12 +62,12 @@ contains
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
id1=0 idec=-1
id2=0
mode65=2**nsubmode mode65=2**nsubmode
npts=ntrperiod*12000 npts=ntrperiod*12000
nfft1=ntrperiod*12000 nfft1=ntrperiod*12000
nfft2=ntrperiod*6000 nfft2=ntrperiod*6000
if(lclearave) nsave=0
allocate(dd(npts)) allocate(dd(npts))
allocate (c00(0:nfft1-1)) allocate (c00(0:nfft1-1))
allocate (c0(0:nfft1-1)) allocate (c0(0:nfft1-1))

4
lib/qra/q65/q65_avg.f90
View File

@ -123,12 +123,10 @@ subroutine q65_avg(nutc,ntrperiod,LL,nfqso,ntol,lclearave,xdt,f0,snr1,s3)
b90=1.72**ibw b90=1.72**ibw
b90ts=b90/baud b90ts=b90/baud
call q65_dec1(s3avg,nsubmode,b90ts,codewords,ncw,esnodb,irc,dat4,avemsg) call q65_dec1(s3avg,nsubmode,b90ts,codewords,ncw,esnodb,irc,dat4,avemsg)
! irc=-99 !### TEMPORARY ### if(irc.ge.0) then
if(irc.ge.0 .and. plog.ge.PLOG_MIN) then
snr2=esnodb - 0.5*db(2500.0/baud) + 3.0 !Empirical adjustment snr2=esnodb - 0.5*db(2500.0/baud) + 3.0 !Empirical adjustment
snr2=snr2 - db(float(navg)) !Is this right? snr2=snr2 - db(float(navg)) !Is this right?
idec=100+navg idec=100+navg
! print*,'C dec1 ',ibw,irc,idec,avemsg
go to 900 go to 900
endif endif
enddo enddo

4
lib/qra/q65/q65_sync.f90
View File

@ -180,9 +180,7 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps, &
b90=1.72**ibw b90=1.72**ibw
b90ts=b90/baud b90ts=b90/baud
call q65_dec1(s3,nsubmode,b90ts,codewords,ncw,esnodb,irc,dat4,decoded) call q65_dec1(s3,nsubmode,b90ts,codewords,ncw,esnodb,irc,dat4,decoded)
! irc=-99 !### TEMPORARY ###
if(irc.ge.0) then if(irc.ge.0) then
! print*,'A dec1 ',ibw,irc,esnodb,baud,trim(decoded)
snr2=esnodb - db(2500.0/baud) + 3.0 !Empirical adjustment snr2=esnodb - db(2500.0/baud) + 3.0 !Empirical adjustment
idec=1 idec=1
ic=ia2/4; ic=ia2/4;
@ -290,6 +288,8 @@ subroutine q65_dec1(s3,nsubmode,b90ts,codewords,ncw,esnodb,irc,dat4,decoded)
write(c77,1000) dat4(1:12),dat4(13)/2 write(c77,1000) dat4(1:12),dat4(13)/2
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
else
irc=-1
endif endif
return return