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

If not in single-decode mode, display only the first character of csync.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6669 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-05-05 00:00:54 +00:00
parent 9bfb211085
commit 407df82917
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/decoder.f90
View File

@ -203,7 +203,7 @@ contains
end subroutine jt4_average end subroutine jt4_average
subroutine jt65_decoded(this,utc,sync,snr,dt,freq,drift,nflip,width, & subroutine jt65_decoded(this,utc,sync,snr,dt,freq,drift,nflip,width, &
decoded0,ft,qual,nsmo,nsum,minsync,nsubmode,naggressive) decoded0,ft,qual,nsmo,nsum,minsync,nsubmode,naggressive,single_decode)
use jt65_decode use jt65_decode
implicit none implicit none
@ -225,11 +225,10 @@ contains
integer, intent(in) :: minsync integer, intent(in) :: minsync
integer, intent(in) :: nsubmode integer, intent(in) :: nsubmode
integer, intent(in) :: naggressive integer, intent(in) :: naggressive
logical, intent(in) :: single_decode
integer i,n integer i,n
character*5 ctail character*5 ctail,decoded*22,csync*2,fmt*33
character*22 decoded
character*2 csync
character*36 c character*36 c
data c/'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'/ data c/'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'/
@ -238,8 +237,10 @@ contains
!3301 format('decoded.f90:',6i3,f5.1) !### !3301 format('decoded.f90:',6i3,f5.1) !###
decoded=decoded0 decoded=decoded0
fmt='(i4.4,i4,f5.1,i5,1x,a1,1x,a22,a5)'
if(single_decode) fmt='(i4.4,i4,f5.1,i5,1x,a2,1x,a22,a5)'
if(ft.eq.0 .and. minsync.ge.0 .and. int(sync).lt.minsync) then if(ft.eq.0 .and. minsync.ge.0 .and. int(sync).lt.minsync) then
write(*,1010) utc,snr,dt,freq write(*,fmt) utc,snr,dt,freq
else else
ctail=' ' ctail=' '
if(naggressive.gt.0 .and. ft.gt.0) then if(naggressive.gt.0 .and. ft.gt.0) then
@ -269,8 +270,7 @@ contains
endif endif
endif endif
endif endif
write(*,1010) utc,snr,dt,freq,csync,decoded,ctail write(*,fmt) utc,snr,dt,freq,csync,decoded,ctail
1010 format(i4.4,i4,f5.1,i5,1x,a2,1x,a22,a5)
endif endif
write(13,1012) utc,nint(sync),snr,dt,float(freq),drift,decoded,ft,nsum,nsmo write(13,1012) utc,nint(sync),snr,dt,float(freq),drift,decoded,ft,nsum,nsmo

8
lib/jt65_decode.f90
View File

@ -13,7 +13,8 @@ module jt65_decode
! !
abstract interface abstract interface
subroutine jt65_decode_callback(this,utc,sync,snr,dt,freq,drift, & subroutine jt65_decode_callback(this,utc,sync,snr,dt,freq,drift, &
nflip,width,decoded,ft,qual,nsmo,nsum,minsync,nsubmode,naggressive) nflip,width,decoded,ft,qual,nsmo,nsum,minsync,nsubmode, &
naggressive,single_decode)
import jt65_decoder import jt65_decoder
implicit none implicit none
@ -34,6 +35,7 @@ module jt65_decode
integer, intent(in) :: minsync integer, intent(in) :: minsync
integer, intent(in) :: nsubmode integer, intent(in) :: nsubmode
integer, intent(in) :: naggressive integer, intent(in) :: naggressive
logical, intent(in) :: single_decode
end subroutine jt65_decode_callback end subroutine jt65_decode_callback
end interface end interface
@ -249,7 +251,7 @@ contains
if (associated(this%callback) .and. nsum.ge.2) then if (associated(this%callback) .and. nsum.ge.2) then
call this%callback(nutc,sync1,nsnr,dtx-1.0,nfreq,ndrift, & call this%callback(nutc,sync1,nsnr,dtx-1.0,nfreq,ndrift, &
nflip,width,avemsg,nftt,nqave,nsmo,nsum,minsync, & nflip,width,avemsg,nftt,nqave,nsmo,nsum,minsync, &
nsubmode,naggressive) nsubmode,naggressive,single_decode)
prtavg=.true. prtavg=.true.
cycle cycle
end if end if
@ -301,7 +303,7 @@ contains
if (associated(this%callback)) then if (associated(this%callback)) then
call this%callback(nutc,sync1,nsnr,dtx-1.0,nfreq,ndrift, & call this%callback(nutc,sync1,nsnr,dtx-1.0,nfreq,ndrift, &
nflip,width,decoded,nft,nqual,nsmo,nsum,minsync, & nflip,width,decoded,nft,nqual,nsmo,nsum,minsync, &
nsubmode,naggressive) nsubmode,naggressive,single_decode)
end if end if
endif endif
decoded0=decoded decoded0=decoded

5
lib/jt65_test.f90
View File

@ -38,7 +38,7 @@ contains
end subroutine test end subroutine test
subroutine my_callback (this,utc,sync,snr,dt,freq,drift,nflip,width, & subroutine my_callback (this,utc,sync,snr,dt,freq,drift,nflip,width, &
decoded,ft,qual,smo,sum,minsync,submode,aggression) decoded,ft,qual,smo,sum,minsync,submode,aggression,single_decode)
use jt65_decode use jt65_decode
implicit none implicit none
@ -59,12 +59,15 @@ contains
integer, intent(in) :: minsync integer, intent(in) :: minsync
integer, intent(in) :: submode integer, intent(in) :: submode
integer, intent(in) :: aggression integer, intent(in) :: aggression
logical, intent(in) :: single_decode
integer nwidth integer nwidth
real t real t
t=max(0.0,width*width-7.2) t=max(0.0,width*width-7.2)
nwidth=max(nint(sqrt(t)),2) nwidth=max(nint(sqrt(t)),2)
!### deal with nflip here! ### !### deal with nflip here! ###
!### also single_decode, csync, etc... ###
write(*,1010) utc,snr,dt,freq,decoded write(*,1010) utc,snr,dt,freq,decoded
1010 format(i4.4,i4,f5.1,i5,1x,'#',1x,a22) 1010 format(i4.4,i4,f5.1,i5,1x,'#',1x,a22)
write(13,1012) utc,nint(sync),snr,dt,freq,drift,nwidth, & write(13,1012) utc,nint(sync),snr,dt,freq,drift,nwidth, &