w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 12:23:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Display Q65 values of DT and f0 from the actual decode, not just values from sync_q65.

Browse Source
This commit is contained in:
Joe Taylor 2020-11-13 13:40:16 -05:00
parent dc64e46620
commit 91862e61e6
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/q65_decode.f90
View File

@ -133,15 +133,11 @@ contains
!3002 format('b ',13b6.6/4x,13b6.6) !3002 format('b ',13b6.6/4x,13b6.6)
call timer('q65loops',0) call timer('q65loops',0)
call q65_loops(c00,npts/2,nsps/2,nmode,mode65,nsubmode,nFadingModel, & call q65_loops(c00,npts/2,nsps/2,nmode,mode65,nsubmode,nFadingModel, &
ndepth,jpk0,xdt,f0,width,iaptype,apmask,apsymbols,snr1,snr2, & ndepth,jpk0,xdt,f0,width,iaptype,apmask,apsymbols,snr1,xdt1,f1, &
irc,dat4) snr2,irc,dat4)
call timer('q65loops',1) call timer('q65loops',1)
snr2=snr2 + db(6912.0/nsps) snr2=snr2 + db(6912.0/nsps)
if(irc.ge.0) then if(irc.ge.0) exit
! write(54,3003) dat4,dat4
!3003 format('c ',13b6.6,13i3)
exit
endif
enddo enddo
100 decoded=' ' 100 decoded=' '
@ -155,12 +151,12 @@ contains
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,xdt1,f1,decoded, &
irc,qual,ntrperiod,fmid,w50) irc,qual,ntrperiod,fmid,w50)
else else
! Report sync, even if no decode. ! Report sync, even if no decode.
nsnr=db(snr1) - 35.0 nsnr=db(snr1) - 35.0
call this%callback(nutc,sync,nsnr,xdt,f0,decoded, & call this%callback(nutc,sync,nsnr,xdt1,f1,decoded, &
irc,qual,ntrperiod,fmid,w50) irc,qual,ntrperiod,fmid,w50)
endif endif

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

@ -1,5 +1,6 @@
subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, & subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
ndepth,jpk0,xdt,f0,width,iaptype,APmask,APsymbols,snr1,snr2,irc,dat4) ndepth,jpk0,xdt0,f0,width,iaptype,APmask,APsymbols,snr1,xdt1,f1, &
snr2,irc,dat4)
use packjt77 use packjt77
use timer_module, only: timer use timer_module, only: timer
@ -38,6 +39,8 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
NN=63 NN=63
napmin=99 napmin=99
baud=6000.0/nsps baud=6000.0/nsps
xdt1=xdt0
f1=f0
maxavg=0 maxavg=0
if(iand(ndepth,16).ne.0) maxavg=1 if(iand(ndepth,16).ne.0) maxavg=1
@ -111,6 +114,8 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
navg=nsave navg=nsave
snr2=esnodb - db(2500.0/baud) snr2=esnodb - db(2500.0/baud)
if(iavg.eq.0) navg=0 if(iavg.eq.0) navg=0
xdt1=xdt0 + nsps*ndt/(16.0*6000.0)
f1=f0 + 0.5*baud*ndf
!### For tests only: !### For tests only:
open(53,file='fort.53',status='unknown',position='append') open(53,file='fort.53',status='unknown',position='append')
write(c77,1100) dat4(1:12),dat4(13)/2 write(c77,1100) dat4(1:12),dat4(13)/2