From 6bbfb0e1f1d23477ed4baea30e48e6966852a190 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 17 May 2016 19:33:33 +0000 Subject: [PATCH] Mark JT4 Fano decodes with 'f'. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6680 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/decoder.f90 | 16 ++++++++++++---- lib/jt4_decode.f90 | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 89e25f514..162ec4836 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -159,9 +159,12 @@ contains character*2 :: cqual +! write(*,3001) 'A',have_sync,is_deep,is_average,int(qual),ave,decoded +!3001 format(a1,3L2,2i4,1x,a22) if (have_sync) then + write(cqual, '(i2)') int(qual) + if(int(qual).eq.99) cqual=' f' if (int(qual).gt.0) then - write(cqual, '(i2)') int(qual) if (ave.gt.0) then write(*,1000) params%nutc,snr,dt,freq,sync,decoded,cqual, & char(ichar('A')+ich-1),ave @@ -171,11 +174,16 @@ contains end if else if (ave.gt.0) then - write(*,1000) params%nutc,snr,dt,freq,sync,decoded,'*', & + if(int(qual).eq.99) cqual=' f' + write(*,1000) params%nutc,snr,dt,freq,sync,decoded,cqual, & char(ichar('A')+ich-1),ave else - write(*,1000) params%nutc,snr,dt,freq,sync,decoded,' *', & - char(ichar('A')+ich-1) + if(int(qual).le.0) then + write(*,1000) params%nutc,snr,dt,freq,sync + else + write(*,1000) params%nutc,snr,dt,freq,sync,decoded,cqual, & + char(ichar('A')+ich-1) + endif endif end if else diff --git a/lib/jt4_decode.f90 b/lib/jt4_decode.f90 index 6dc2c9d20..73418fb58 100644 --- a/lib/jt4_decode.f90 +++ b/lib/jt4_decode.f90 @@ -206,7 +206,7 @@ contains ! Fano succeeded: report the message and return !Fano OK if (associated (this%decode_callback)) then call this%decode_callback(nsnr,dtx,nfreq,.true.,csync, & - .false.,decoded,0.,ich,.false.,0) + .false.,decoded,99.,ich,.false.,0) end if nsave=0 go to 990 @@ -243,7 +243,7 @@ contains ! Fano succeeded: report the message AVG FANO OK if (associated (this%decode_callback)) then call this%decode_callback(nsnr,dtx,nfreq,.true.,csync, & - .false.,avemsg,0.,ich,.true.,nfanoave) + .false.,avemsg,99.,ich,.true.,nfanoave) end if prtavg=.true. cycle