w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-03 21:57:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup of Q65 decoder sequence. Much more needed!

Browse Source
This commit is contained in:
Joe Taylor 2020-10-27 13:22:02 -04:00
parent 2dad27f1ad
commit 4d739a31ca
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/q65_decode.f90
View File

@ -53,8 +53,7 @@ contains
character*77 c77 character*77 c77
integer*2 iwave(NMAX) !Raw data integer*2 iwave(NMAX) !Raw data
real, allocatable :: dd(:) !Raw data real, allocatable :: dd(:) !Raw data
integer dat4(12) !Decoded message as 12 6-bit integers integer dat4(13) !Decoded message as 12 6-bit integers
integer dat4a(13)
logical ltext logical ltext
logical unpk77_success logical unpk77_success
complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s
@ -138,20 +137,9 @@ contains
endif endif
decoded=' ' decoded=' '
if(irc.ge.0) then if(irc.ge.0) then
dat4a(1:12)=dat4 write(c77,1000) dat4
dat4a(13)=9
write(74,3074) dat4a,1
3074 format(13i3,i6)
write(c77,1000) dat4a
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
! call unpackmsg(dat4,decoded) !Unpack the user message
! call fmtmsg(decoded,iz)
if(index(decoded,"000AAA ").ge.1) then
! Suppress a certain type of garbage decode.
decoded=' '
irc=-1
endif
nsnr=nint(snr2) nsnr=nint(snr2)
call this%callback(nutc,sync,nsnr,xdt,f0,decoded, & call this%callback(nutc,sync,nsnr,xdt,f0,decoded, &
irc,qual,ntrperiod,fmid,w50) irc,qual,ntrperiod,fmid,w50)

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

@ -65,7 +65,7 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
if(ndist.gt.maxdist) cycle if(ndist.gt.maxdist) cycle
b90=1.728**ibw b90=1.728**ibw
if(b90.gt.230.0) cycle if(b90.gt.230.0) cycle
if(b90.lt.0.15*width) exit ! if(b90.lt.0.15*width) exit
ncall=ncall+1 ncall=ncall+1
call timer('qra64_de',0) call timer('qra64_de',0)
!### !###
@ -75,8 +75,6 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
APsymbols=0 APsymbols=0
call s3fix(s3,s3tmp) call s3fix(s3,s3tmp)
call q65_dec(s3tmp,APmask,APsymbols,s3prob,snr2,dat4,irc) call q65_dec(s3tmp,APmask,APsymbols,s3prob,snr2,dat4,irc)
write(74,3074) dat4,0
3074 format(13i3,i6)
!### !###
call timer('qra64_de',1) call timer('qra64_de',1)
if(irc.eq.0) go to 200 if(irc.eq.0) go to 200